ByteString->rtl::OString

tools/bootstrp/mkunroll/mkunroll.cxx

@@ -210,9 +210,8 @@ void MkFilter::Filter()
                 for ( size_t i=0; i<nCount; i++ )
                 {
                     MkLine *pMkLine = (*pLine->pPrivateTnrLst)[ i ];
-                    ByteString aLine = pMkLine->aLine;
-                    while( aLine.SearchAndReplace( aTnr, rtl::OString::valueOf(static_cast<sal_Int32>(n)) ) != (sal_uInt16)-1 ) ;
-                    fputs( aLine.GetBuffer(), pOut );
+                    rtl::OString aLine = pMkLine->aLine.replaceAll(aTnr, rtl::OString::valueOf(static_cast<sal_Int32>(n)));
+                    fputs( aLine.getStr(), pOut );
                     fprintf( stderr, "o" );
                 }
             }

tools/source/fsys/unx.cxx

@@ -75,9 +75,9 @@ struct mnttab
 struct mymnttab
 {
     dev_t mountdevice;
-    ByteString mountspecial;
-    ByteString mountpoint;
-    ByteString mymnttab_filesystem;
+    rtl::OString mountspecial;
+    rtl::OString mountpoint;
+    rtl::OString mymnttab_filesystem;
     mymnttab() { mountdevice = (dev_t) -1; }
 };