ByteString->rtl::OString

7 files changed, 64 insertions, 68 deletions

diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 7a14792dd101..09a91ffb2481 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -97,14 +97,14 @@ private:
     void            Append( const rtl::OString& rOutputSrs, const rtl::OString& rTmpFile );
 
     bool            GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
-                                       const WriteRcContext& rContext,
-                                    const ByteString& rBaseFileName,
-                                    ByteString& rImagePath,
-                                    FILE* pSysListFile );
+                                      const WriteRcContext& rContext,
+                                      const rtl::OString& rBaseFileName,
+                                      ByteString& rImagePath,
+                                      FILE* pSysListFile );
     void            PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
-                                          const WriteRcContext& rContext,
-                                         const DirEntry& rSrsInPath,
-                                         const DirEntry& rSrsOutPath );
+                                       const WriteRcContext& rContext,
+                                       const DirEntry& rSrsInPath,
+                                       const DirEntry& rSrsOutPath );
 
 public:
     RscTypCont*     pTC;        // String und Id-Verwalter
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 4e2ba9f30080..e4cc72a2d561 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -147,19 +147,19 @@ void RscLangEnum::Init( RscNameTable& rNames )
     rtl::OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" );
     if ( aEnvIsoTokens.getLength() )
     {
-        ByteString aIsoToken;
+        rtl::OString aIsoToken;
         sal_uInt16 nTokenCounter = 0;
         sal_Bool bOneMore = 1;
         while ( bOneMore )
         {
             aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' ');
-            if ( aIsoToken.Len() )
+            if ( aIsoToken.getLength() )
             {
-                SetConstant( rNames.Put( aIsoToken.GetBuffer(), CONSTNAME, mnLangId ), mnLangId );
+                SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId );
                 if ( ! GetLangId( aIsoToken ))
                     ULong_Iso_map[ aIsoToken ] = mnLangId;
 #if OSL_DEBUG_LEVEL > 2
-                fprintf( stderr, "Env ISO Language out: %s 0x%lx\n", aIsoToken.GetBuffer(), mnLangId );
+                fprintf( stderr, "Env ISO Language out: %s 0x%lx\n", aIsoToken.getStr(), mnLangId );
 #endif
                 mnLangId++;
             }
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index df388d9c63c0..0edbb549238b 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -381,7 +381,7 @@ void IncludeParser( RscFileInst * pFileInst )
                 }
                 else if( INCLUDE_STRING == nToken ){
                     lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string,
-                                                         ByteString() );
+                                                         rtl::OString() );
                     pFName->InsertDependFile( lKey, ULONG_MAX );
                 };
             };
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index 6c401d55d66a..4ba11f4b5a9b 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -504,13 +504,13 @@ type
   {
 	if( $1 )
 	{
-		ByteString aTypeName = pHS->getString( $1->GetId() );
-		aTypeName += "[]";
-		$$ = pTC->SearchType( pHS->getID( aTypeName.GetBuffer(), true ) );
+		rtl::OString aTypeName = rtl::OStringBuffer(pHS->getString($1->GetId())).
+                    append("[]").makeStringAndClear();
+		$$ = pTC->SearchType( pHS->getID( aTypeName.getStr(), true ) );
 		if( !$$ )
 		{
 			RscCont * pCont;
-			pCont = new RscCont( pHS->getID( aTypeName.GetBuffer() ), RSC_NOTYPE );
+			pCont = new RscCont( pHS->getID( aTypeName.getStr() ), RSC_NOTYPE );
 			pCont->SetTypeClass( $1 );
 			pTC->InsertType( pCont );
 			$$ = pCont;
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index aeddeb767621..08672ba515ab 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -62,22 +62,21 @@ int rsc2_main(int, char**);
 |*
 |*    Beschreibung
 *************************************************************************/
-static sal_Bool CallPrePro( const ByteString& rInput,
-                        const ByteString& rOutput,
-                        RscPtrPtr * pCmdLine,
-                        sal_Bool bResponse )
+static sal_Bool CallPrePro( const rtl::OString& rInput,
+    const rtl::OString& rOutput, RscPtrPtr * pCmdLine,
+    sal_Bool bResponse )
 {
     RscPtrPtr       aNewCmdL;   // Kommandozeile
     RscPtrPtr       aRespCmdL;   // Kommandozeile
     RscPtrPtr *     pCmdL = &aNewCmdL;
     int             i, nRet;
     FILE*           fRspFile = NULL;
-    ByteString      aRspFileName;
+    rtl::OString    aRspFileName;
 
     if( bResponse )
     {
         aRspFileName = ::GetTmpFileName();
-        fRspFile = fopen( aRspFileName.GetBuffer(), "w" );
+        fRspFile = fopen( aRspFileName.getStr(), "w" );
     }
 
     if( !fRspFile )
@@ -100,8 +99,8 @@ static sal_Bool CallPrePro( const ByteString& rInput,
         }
     }
 
-    aNewCmdL.Append( rsc_strdup( rInput.GetBuffer() ) );
-    aNewCmdL.Append( rsc_strdup( rOutput.GetBuffer() ) );
+    aNewCmdL.Append( rsc_strdup( rInput.getStr() ) );
+    aNewCmdL.Append( rsc_strdup( rOutput.getStr() ) );
     aNewCmdL.Append( (void *)0 );
 
     if ( bVerbose )
@@ -145,11 +144,13 @@ static sal_Bool CallPrePro( const ByteString& rInput,
     nRet = rscpp_main( pCmdL->GetCount()-1, (char**)pCmdL->GetBlock() );
 
     if ( fRspFile )
+    {
         #if OSL_DEBUG_LEVEL > 5
-        fprintf( stderr, "leaving response file %s\n", aRspFileName.GetBuffer() );
+        fprintf( stderr, "leaving response file %s\n", aRspFileName.getStr() );
         #else
-        unlink( aRspFileName.GetBuffer() );
+        unlink( aRspFileName.getStr() );
         #endif
+    }
     if ( nRet )
         return sal_False;
 
@@ -163,8 +164,7 @@ static sal_Bool CallPrePro( const ByteString& rInput,
 |*    Beschreibung
 *************************************************************************/
 static sal_Bool CallRsc2( RscStrList * pInputList,
-                      ByteString aSrsName,
-                      RscPtrPtr * pCmdLine )
+    const rtl::OString &rSrsName, RscPtrPtr * pCmdLine )
 {
     int nRet;
     rtl::OString*  pString;
@@ -200,7 +200,7 @@ static sal_Bool CallRsc2( RscStrList * pInputList,
             aNewCmdL.Append( rsc_strdup( (char *)pCmdLine->GetEntry( i ) ) );
     };
 
-    aNewCmdL.Append( rsc_strdup( aSrsName.GetBuffer() ) );
+    aNewCmdL.Append( rsc_strdup( rSrsName.getStr() ) );
 
     for ( size_t i = 0, n = pInputList->size(); i < n; ++i )
     {
@@ -232,12 +232,12 @@ static sal_Bool CallRsc2( RscStrList * pInputList,
 *************************************************************************/
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
-    sal_Bool            bPrePro  = sal_True;
-    sal_Bool            bHelp    = sal_False;
-    sal_Bool            bError   = sal_False;
-    sal_Bool            bResponse = sal_False;
-    ByteString      aSrsName;
-    ByteString      aResName;
+    sal_Bool        bPrePro  = sal_True;
+    sal_Bool        bHelp    = sal_False;
+    sal_Bool        bError   = sal_False;
+    sal_Bool        bResponse = sal_False;
+    rtl::OString    aSrsName;
+    rtl::OString    aResName;
     RscStrList      aInputList;
     RscStrList      aTmpList;
     char *          pStr;
@@ -296,12 +296,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     if( !aInputList.empty() )
     {
         /* build the output file names          */
-        if( ! aResName.Len() )
+        if (!aResName.getLength())
             aResName = OutputFile( *aInputList[ 0 ], "res" );
         if( ! bSetSrs )
         {
-            aSrsName = "-fp=";
-            aSrsName += OutputFile( *aInputList[ 0 ], "srs" );
+            aSrsName = rtl::OStringBuffer("-fp=").append(OutputFile(*aInputList[0], "srs")).
+                makeStringAndClear();
         }
     };
 
@@ -309,7 +309,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         bPrePro = sal_False;
     if( bPrePro && !aInputList.empty() )
     {
-        ByteString aTmpName;
+        rtl::OString aTmpName;
 
         for ( size_t k = 0, n = aInputList.size(); k < n; ++k )
         {
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index 078be90c5658..77dbee0973c0 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -311,12 +311,12 @@ ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &,
 }
 
 
-static rtl::OString MakeSmartName( const ByteString & rDefName )
+static rtl::OString MakeSmartName( const rtl::OString& rDefName )
 {
     rtl::OStringBuffer aSmartName;
-    if( rDefName.Len() )
+    if( rDefName.getStr() )
     {
-        char * pStr = (char *)rDefName.GetBuffer();
+        char * pStr = (char *)rDefName.getStr();
         aSmartName.append(static_cast<sal_Char>(toupper(*pStr)));
         while( *++pStr )
         {
@@ -335,10 +335,10 @@ static rtl::OString MakeSmartName( const ByteString & rDefName )
 }
 
 static rtl::OString MakeName( RscTypCont * pTypCon, RscTop * pClass,
-                            const ByteString & rName )
+                            const rtl::OString& rName )
 {
     rtl::OStringBuffer aRet;
-    if( !pTypCon->IsSmart() || isdigit( rName.GetChar(0) ) )
+    if( !pTypCon->IsSmart() || isdigit( rName[0] ) )
     {
         aRet.append(pHS->getString( pClass->GetId() ).getStr());
         aRet.append(rName);
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index a638a2ca3f3f..8aef412fc190 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -856,11 +856,11 @@ ERRTYPE RscCompiler::Link()
             pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
             pTC->ClearSysNames();
             rtl::OStringBuffer aSysSearchPath(it->aLangSearchPath);
-            xub_StrLen nIndex = 0;
-            ByteString aSearchPath = pTC->GetSearchPath();
-            while( nIndex != STRING_NOTFOUND )
+            sal_Int32 nIndex = 0;
+            rtl::OString aSearchPath = pTC->GetSearchPath();
+            do
             {
-                ByteString aToken = aSearchPath.GetToken( 0, cSearchDelim, nIndex );
+                rtl::OString aToken = aSearchPath.getToken( 0, cSearchDelim, nIndex );
                 if (aSysSearchPath.getLength())
                     aSysSearchPath.append(cSearchDelim);
                 aSysSearchPath.append(aToken);
@@ -869,6 +869,7 @@ ERRTYPE RscCompiler::Link()
                 aSysSearchPath.append(cSearchDelim);
                 aSysSearchPath.append(aToken);
             }
+            while ( nIndex >= 0 );
             OSL_TRACE( "setting search path for language %s: %s", it->aLangName.GetBuffer(), aSysSearchPath.getStr() );
             pTC->SetSysSearchPath(aSysSearchPath.makeStringAndClear());
 
@@ -975,12 +976,12 @@ ERRTYPE RscCompiler::Link()
 
         pTC->pEH->StdOut( "Generating .cxx file\n" );
 
-        ByteString aHxx = pCL->aOutputHxx;
-        if( !aHxx.Len() )
+        rtl::OString aHxx = pCL->aOutputHxx;
+        if( !aHxx.getLength() )
         {
             UniString aUniOutputCxx( pCL->aOutputCxx, RTL_TEXTENCODING_ASCII_US );
-            aHxx = rtl::OUStringToOString(DirEntry( aUniOutputCxx ).GetBase(), RTL_TEXTENCODING_ASCII_US);
-            aHxx += ".hxx";
+            aHxx = rtl::OStringBuffer(rtl::OUStringToOString(DirEntry(aUniOutputCxx).GetBase(),
+                RTL_TEXTENCODING_ASCII_US)).append(".hxx").makeStringAndClear();
         }
 
         // Schreibe Datei
@@ -1050,20 +1051,17 @@ void RscCompiler::Append( const rtl::OString& rOutputSrs,
 
 bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
                                     const WriteRcContext& rContext,
-                                    const ByteString& rBaseFileName,
+                                    const rtl::OString& rBaseFileName,
                                     ByteString& rImagePath,
                                     FILE* pSysListFile )
 {
-    ::std::list< ByteString >                   aFileNames;
-    bool                                        bFound = false;
+    ::std::list< rtl::OString >  aFileNames;
+    bool bFound = false;
 
-    ByteString  aFileName( rBaseFileName );
-    aFileNames.push_back( aFileName += ".png" );
+    aFileNames.push_back( rBaseFileName + rtl::OString(".png") );
+    aFileNames.push_back( rBaseFileName + rtl::OString(".bmp") );
 
-    aFileName = rBaseFileName;
-    aFileNames.push_back( aFileName += ".bmp" );
-
-    ::std::list< ByteString >::iterator aFileIter( aFileNames.begin() );
+    ::std::list< rtl::OString >::iterator aFileIter( aFileNames.begin() );
 
     while( ( aFileIter != aFileNames.end() ) && !bFound )
     {
@@ -1090,11 +1088,9 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
 
                 while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound )
                 {
-                    ByteString aSearch( aReplIter->second );
-                    aSearch.ToLowerAscii();
-                    ByteString aSearchIn( aRelPathStr );
-                    aSearchIn.ToLowerAscii();
-                    if( aSearchIn.Search( aSearch ) == 0 )
+                    rtl::OString aSearch(aReplIter->second.toAsciiLowerCase());
+                    rtl::OString aSearchIn(aRelPathStr.toAsciiLowerCase());
+                    if( aSearchIn.indexOf(aSearch) == 0 )
                     {
                         sal_Int32       nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength();
                         const sal_Char* pChars = aRelPathStr.getStr();
@@ -1145,7 +1141,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
 {
     SvFileStream                aIStm( rSrsInPath.GetFull(), STREAM_READ );
     SvFileStream                aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
-    ::std::vector< ByteString > aMissingImages;
+    ::std::vector< rtl::OString > aMissingImages;
     FILE*                       pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL;
 
     if( !aIStm.GetError() && !aOStm.GetError() )
@@ -1183,7 +1179,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
                     }
                     while( aLine.Search( "Prefix" ) == STRING_NOTFOUND );
 
-                    const ByteString aPrefix( getToken(aLine, 1, '"') );
+                    const rtl::OString aPrefix( getToken(aLine, 1, '"') );
                     aIStm.Seek( nImgListStartPos );
 
                     do