Changeset 34 for trunk/Forms/UFormAcronyms.pas

Timestamp:

Jul 13, 2016, 3:24:45 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Error during removing acronyms in case that multiple acronyms with same name exists.

File:

• trunk/Forms/UFormAcronyms.pas (modified) (3 diffs)

trunk/Forms/UFormAcronyms.pas

@@ -147 +147 @@
       not FormMain.CompareStrings(TempEntry.Categories, TempCategories) then begin
         // TODO: Update item inplace if possible
-        FormMain.AcronymDb.RemoveAcronym(Acronym.Name, Name);
+        FormMain.AcronymDb.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Selected.Data));
         Meaning := FormMain.AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
         Meaning.Description := TempEntry.Description;
@@ -172 +172 @@
         if ListViewAcronyms.Items[I].Selected then begin
           ListViewAcronyms.Items[I].Selected := False;
-          FormMain.AcronymDb.RemoveAcronym(
-            TAcronymMeaning(ListViewAcronyms.Items[I].Data).Acronym.Name,
-            TAcronymMeaning(ListViewAcronyms.Items[I].Data).Name);
+          FormMain.AcronymDb.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Items[I].Data));
         end;
       UpdateAcronymsList;
@@ -202 +200 @@
     case Column of
       0: Result := CompareString(TAcronymMeaning(Item1).Acronym.Name, TAcronymMeaning(Item2).Acronym.Name);
-      1: Result := CompareString(TAcronymMeaning(Item1).Description, TAcronymMeaning(Item2).Description);
+      1: Result := CompareString(TAcronymMeaning(Item1).Name, TAcronymMeaning(Item2).Name);
       2: Result := CompareString(TAcronymMeaning(Item1).Categories.GetString, TAcronymMeaning(Item2).Categories.GetString);
     end;