ByteString->rtl::OStringBuffer

extensions/source/plugin/unx/unxmgr.cxx

@@ -256,26 +256,22 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
         static const char* pHome = getenv( "HOME" );
         static const char* pNPXPluginPath = getenv( "NPX_PLUGIN_PATH" );
 
-        ByteString aSearchPath( "/usr/lib/netscape/plugins" );
+        // netscape!, quick, beam me back to the 90's when Motif roamed the earth
+        rtl::OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins"));
         if( pHome )
-        {
-            aSearchPath.Append( ':' );
-            aSearchPath.Append( pHome );
-            aSearchPath += "/.netscape/plugins";
-        }
+            aSearchBuffer.append(':').append(pHome).append("/.netscape/plugins");
         if( pNPXPluginPath )
-        {
-            aSearchPath.Append( ':' );
-            aSearchPath += pNPXPluginPath;
-        }
+            aSearchBuffer.append(':').append(pNPXPluginPath);
 
         const Sequence< ::rtl::OUString >& rPaths( PluginManager::getAdditionalSearchPaths() );
         for( i = 0; i < rPaths.getLength(); i++ )
         {
-            aSearchPath += ":";
-            aSearchPath += ByteString( String( rPaths.getConstArray()[i] ), aEncoding );
+            aSearchBuffer.append(':').append(rtl::OUStringToOString(
+                rPaths.getConstArray()[i], aEncoding));
         }
 
+        ByteString aSearchPath = aSearchBuffer.makeStringAndClear();
+
         int nPaths = aSearchPath.GetTokenCount( ':' );
         maxDirent u;
         for( i = 0; i < nPaths; i++ )

svx/source/svdraw/svdmodel.cxx

@@ -34,6 +34,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <osl/endian.h>
 #include <rtl/logfile.hxx>
+#include <rtl/strbuf.hxx>
 #include <math.h>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -302,12 +303,11 @@ SdrModel::~SdrModel()
 #ifdef DBG_UTIL
     if(pAktUndoGroup)
     {
-        ByteString aStr("Im Dtor des SdrModel steht noch ein offenes Undo rum: \"");
-
-        aStr += ByteString(pAktUndoGroup->GetComment(), gsl_getSystemTextEncoding());
-        aStr += '\"';
-
-        OSL_FAIL(aStr.GetBuffer());
+        rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+            "Im Dtor des SdrModel steht noch ein offenes Undo rum: \""));
+        aStr.append(rtl::OUStringToOString(pAktUndoGroup->GetComment(), gsl_getSystemTextEncoding()))
+            .append('\"');
+        OSL_FAIL(aStr.getStr());
     }
 #endif
     if (pAktUndoGroup!=NULL)