remove some UniString ctors

Change-Id: Ic2e712f4447b733b79d980e178d9d6d9d8bf0e40

3 files changed, 7 insertions, 7 deletions

diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index aaf7def0cfd2..9ea2dcd18d4d 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -2573,12 +2573,12 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel )
 
     rtl::OString aLine;
     sal_Bool bDone = rInput.ReadLine( aLine );
-    String aTmpStr( aLine, rInput.GetStreamCharSet() ), aStr;
+    rtl::OUString aTmpStr(rtl::OStringToOUString(aLine, rInput.GetStreamCharSet())), aStr;
     while ( bDone )
     {
         aSel = ImpInsertText( aSel, aTmpStr );
         bDone = rInput.ReadLine( aLine );
-        aTmpStr = String( aLine, rInput.GetStreamCharSet() );
+        aTmpStr = rtl::OStringToOUString(aLine, rInput.GetStreamCharSet());
         if ( bDone )
             aSel = ImpInsertParaBreak( aSel.GetEnd() );
     }
diff --git a/svtools/source/filter/wmf/wmfwr.cxx b/svtools/source/filter/wmf/wmfwr.cxx
index 9cab2f018695..c4fb19336955 100644
--- a/svtools/source/filter/wmf/wmfwr.cxx
+++ b/svtools/source/filter/wmf/wmfwr.cxx
@@ -559,8 +559,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String&
             const sal_Unicode* pBuf = rUniStr.GetBuffer();
             const rtl_TextEncoding aTextEncodingOrg = aSrcFont.GetCharSet();
             rtl::OString aByteStr(rtl::OUStringToOString(rUniStr, aTextEncodingOrg));
-            String     aUniStr2( aByteStr, aTextEncodingOrg );
-            const sal_Unicode* pConversion = aUniStr2.GetBuffer();  // this is the unicode array after bytestring <-> unistring conversion
+            rtl::OUString aUniStr2(rtl::OStringToOUString(aByteStr, aTextEncodingOrg));
+            const sal_Unicode* pConversion = aUniStr2.getStr();  // this is the unicode array after bytestring <-> unistring conversion
             for ( i = 0; i < nStringLen; i++ )
             {
                 if ( *pBuf++ != *pConversion++ )
@@ -581,8 +581,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String&
                 }
 
                 aByteStr = rtl::OUStringToOString(rUniStr,  aTextEncoding);
-                aUniStr2 = String ( aByteStr, aTextEncoding );
-                pConversion = aUniStr2.GetBuffer(); // this is the unicode array after bytestring <-> unistring conversion
+                aUniStr2 = rtl::OStringToOUString(aByteStr, aTextEncoding);
+                pConversion = aUniStr2.getStr(); // this is the unicode array after bytestring <-> unistring conversion
                 for ( i = 0; i < nStringLen; i++ )
                 {
                     if ( *pBuf++ != *pConversion++ )
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 36b81ecf73c4..5427d86e521d 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1953,7 +1953,7 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader,
     // the string following '<' has to be a known HTML token.
     // <DIR> is not interpreted as HTML. Otherwise the output of the DOS command "DIR"
     // could be interpreted as HTML.
-    String sTest( sCmp.copy( nStart, nPos-nStart ), RTL_TEXTENCODING_ASCII_US );
+    rtl::OUString sTest(rtl::OStringToOUString(sCmp.copy(nStart, nPos-nStart), RTL_TEXTENCODING_ASCII_US));
     int nTok = GetHTMLToken( sTest );
     if( 0 != nTok && HTML_DIRLIST_ON != nTok )
         return true;