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/tools | |
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/tools')
-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 |
3 files changed, 22 insertions, 24 deletions
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("."); |