convert (ugly) WriteUniOrByteString to rtl::OUString

tools/inc/tools/stream.hxx

@@ -410,7 +410,7 @@ public:
     rtl::OUString   ReadUniOrByteString(rtl_TextEncoding eSrcCharSet);
                 /// Write a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE,
                 /// otherwise convert to eSrcCharSet and write a 16bit length prefixed sequence of bytes
-    SvStream&       WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet );
+    SvStream&       WriteUniOrByteString( const rtl::OUString& rStr, rtl_TextEncoding eDestCharSet );
                 /// Read a line of Unicode if eSrcCharSet==RTL_TEXTENCODING_UNICODE,
                 /// otherwise read a line of Bytecode and convert from eSrcCharSet
     sal_Bool        ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet );

tools/source/stream/stream.cxx

@@ -1414,18 +1414,18 @@ rtl::OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet )
 
 // -----------------------------------------------------------------------
 
-SvStream& SvStream::WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet )
+SvStream& SvStream::WriteUniOrByteString( const rtl::OUString& rStr, rtl_TextEncoding eDestCharSet )
 {
     // write UTF-16 string directly into stream ?
     if (eDestCharSet == RTL_TEXTENCODING_UNICODE)
     {
-        sal_uInt32 nLen = rStr.Len();
+        sal_Int32 nLen = rStr.getLength();
         operator<< (nLen);
         if (nLen)
         {
             if (bSwap)
             {
-                const sal_Unicode *pStr = rStr.GetBuffer();
+                const sal_Unicode *pStr = rStr.getStr();
                 const sal_Unicode *pEnd = pStr + nLen;
 
                 for (; pStr < pEnd; pStr++)
@@ -1436,7 +1436,7 @@ SvStream& SvStream::WriteUniOrByteString( const UniString& rStr, rtl_TextEncodin
                 }
             }
             else
-                Write( rStr.GetBuffer(), nLen << 1 );
+                Write( rStr.getStr(), nLen << 1 );
         }
 
         return *this;