convert some low hanging fruit

sw/inc/charfmt.hxx

@@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwCharFmt : public SwFmt
                 SwCharFmt *pDerivedFrom )
           : SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
     {}
-    SwCharFmt( SwAttrPool& rPool, const String &rFmtName,
+    SwCharFmt( SwAttrPool& rPool, const rtl::OUString &rFmtName,
                 SwCharFmt *pDerivedFrom )
           : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
     {}

tools/inc/tools/stream.hxx

@@ -407,7 +407,7 @@ public:
     sal_Bool        ReadUniStringLine( String& rStr );
                 /// Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE,
                 /// otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet
-    String          ReadUniOrByteString(rtl_TextEncoding eSrcCharSet);
+    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 );

tools/source/stream/stream.cxx

@@ -1379,7 +1379,7 @@ SvStream& SvStream::operator<< ( SvStream& rStream )
 
 // -----------------------------------------------------------------------
 
-String SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet )
+rtl::OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet )
 {
     // read UTF-16 string directly from stream ?
     if (eSrcCharSet == RTL_TEXTENCODING_UNICODE)