diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /rsc/source | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'rsc/source')
-rw-r--r-- | rsc/source/parser/erscerr.cxx | 2 | ||||
-rw-r--r-- | rsc/source/parser/rscdb.cxx | 10 | ||||
-rw-r--r-- | rsc/source/parser/rscibas.cxx | 10 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 2 | ||||
-rw-r--r-- | rsc/source/parser/rsclex.cxx | 5 | ||||
-rw-r--r-- | rsc/source/prj/start.cxx | 26 | ||||
-rw-r--r-- | rsc/source/res/rscall.cxx | 12 | ||||
-rw-r--r-- | rsc/source/res/rscmgr.cxx | 2 | ||||
-rw-r--r-- | rsc/source/res/rscstr.cxx | 2 | ||||
-rw-r--r-- | rsc/source/res/rsctop.cxx | 4 | ||||
-rw-r--r-- | rsc/source/rsc/rsc.cxx | 82 | ||||
-rw-r--r-- | rsc/source/tools/rscdef.cxx | 36 | ||||
-rw-r--r-- | rsc/source/tools/rschash.cxx | 2 | ||||
-rw-r--r-- | rsc/source/tools/rsctools.cxx | 8 |
14 files changed, 98 insertions, 105 deletions
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index 34e5f385dcd2..29da7b660a53 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -79,7 +79,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) if( 1 == nErrors ) StdLstErr(OString::number(nErrors).getStr()); else - StdLstErr(rtl::OString::valueOf(static_cast<sal_Int32>(nErrors -1)).getStr()); + StdLstErr(OString::valueOf(static_cast<sal_Int32>(nErrors -1)).getStr()); StdLstErr( " Error" ); StdLstErr( " found!!" ); } diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index ef74ef7c360d..7c975e09e281 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -34,12 +34,10 @@ #include <rscdb.hxx> #include <rscrsc.hxx> -using ::rtl::OString; -using ::rtl::OStringBuffer; RscTypCont :: RscTypCont( RscError * pErrHdl, RSCBYTEORDER_TYPE nOrder, - const rtl::OString& rSearchPath, + const OString& rSearchPath, sal_uInt32 nFlagsP ) : nSourceCharSet( RTL_TEXTENCODING_UTF8 ), @@ -75,9 +73,9 @@ RscTypCont :: RscTypCont( RscError * pErrHdl, Init(); } -rtl::OString RscTypCont::ChangeLanguage(const rtl::OString& rNewLang) +OString RscTypCont::ChangeLanguage(const OString& rNewLang) { - rtl::OString aRet = aLanguage; + OString aRet = aLanguage; aLanguage = rNewLang; ::std::vector< OUString > aFallbacks; @@ -99,7 +97,7 @@ rtl::OString RscTypCont::ChangeLanguage(const rtl::OString& rNewLang) for (::std::vector< OUString >::const_iterator it( aFallbacks.begin()); it != aFallbacks.end(); ++it) { - rtl::OString aLang( OUStringToOString( *it, RTL_TEXTENCODING_ASCII_US)); + OString aLang( OUStringToOString( *it, RTL_TEXTENCODING_ASCII_US)); sal_uInt32 nID = GetLangId( aLang ); bool bAdd = (nID == 0); if ( bAdd ) diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 7ff0487fa105..ddbdd870875f 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -60,10 +60,10 @@ void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal ) } -typedef boost::unordered_map< rtl::OString, sal_uInt32, rtl::OStringHash > langmap; +typedef boost::unordered_map< OString, sal_uInt32, OStringHash > langmap; static langmap ULong_Iso_map; -sal_uInt32 GetLangId(const rtl::OString &rLang) +sal_uInt32 GetLangId(const OString &rLang) { langmap::iterator pIter = ULong_Iso_map.find( rLang ); if ( pIter != ULong_Iso_map.end()) @@ -114,10 +114,10 @@ void RscLangEnum::Init( RscNameTable& rNames ) SetConstant( rNames.Put( "x-comment", CONSTNAME, mnLangId ), mnLangId ); mnLangId++; - rtl::OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" ); + OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" ); if ( !aEnvIsoTokens.isEmpty() ) { - rtl::OString aIsoToken; + OString aIsoToken; sal_uInt16 nTokenCounter = 0; sal_Bool bOneMore = 1; while ( bOneMore ) @@ -151,7 +151,7 @@ Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames ) { SetConstant( nResult = rNames.Put( pLang, CONSTNAME, mnLangId ), mnLangId ); // insert new lang to ULong_Iso_map - rtl::OString aLang( pLang ); + OString aLang( pLang ); bAdd = (GetLangId( aLang ) == 0); if ( bAdd ) ULong_Iso_map[ aLang ] = mnLangId; diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index d302deef625e..e27830901761 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -33,7 +33,7 @@ #include <rsclex.hxx> #include <rscyacc.hxx> -void RscTypCont::InsWinBit( RscTop * pClass, const rtl::OString& rName, +void RscTypCont::InsWinBit( RscTop * pClass, const OString& rName, Atom nVal ) { RscClient * pClient; diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index fcf0733670f4..3f795ea7eba7 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -39,9 +39,6 @@ #include <rtl/textcvt.h> #include <rtl/textenc.h> -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringHash; const char* StringContainer::putString( const char* pString ) { @@ -368,7 +365,7 @@ void IncludeParser( RscFileInst * pFileInst ) } else if( INCLUDE_STRING == nToken ){ lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string, - rtl::OString() ); + OString() ); pFName->InsertDependFile( lKey, ULONG_MAX ); }; }; diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index acf83dbf8840..f15472cff148 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -46,8 +46,8 @@ extern "C" } int rsc2_main(int, char**); -static sal_Bool CallPrePro( const rtl::OString& rInput, - const rtl::OString& rOutput, RscPtrPtr * pCmdLine, +static sal_Bool CallPrePro( const OString& rInput, + const OString& rOutput, RscPtrPtr * pCmdLine, sal_Bool bResponse ) { RscPtrPtr aNewCmdL; // Kommandozeile @@ -55,7 +55,7 @@ static sal_Bool CallPrePro( const rtl::OString& rInput, RscPtrPtr * pCmdL = &aNewCmdL; int i, nRet; FILE* fRspFile = NULL; - rtl::OString aRspFileName; + OString aRspFileName; if( bResponse ) { @@ -101,7 +101,7 @@ static sal_Bool CallPrePro( const rtl::OString& rInput, if( fRspFile ) { aRespCmdL.Append( rsc_strdup( "rscpp" ) ); - rtl::OStringBuffer aTmpStr; + OStringBuffer aTmpStr; aTmpStr.append('@').append(aRspFileName); aRespCmdL.Append( rsc_strdup( aTmpStr.getStr() ) ); aRespCmdL.Append( (void *)0 ); @@ -143,10 +143,10 @@ static sal_Bool CallPrePro( const rtl::OString& rInput, static sal_Bool CallRsc2( RscStrList * pInputList, - const rtl::OString &rSrsName, RscPtrPtr * pCmdLine ) + const OString &rSrsName, RscPtrPtr * pCmdLine ) { int nRet; - rtl::OString* pString; + OString* pString; RscVerbosity eVerbosity = RscVerbosityNormal; RscPtrPtr aNewCmdL; @@ -210,15 +210,15 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) sal_Bool bHelp = sal_False; sal_Bool bError = sal_False; sal_Bool bResponse = sal_False; - rtl::OString aSrsName; - rtl::OString aResName; + OString aSrsName; + OString aResName; RscStrList aInputList; RscStrList aTmpList; char * pStr; char ** ppStr; RscPtrPtr aCmdLine; // Kommandozeile sal_uInt32 i; - rtl::OString* pString; + OString* pString; pStr = ::ResponseFile( &aCmdLine, argv, argc ); if( pStr ) @@ -261,7 +261,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) else { // Eingabedatei - aInputList.push_back( new rtl::OString(*ppStr) ); + aInputList.push_back( new OString(*ppStr) ); } ppStr++; i++; @@ -274,7 +274,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) aResName = OutputFile( *aInputList[ 0 ], "res" ); if( ! bSetSrs ) { - aSrsName = rtl::OStringBuffer("-fp=").append(OutputFile(*aInputList[0], "srs")). + aSrsName = OStringBuffer("-fp=").append(OutputFile(*aInputList[0], "srs")). makeStringAndClear(); } }; @@ -283,7 +283,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) bPrePro = sal_False; if( bPrePro && !aInputList.empty() ) { - rtl::OString aTmpName; + OString aTmpName; for ( size_t k = 0, n = aInputList.size(); k < n; ++k ) { @@ -295,7 +295,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) bError = sal_True; break; } - aTmpList.push_back( new rtl::OString(aTmpName) ); + aTmpList.push_back( new OString(aTmpName) ); }; }; diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx index ebd237913b67..a3d0df50d651 100644 --- a/rsc/source/res/rscall.cxx +++ b/rsc/source/res/rscall.cxx @@ -36,16 +36,16 @@ Atom nRsc_EXTRADATA = InvalidAtom; void InitRscCompiler() { - pStdParType = new rtl::OString(RTL_CONSTASCII_STRINGPARAM( + pStdParType = new OString(RTL_CONSTASCII_STRINGPARAM( "( const ResId & rResId, sal_Bool")); - pStdPar1 = new rtl::OString('('); - pStdPar2 = new rtl::OString('('); + pStdPar1 = new OString('('); + pStdPar2 = new OString('('); - pWinParType = new rtl::OString(RTL_CONSTASCII_STRINGPARAM( + pWinParType = new OString(RTL_CONSTASCII_STRINGPARAM( "( Window * pParent, const ResId & rResId, sal_Bool")); - pWinPar1 = new rtl::OString(RTL_CONSTASCII_STRINGPARAM( + pWinPar1 = new OString(RTL_CONSTASCII_STRINGPARAM( "( pParent,")); - pWinPar2 = new rtl::OString(RTL_CONSTASCII_STRINGPARAM( + pWinPar2 = new OString(RTL_CONSTASCII_STRINGPARAM( "( this,")); nRefDeep = 10; nRsc_XYMAPMODEId = InvalidAtom; diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index 9f3642aa1f1a..3058e01c4c20 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -165,7 +165,7 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, GetObjNode( pClassData->aRefId ); if( !pObjNode && pTC ) { - rtl::OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId())); + OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId())); aMsg.append(' ').append(pClassData->aRefId.GetName()); aError = WRN_MGR_REFNOTFOUND; pTC->pEH->Error(aError, rInst.pClass, rId, aMsg.getStr()); diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index c0a05607ccee..79cf3605b502 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -234,7 +234,7 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, { if( pTC ) { - rtl::OStringBuffer aMsg(pHS->getString( + OStringBuffer aMsg(pHS->getString( pRefClass->GetId())); aMsg.append(' ').append(aId.GetName()); aError = WRN_STR_REFNOTFOUND; diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index 454a4abdd6de..e8ac3fc8b5df 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -35,8 +35,8 @@ RscTop::RscTop( Atom nId, sal_uInt32 nTypIdent, RscTop * pSuperCl ) pSuperClass->aCallParType ); } -void RscTop::SetCallPar(const rtl::OString& rPar1, const rtl::OString& rPar2, - const rtl::OString& rParType) +void RscTop::SetCallPar(const OString& rPar1, const OString& rPar2, + const OString& rParType) { aCallPar1 = rPar1; aCallPar2 = rPar2; diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 75377960b7ae..0ef48b6cd26a 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -57,12 +57,12 @@ using comphelper::string::getToken; using comphelper::string::getTokenCount; -rtl::OString* pStdParType = NULL; -rtl::OString* pStdPar1 = NULL; -rtl::OString* pStdPar2 = NULL; -rtl::OString* pWinParType = NULL; -rtl::OString* pWinPar1 = NULL; -rtl::OString* pWinPar2 = NULL; +OString* pStdParType = NULL; +OString* pStdPar1 = NULL; +OString* pStdPar2 = NULL; +OString* pWinParType = NULL; +OString* pWinPar1 = NULL; +OString* pWinPar2 = NULL; sal_uInt32 nRefDeep = 10; AtomContainer* pHS = NULL; @@ -154,7 +154,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) else if( !rsc_strnicmp( (*ppStr) + 1, "i", 1 ) ) { // define include path nCommands |= INCLUDE_FLAG; - rtl::OStringBuffer aBuffer(aPath); + OStringBuffer aBuffer(aPath); if (aBuffer.getLength()) aBuffer.append(SAL_PATHSEPARATOR); aBuffer.append((*ppStr) + 2); @@ -168,13 +168,13 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) } else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) ) { // additional language specific include for system dependent files - const rtl::OString aSysSearchDir( (*ppStr)+5 ); + const OString aSysSearchDir( (*ppStr)+5 ); // ignore empty -lip= arguments that we get lots of these days if (!aSysSearchDir.isEmpty()) { m_aOutputFiles.back().aSysSearchDirs.push_back(aSysSearchDir); - rtl::OString aLangSearchPath = m_aOutputFiles.back().aLangSearchPath; + OString aLangSearchPath = m_aOutputFiles.back().aLangSearchPath; if( !aLangSearchPath.isEmpty() ) { aLangSearchPath = aLangSearchPath + OString( SAL_PATHSEPARATOR ); @@ -203,13 +203,13 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) } else if( !rsc_stricmp( (*ppStr) + 1, "lg" ) ) { - m_aOutputFiles.back().aLangName = rtl::OString(); + m_aOutputFiles.back().aLangName = OString(); } else if( !rsc_strnicmp( (*ppStr) + 1, "lg", 2 ) ) { if( !m_aOutputFiles.back().aLangName.isEmpty() ) m_aOutputFiles.push_back( OutputFile() ); - m_aOutputFiles.back().aLangName = rtl::OString((*ppStr)+3); + m_aOutputFiles.back().aLangName = OString((*ppStr)+3); } else pEH->FatalError( ERR_UNKNOWNSW, RscId(), *ppStr ); @@ -217,7 +217,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) else { // Eingabedatei - aInputList.push_back( new rtl::OString(*ppStr) ); + aInputList.push_back( new OString(*ppStr) ); } ppStr++; i++; @@ -630,12 +630,12 @@ ERRTYPE RscCompiler::Link() pTC->ChangeLanguage( it->aLangName ); pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 ); pTC->ClearSysNames(); - rtl::OStringBuffer aSysSearchPath(it->aLangSearchPath); + OStringBuffer aSysSearchPath(it->aLangSearchPath); sal_Int32 nIndex = 0; - rtl::OString aSearchPath = pTC->GetSearchPath(); + OString aSearchPath = pTC->GetSearchPath(); do { - rtl::OString aToken = aSearchPath.getToken( 0, cSearchDelim, nIndex ); + OString aToken = aSearchPath.getToken( 0, cSearchDelim, nIndex ); if (aSysSearchPath.getLength()) aSysSearchPath.append(cSearchDelim); aSysSearchPath.append(aToken); @@ -735,12 +735,12 @@ ERRTYPE RscCompiler::Link() return( aError ); } -void RscCompiler::Append( const rtl::OString& rOutputSrs, - const rtl::OString& rTmpFile ) +void RscCompiler::Append( const OString& rOutputSrs, + const OString& rTmpFile ) { if( !::Append( rOutputSrs, rTmpFile ) ) { - rtl::OStringBuffer aTemp(rOutputSrs); + OStringBuffer aTemp(rOutputSrs); aTemp.append(" or ").append(rTmpFile); pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aTemp.getStr() ); } @@ -748,21 +748,21 @@ void RscCompiler::Append( const rtl::OString& rOutputSrs, bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, const WriteRcContext& rContext, - const rtl::OString& rBaseFileName, - rtl::OString& rImagePath, + const OString& rBaseFileName, + OString& rImagePath, FILE* pSysListFile ) { - ::std::list< rtl::OString > aFileNames; + ::std::list< OString > aFileNames; bool bFound = false; - aFileNames.push_back( rBaseFileName + rtl::OString(".png") ); - aFileNames.push_back( rBaseFileName + rtl::OString(".bmp") ); + aFileNames.push_back( rBaseFileName + OString(".png") ); + aFileNames.push_back( rBaseFileName + OString(".bmp") ); - ::std::list< rtl::OString >::iterator aFileIter( aFileNames.begin() ); + ::std::list< OString >::iterator aFileIter( aFileNames.begin() ); while( ( aFileIter != aFileNames.end() ) && !bFound ) { - ::std::list< rtl::OString >::const_iterator aDirIter( rOutputFile.aSysSearchDirs.begin() ); + ::std::list< OString >::const_iterator aDirIter( rOutputFile.aSysSearchDirs.begin() ); while( ( aDirIter != rOutputFile.aSysSearchDirs.end() ) && !bFound ) { @@ -791,8 +791,8 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound ) { - rtl::OString aSearch(aReplIter->second.toAsciiLowerCase()); - rtl::OString aSearchIn(aRelPathStr.toAsciiLowerCase()); + OString aSearch(aReplIter->second.toAsciiLowerCase()); + OString aSearchIn(aRelPathStr.toAsciiLowerCase()); if( aSearchIn.indexOf(aSearch) == 0 ) { sal_Int32 nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength(); @@ -838,24 +838,24 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, { SvFileStream aIStm( rSrsInPath, STREAM_READ ); SvFileStream aOStm( rSrsOutPath, STREAM_WRITE | STREAM_TRUNC ); - ::std::vector< rtl::OString > aMissingImages; + ::std::vector< OString > aMissingImages; FILE* pSysListFile = rContext.aOutputSysList.isEmpty() ? NULL : fopen( rContext.aOutputSysList.getStr(), "ab" ); if( !aIStm.GetError() && !aOStm.GetError() ) { - rtl::OString aLine; - rtl::OString aFilePath; + OString aLine; + OString aFilePath; while( aIStm.ReadLine( aLine ) ) { if( ( getTokenCount(aLine, '=') == 2 ) && ( getToken(aLine, 0, '=').indexOf("File") != -1 ) ) { - rtl::OString aBaseFileName( getToken(getToken(aLine, 1, '"'), 0, '.') ); + OString aBaseFileName( getToken(getToken(aLine, 1, '"'), 0, '.') ); if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) ) { - aLine = rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("File = \"")). + aLine = OStringBuffer(RTL_CONSTASCII_STRINGPARAM("File = \"")). append(aFilePath).append(RTL_CONSTASCII_STRINGPARAM("\";")). makeStringAndClear(); } @@ -866,7 +866,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, } else if (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("ImageList")) != -1) { - ::std::vector< ::std::pair< rtl::OString, sal_Int32 > > aEntryVector; + ::std::vector< ::std::pair< OString, sal_Int32 > > aEntryVector; aOStm.WriteLine(aLine); @@ -881,7 +881,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, } while (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("Prefix")) == -1); - const rtl::OString aPrefix( getToken(aLine, 1, '"') ); + const OString aPrefix( getToken(aLine, 1, '"') ); aIStm.Seek( nImgListStartPos ); do @@ -905,14 +905,14 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, { sal_Int32 nNumber = atoi(aLine.getStr()); - rtl::OStringBuffer aBuf(aPrefix); + OStringBuffer aBuf(aPrefix); if( nNumber < 10000 ) aBuf.append('0'); aBuf.append(aLine); - rtl::OString aBaseFileName = aBuf.makeStringAndClear(); + OString aBaseFileName = aBuf.makeStringAndClear(); if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) ) - aEntryVector.push_back( ::std::pair< rtl::OString, sal_Int32 >( aFilePath, nNumber ) ); + aEntryVector.push_back( ::std::pair< OString, sal_Int32 >( aFilePath, nNumber ) ); else aMissingImages.push_back( aBaseFileName ); } @@ -933,11 +933,11 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, aOStm.WriteLine(aLine); } - aOStm.WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("FileList = {"))); + aOStm.WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("FileList = {"))); for( sal_uInt32 i = 0; i < aEntryVector.size(); ++i ) { - rtl::OStringBuffer aEntryString( + OStringBuffer aEntryString( RTL_CONSTASCII_STRINGPARAM("< \"")); aEntryString.append(aEntryVector[i].first); @@ -948,7 +948,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, aOStm.WriteLine(aEntryString.makeStringAndClear()); } - aOStm.WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("};"))); + aOStm.WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("};"))); } else aOStm.WriteLine(aLine); @@ -960,7 +960,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, if( aMissingImages.size() > 0 ) { - rtl::OStringBuffer aImagesStr; + OStringBuffer aImagesStr; for( sal_uInt32 i = 0; i < aMissingImages.size(); ++i ) { diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index 04a5dcd7e8fd..d888a3e9b7ff 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -92,9 +92,9 @@ RscId::operator sal_Int32() const return( GetNumber() ); } -rtl::OString RscId::GetName() const +OString RscId::GetName() const { - rtl::OStringBuffer aStr; + OStringBuffer aStr; if ( !aExp.IsNothing() ) { @@ -107,7 +107,7 @@ rtl::OString RscId::GetName() const return aStr.makeStringAndClear(); } -RscDefine::RscDefine( sal_uLong lKey, const rtl::OString& rDefName, sal_Int32 lDefId ) +RscDefine::RscDefine( sal_uLong lKey, const OString& rDefName, sal_Int32 lDefId ) : StringNode( rDefName ) { nRefCount = 0; @@ -116,7 +116,7 @@ RscDefine::RscDefine( sal_uLong lKey, const rtl::OString& rDefName, sal_Int32 lD pExp = NULL; } -RscDefine::RscDefine( sal_uLong lKey, const rtl::OString& rDefName, +RscDefine::RscDefine( sal_uLong lKey, const OString& rDefName, RscExpression * pExpression ) : StringNode( rDefName ) { @@ -145,7 +145,7 @@ void RscDefine::DefineToNumber() if( pExp ) delete pExp; pExp = NULL; - SetName(rtl::OString::valueOf(lId)); + SetName(OString::valueOf(lId)); } sal_Bool RscDefine::Evaluate(){ @@ -161,14 +161,14 @@ RscDefine * RscDefine::Search( const char * pStr ){ return (RscDefine *)StringNode::Search( pStr ); } -rtl::OString RscDefine::GetMacro() +OString RscDefine::GetMacro() { if( pExp ) return pExp->GetMacro(); - return rtl::OString::valueOf(lId); + return OString::valueOf(lId); } -RscDefine * RscDefineList::New( sal_uLong lFileKey, const rtl::OString& rDefName, +RscDefine * RscDefineList::New( sal_uLong lFileKey, const OString& rDefName, sal_Int32 lDefId, size_t lPos ) { RscDefine * pDef; @@ -186,7 +186,7 @@ RscDefine * RscDefineList::New( sal_uLong lFileKey, const rtl::OString& rDefName return pDef; } -RscDefine * RscDefineList::New( sal_uLong lFileKey, const rtl::OString& rDefName, +RscDefine * RscDefineList::New( sal_uLong lFileKey, const OString& rDefName, RscExpression * pExpression, size_t lPos ) { RscDefine * pDef; @@ -241,7 +241,7 @@ sal_Bool RscExpType::Evaluate( sal_Int32 * plValue ) const{ return sal_True; } -void RscExpType::AppendMacro(rtl::OStringBuffer& rStr) const +void RscExpType::AppendMacro(OStringBuffer& rStr) const { if( IsDefinition() ) rStr.append(aExp.pDef->GetName()); @@ -305,9 +305,9 @@ sal_Bool RscExpression::Evaluate( sal_Int32 * plValue ){ return sal_False; } -rtl::OString RscExpression::GetMacro() +OString RscExpression::GetMacro() { - rtl::OStringBuffer aLeft; + OStringBuffer aLeft; // Ausgabeoptimierung if( aLeftExp.IsNothing() ) @@ -458,7 +458,7 @@ RscFileTab :: ~RscFileTab(){ }; } -sal_uLong RscFileTab :: Find( const rtl::OString& rName ) +sal_uLong RscFileTab :: Find( const OString& rName ) { sal_uIntPtr aIndex = FirstIndex(); while( aIndex != UNIQUEINDEX_ENTRY_NOTFOUND && (Get(aIndex)->aFileName != rName) ) @@ -533,7 +533,7 @@ sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos, return sal_True; } -RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const rtl::OString& rDefName, +RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const OString& rDefName, sal_Int32 lId, sal_uLong lPos ) { RscDefine * pDef = FindDef( rDefName ); @@ -552,7 +552,7 @@ RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const rtl::OString& rDefName return( pDef ); } -RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const rtl::OString& rDefName, +RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const OString& rDefName, RscExpression * pExp, sal_uLong lPos ) { RscDefine * pDef = FindDef( rDefName ); @@ -594,7 +594,7 @@ void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){ } } -sal_uLong RscFileTab :: NewCodeFile( const rtl::OString& rName ) +sal_uLong RscFileTab :: NewCodeFile( const OString& rName ) { sal_uLong lKey = Find( rName ); if( UNIQUEINDEX_ENTRY_NOTFOUND == lKey ) @@ -608,8 +608,8 @@ sal_uLong RscFileTab :: NewCodeFile( const rtl::OString& rName ) return lKey; } -sal_uLong RscFileTab :: NewIncFile(const rtl::OString& rName, - const rtl::OString& rPath) +sal_uLong RscFileTab :: NewIncFile(const OString& rName, + const OString& rPath) { sal_uLong lKey = Find( rName ); if( UNIQUEINDEX_ENTRY_NOTFOUND == lKey ) diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx index ac684f3b0f77..652b804bcdb6 100644 --- a/rsc/source/tools/rschash.cxx +++ b/rsc/source/tools/rschash.cxx @@ -19,8 +19,6 @@ #include <rschash.hxx> -using ::rtl::OString; -using ::rtl::OStringHash; AtomContainer::AtomContainer() { diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 8131826b595a..1310a915b6fc 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -78,7 +78,7 @@ char* rsc_strdup( const char* pStr ) return pBuffer; } -rtl::OString GetTmpFileName() +OString GetTmpFileName() { OUString aTmpURL, aTmpFile; osl_createTempFile( NULL, NULL, &aTmpURL.pData ); @@ -86,7 +86,7 @@ rtl::OString GetTmpFileName() return OUStringToOString( aTmpFile, RTL_TEXTENCODING_MS_1252 ); } -sal_Bool Append(FILE * fDest, const rtl::OString &rTmpFile) +sal_Bool Append(FILE * fDest, const OString &rTmpFile) { #define MAX_BUF 4096 FILE *fSource = fopen(rTmpFile.getStr(), "rb"); @@ -112,7 +112,7 @@ sal_Bool Append(FILE * fDest, const rtl::OString &rTmpFile) return bSuccess; } -sal_Bool Append(const rtl::OString &rOutputSrs, const rtl::OString &rTmpFile) +sal_Bool Append(const OString &rOutputSrs, const OString &rTmpFile) { FILE * fDest = fopen(rOutputSrs.getStr(), "ab"); @@ -125,7 +125,7 @@ sal_Bool Append(const rtl::OString &rOutputSrs, const rtl::OString &rTmpFile) } /* replaces extension of a file name */ -rtl::OString OutputFile(const rtl::OString &rInput, const char * pExt) +OString OutputFile(const OString &rInput, const char * pExt) { sal_Int32 nSepInd = rInput.lastIndexOf("."); |