Changeset 111 for trunk

Timestamp:

Nov 1, 2016, 9:06:24 AM (8 years ago)

Author:

chronos

Message:

• Fixed: Characters encoding for string loaded from MS Access database.

File:

• trunk/UAcronym.pas (modified) (3 diffs)

trunk/UAcronym.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Contnrs, XMLRead, XMLWrite, DOM, UXMLUtils,
-  SpecializedList, fphttpclient2, Dialogs, odbcconn, sqldb;
+  SpecializedList, fphttpclient2, Dialogs, odbcconn, sqldb, LazUTF8;
 
 type
@@ -329 +329 @@
     NewAcronym := TAcronymEntry.Create;
     while not SQLQuery1.EOF do begin
-      NewAcronym.Name := Trim(SQLQuery1.FieldByName('Acronym').AsString);
-      NewAcronym.Meaning := Trim(SQLQuery1.FieldByName('Meaning').AsString);
+      NewAcronym.Name := Trim(WinCPToUTF8(SQLQuery1.FieldByName('Acronym').AsString));
+      NewAcronym.Meaning := Trim(WinCPToUTF8(SQLQuery1.FieldByName('Meaning').AsString));
       if (NewAcronym.Name <> '') and (NewAcronym.Meaning <> '') then begin
         AddedAcronym := Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
@@ -336 +336 @@
         if AddedAcronym.Sources.IndexOf(Self) = -1 then
           AddedAcronym.Sources.Add(Self);
-      end;
+        end;
       SQLQuery1.Next;
       Inc(ItemCount);