* Merging revisions r43357 from trunk:

    ------------------------------------------------------------------------
    r43357 | michael | 2019-11-02 12:51:28 +0100 (Sat, 02 Nov 2019) | 1 line
    
    * Fix bug ID #36234: unicodedatastering must be of type unicodestring
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43735 -

rtl/objpas/classes/classesh.inc

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

rtl/objpas/classes/streams.inc

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