ByteString->rtl::OString

tools/bootstrp/rscdep.cxx

@@ -89,8 +89,7 @@ int main( int argc, char** argv )
     sal_Bool bSource = sal_False;
     ByteString aRespArg;
 //  who needs anything but '/' ?
-//  String aDelim = String(DirEntry::GetAccessDelimiter());
-    String aDelim = '/';
+    sal_Char cDelim = '/';
 
     RscHrcDep *pDep = new RscHrcDep;
 
@@ -212,7 +211,7 @@ int main( int argc, char** argv )
     String aOutPath = aOutEntry.GetPath().GetFull();
 
     String aFileName( aOutPath );
-    aFileName += aDelim;
+    aFileName += cDelim;
     aFileName += aCwd;
     aFileName += String(".", osl_getThreadTextEncoding());
     aFileName += aSrsBaseName;
@@ -226,7 +225,7 @@ int main( int argc, char** argv )
         printf("further arguments : ");
 #endif
         aString = ByteString( pSrsFileName );
-        aString.SearchAndReplaceAll('\\', ByteString( aDelim,  RTL_TEXTENCODING_ASCII_US ));
+        aString.SearchAndReplaceAll('\\', cDelim);
         aString += ByteString(" : " );
 
         while ( optind < argc )
@@ -260,7 +259,7 @@ int main( int argc, char** argv )
     for ( size_t j = 0; j < nCount; j++ )
     {
         ByteString *pStr = (*pLst)[ j ];
-        pStr->SearchAndReplaceAll('\\', ByteString( aDelim,  RTL_TEXTENCODING_ASCII_US ));
+        pStr->SearchAndReplaceAll('\\', cDelim);
         if ( j != (nCount-1) )
             *pStr += ByteString( "\\" );
         aOutStream.WriteLine( *pStr );

tools/source/fsys/unx.cxx

@@ -319,14 +319,14 @@ sal_uInt16 DirReader_Impl::Read()
     if ( ( pDir->eAttrMask & FSYS_KIND_DIR || pDir->eAttrMask & FSYS_KIND_FILE ) &&
          ( ( pDosEntry = readdir( pDosDir ) ) != NULL ) )
     {
-    String aD_Name(pDosEntry->d_name, osl_getThreadTextEncoding());
+        String aD_Name(pDosEntry->d_name, osl_getThreadTextEncoding());
         if ( pDir->aNameMask.Matches( aD_Name  ) )
         {
             DirEntryFlag eFlag =
                     0 == strcmp( pDosEntry->d_name, "." ) ? FSYS_FLAG_CURRENT
                 :   0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT
                 :   FSYS_FLAG_NORMAL;
-            DirEntry *pTemp = new DirEntry( ByteString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX );
+            DirEntry *pTemp = new DirEntry(rtl::OString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX);
             if ( pParent )
                 pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False);
             FileStat aStat( *pTemp );

tools/source/inet/inetstrm.cxx

@@ -30,6 +30,7 @@
 #include "precompiled_tools.hxx"
 #include <sal/types.h>
 #include <rtl/memory.h>
+#include <rtl/strbuf.hxx>
 #include <tools/cachestr.hxx>
 #include <tools/debug.hxx>
 #include <tools/inetmsg.hxx>
@@ -1441,13 +1442,14 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize)
                         if (pMsg->IsMultipart())
                         {
                             // Insert multipart delimiter.
-                            ByteString aDelim ("--");
-                            aDelim += pMsg->GetMultipartBoundary();
-                            aDelim += "\r\n";
+                            rtl::OStringBuffer aDelim(
+                                RTL_CONSTASCII_STRINGPARAM("--"));
+                            aDelim.append(pMsg->GetMultipartBoundary());
+                            aDelim.append("\r\n");
 
-                            rtl_copyMemory (
-                                pData, aDelim.GetBuffer(), aDelim.Len());
-                            return aDelim.Len();
+                            rtl_copyMemory(pData, aDelim.getStr(),
+                                aDelim.getLength());
+                            return aDelim.getLength();
                         }
                     }
                     else

tools/source/rc/resmgr.cxx

@@ -932,9 +932,10 @@ void ResMgr::Init( const OUString& rFileName )
     if ( !pImpRes )
     {
 #ifdef DBG_UTIL
-        ByteString aStr( "Resourcefile not found:\n" );
-        aStr += ByteString( OUStringToOString( rFileName, RTL_TEXTENCODING_UTF8 ) );
-        OSL_FAIL( aStr.GetBuffer() );
+        rtl::OStringBuffer aStr(
+            RTL_CONSTASCII_STRINGPARAM("Resourcefile not found:\n"));
+        aStr.append(OUStringToOString(rFileName, RTL_TEXTENCODING_UTF8));
+        OSL_FAIL(aStr.getStr());
 #endif
         RscException_Impl();
     }
@@ -950,9 +951,11 @@ void ResMgr::Init( const OUString& rFileName )
             InternalResMgr::FreeGlobalRes( aResHandle, pVoid );
         else
         {
-            ByteString aStr( "Wrong version:\n" );
-            aStr += ByteString( OUStringToOString( pImpRes->aFileName, RTL_TEXTENCODING_UTF8 ) );
-            DbgError( aStr.GetBuffer() );
+            rtl::OStringBuffer aStr(
+                RTL_CONSTASCII_STRINGPARAM("Wrong version:\n"));
+            aStr.append(rtl::OUStringToOString(pImpRes->aFileName,
+                RTL_TEXTENCODING_UTF8));
+            DbgError(aStr.getStr());
         }
     }
 #endif