Browse Source

* UTF8 strings read as normal strings, not widestrings (bug reported by Stefan Lechner)

git-svn-id: trunk@11047 -
michael 17 years ago
parent
commit
0ad7cfe39b
1 changed files with 7 additions and 3 deletions
  1. 7 3
      rtl/objpas/classes/reader.inc

+ 7 - 3
rtl/objpas/classes/reader.inc

@@ -1340,9 +1340,13 @@ var
   StringType: TValueType;
 begin
   StringType := FDriver.ReadValue;
-  if StringType in [vaString, vaLString] then
-    Result := FDriver.ReadString(StringType)
-  else if StringType in [vaWString,vaUTF8String] then
+  if StringType in [vaString, vaLString,vaUTF8String] then
+    begin
+    Result := FDriver.ReadString(StringType);
+    if (StringType=vaUTF8String) then
+      Result:=utf8Decode(Result);
+    end
+  else if StringType in [vaWString] then
     Result:= FDriver.ReadWidestring
   else
     raise EReadError.Create(SInvalidPropertyValue);