ByteString -> rtl::OStringBuffer

sfx2/source/doc/docfac.cxx

@@ -61,6 +61,8 @@
 #include <osl/security.hxx>
 #include "doc.hrc"
 
+#include <rtl/strbuf.hxx>
+
 #include <assert.h>
 
 namespace css = ::com::sun::star;
@@ -166,10 +168,11 @@ void SfxObjectFactory::RegisterViewFactory
         {
             if ( !pImpl->aViewFactoryArr[i]->GetAPIViewName().Equals( sViewName ) )
                 continue;
-            ByteString sMessage( "SfxObjectFactory::RegisterViewFactory: duplicate view name '" );
-            sMessage += ByteString( sViewName, RTL_TEXTENCODING_ASCII_US );
-            sMessage += "'!";
-            OSL_FAIL( sMessage.GetBuffer() );
+            rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+                "SfxObjectFactory::RegisterViewFactory: duplicate view name '"));
+            sMessage.append(rtl::OUStringToOString(sViewName, RTL_TEXTENCODING_ASCII_US));
+            sMessage.append(RTL_CONSTASCII_STRINGPARAM("'!"));
+            OSL_FAIL(sMessage.getStr());
             break;
         }
     }

sfx2/source/doc/objstor.cxx

@@ -1082,8 +1082,9 @@ sal_Bool SfxObjectShell::SaveTo_Impl
     RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::SaveTo_Impl" );
     if( RTL_LOGFILE_HASLOGFILE() )
     {
-        ByteString aString( rMedium.GetName(), RTL_TEXTENCODING_ASCII_US );
-        RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1( aLog, "saving \"%s\"", aString.GetBuffer() );
+        rtl::OString aString(
+            rtl::OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US));
+        RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1(aLog, "saving \"%s\"", aString.getStr());
     }
 
     AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Begin" ) ) );
@@ -2964,8 +2965,9 @@ sal_Bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium )
     RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::LoadOwnFormat" );
     if( RTL_LOGFILE_HASLOGFILE() )
     {
-        ByteString aString( rMedium.GetName(), RTL_TEXTENCODING_ASCII_US );
-        RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1( aLog, "loading \"%s\"", aString.GetBuffer() );
+        rtl::OString aString(
+            rtl::OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US));
+        RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1(aLog, "loading \"%s\"", aString.getStr());
     }
 
     uno::Reference< embed::XStorage > xStorage = rMedium.GetStorage();

sfx2/source/doc/oleprops.cxx

@@ -344,12 +344,12 @@ String SfxOleStringHelper::ImplLoadString16( SvStream& rStrm ) const
 void SfxOleStringHelper::ImplSaveString8( SvStream& rStrm, const String& rValue ) const
 {
     // encode to byte string
-    ByteString aEncoded( rValue, GetTextEncoding() );
+    rtl::OString aEncoded(rtl::OUStringToOString(rValue, GetTextEncoding()));
     // write size field (including trailing NUL character)
-    sal_Int32 nSize = static_cast< sal_Int32 >( aEncoded.Len() + 1 );
+    sal_Int32 nSize = aEncoded.getLength() + 1;
     rStrm << nSize;
     // write character array with trailing NUL character
-    rStrm.Write( aEncoded.GetBuffer(), aEncoded.Len() );
+    rStrm.Write(aEncoded.getStr(), aEncoded.getLength());
     rStrm << sal_uInt8( 0 );
 }
 

sfx2/source/doc/sfxbasemodel.cxx

@@ -91,6 +91,7 @@
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
 #include <rtl/logfile.hxx>
+#include <rtl/strbuf.hxx>
 #include <framework/configimporter.hxx>
 #include <framework/interaction.hxx>
 #include <framework/titlehelper.hxx>
@@ -2999,9 +3000,10 @@ void SfxBaseModel::postEvent_Impl( const ::rtl::OUString& aName, const uno::Refe
     if ( pIC )
     {
 #ifdef DBG_UTIL
-        ByteString aTmp( "SfxDocumentEvent: " );
-        aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
-        OSL_TRACE( aTmp.GetBuffer() );
+        rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(
+            "SfxDocumentEvent: "));
+        aTmp.append(rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8));
+        OSL_TRACE(aTmp.getStr());
 #endif
 
         document::DocumentEvent aDocumentEvent( (frame::XModel*)this, aName, xController, uno::Any() );
@@ -3016,9 +3018,10 @@ void SfxBaseModel::postEvent_Impl( const ::rtl::OUString& aName, const uno::Refe
     if ( pIC )
     {
 #ifdef DBG_UTIL
-        ByteString aTmp( "SfxEvent: " );
-        aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
-        OSL_TRACE( "%s", aTmp.GetBuffer() );
+        rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(
+            "SfxEvent: "));
+        aTmp.append(rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8));
+        OSL_TRACE(aTmp.getStr());
 #endif
 
         document::EventObject aEvent( (frame::XModel*)this, aName );