Selaa lähdekoodia

* Fix bug ID #36234: unicodedatastering must be of type unicodestring

git-svn-id: trunk@43357 -
michael 5 vuotta sitten
vanhempi
commit
20ca7d857c
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 2 2
      rtl/objpas/classes/classesh.inc
  2. 1 1
      rtl/objpas/classes/streams.inc

+ 2 - 2
rtl/objpas/classes/classesh.inc

@@ -1199,7 +1199,7 @@ type
     FEncoding: TEncoding;
     FEncoding: TEncoding;
     FOwnsEncoding : Boolean;
     FOwnsEncoding : Boolean;
     function GetDataString: string;
     function GetDataString: string;
-    function GetUnicodeDataString: String;
+    function GetUnicodeDataString: UnicodeString;
   protected
   protected
   public
   public
     constructor Create(const ABytes: TBytes); override; overload;
     constructor Create(const ABytes: TBytes); override; overload;
@@ -1219,7 +1219,7 @@ type
     function ReadString(Count: Longint): string;
     function ReadString(Count: Longint): string;
     procedure WriteString(const AString: string);
     procedure WriteString(const AString: string);
     property DataString: string read GetDataString;
     property DataString: string read GetDataString;
-    Property UnicodeDataString : String Read GetUnicodeDataString;
+    Property UnicodeDataString : UnicodeString Read GetUnicodeDataString;
     Property OwnsEncoding : Boolean Read FOwnsEncoding;
     Property OwnsEncoding : Boolean Read FOwnsEncoding;
     Property Encoding : TEncoding Read FEncoding;
     Property Encoding : TEncoding Read FEncoding;
   end;
   end;

+ 1 - 1
rtl/objpas/classes/streams.inc

@@ -1522,7 +1522,7 @@ begin
   Result:=FEncoding.GetAnsiString(Bytes,0,Size);
   Result:=FEncoding.GetAnsiString(Bytes,0,Size);
 end;
 end;
 
 
-function TStringStream.GetUnicodeDataString: String;
+function TStringStream.GetUnicodeDataString: UnicodeString;
 begin
 begin
   Result:=FEncoding.GetString(Bytes, 0, Size);
   Result:=FEncoding.GetString(Bytes, 0, Size);
 end;
 end;