Changeset 52 for trunk/UContact.pas

Timestamp:

Dec 3, 2021, 8:50:43 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Wrong object reference to contact Parent after Merge files action.
• Modified: Optimized select all action.

File:

• trunk/UContact.pas (modified) (7 diffs)

trunk/UContact.pas

@@ -143 +143 @@
   SFoundBlockEndWithoutBlockStart = 'Found block end without block start';
   SFieldIndexNotDefined = 'Field index not defined';
+  SContactHasNoParent = 'Contact has no parent';
   SLastName = 'Last Name';
   SFirstName = 'First Name';
@@ -478 +479 @@
 var
   I: Integer;
-begin
+  C: Integer;
+begin
+  C := Count;
   I := 0;
   while (I < Count) and (Items[I].Index <> Index) do Inc(I);
@@ -502 +505 @@
   Field: TContactField;
 begin
+  if not Assigned(Parent) then raise Exception.Create(SContactHasNoParent);
   Prop := GetProperty(Index);
   if Assigned(Prop) then begin
@@ -517 +521 @@
   I: Integer;
 begin
+  if not Assigned(Parent) then raise Exception.Create(SContactHasNoParent);
   Field := Parent.Fields.GetByIndex(Index);
   if Assigned(Field) then begin
@@ -542 +547 @@
 function TContact.GetProperty(Index: TContactFieldIndex): TContactProperty;
 var
-  Prop: TContactProperty;
   Field: TContactField;
 begin
+  if not Assigned(Parent) then raise Exception.Create(SContactHasNoParent);
   Field := Parent.Fields.GetByIndex(Index);
   if Assigned(Field) then begin
@@ -555 +560 @@
   I: Integer;
 begin
-  Parent := Source.Parent;
   while Properties.Count < Source.Properties.Count do
     Properties.Add(TContactProperty.Create);
@@ -568 +572 @@
   I: Integer;
 begin
+  if not Assigned(Parent) then raise Exception.Create(SContactHasNoParent);
   Result := False;
   for I := 0 to Parent.Fields.Count - 1 do begin