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 /tools/source/ref | |
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 'tools/source/ref')
-rw-r--r-- | tools/source/ref/errinf.cxx | 16 | ||||
-rw-r--r-- | tools/source/ref/globname.cxx | 6 | ||||
-rw-r--r-- | tools/source/ref/pstm.cxx | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 5631d4627fa1..0ac0de87a9ac 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -177,10 +177,10 @@ public: static void aDspFunc(const OUString &rErr, const OUString &rAction) { - rtl::OStringBuffer aErr("Aktion: "); - aErr.append(rtl::OUStringToOString(rAction, RTL_TEXTENCODING_ASCII_US)); + OStringBuffer aErr("Aktion: "); + aErr.append(OUStringToOString(rAction, RTL_TEXTENCODING_ASCII_US)); aErr.append(" Fehler: "); - aErr.append(rtl::OUStringToOString(rErr, RTL_TEXTENCODING_ASCII_US)); + aErr.append(OUStringToOString(rErr, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aErr.getStr()); } @@ -307,10 +307,10 @@ sal_uInt16 ErrorHandler::HandleError_Impl( { if(!pData->pDsp) { - rtl::OStringBuffer aStr("Action: "); - aStr.append(rtl::OUStringToOString(aAction, RTL_TEXTENCODING_ASCII_US)); + OStringBuffer aStr("Action: "); + aStr.append(OUStringToOString(aAction, RTL_TEXTENCODING_ASCII_US)); aStr.append("\nFehler: "); - aStr.append(rtl::OUStringToOString(aErr, RTL_TEXTENCODING_ASCII_US)); + aStr.append(OUStringToOString(aErr, RTL_TEXTENCODING_ASCII_US)); OSL_FAIL(aStr.getStr()); } else @@ -377,7 +377,7 @@ sal_Bool SimpleErrorHandler::CreateString( const ErrorInfo *pInfo, OUString &rStr, sal_uInt16 &) const { sal_uIntPtr nId = pInfo->GetErrorCode(); - rtl::OStringBuffer aStr("Id "); + OStringBuffer aStr("Id "); aStr.append(static_cast<sal_Int32>(nId)); aStr.append(" only handled by SimpleErrorHandler"); aStr.append("\nErrorCode: "); @@ -395,7 +395,7 @@ sal_Bool SimpleErrorHandler::CreateString( aStr.append("\nDId "); aStr.append(static_cast<sal_Int32>(*pDyn)); } - rStr = rtl::OStringToOUString(aStr.makeStringAndClear(), + rStr = OStringToOUString(aStr.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); return sal_True; } diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx index 503cf70ecf2b..1ed7b0e12e1b 100644 --- a/tools/source/ref/globname.cxx +++ b/tools/source/ref/globname.cxx @@ -222,7 +222,7 @@ void SvGlobalName::MakeFromMemory( void * pData ) sal_Bool SvGlobalName::MakeId( const String & rIdStr ) { - rtl::OString aStr(rtl::OUStringToOString(rIdStr, + OString aStr(OUStringToOString(rIdStr, RTL_TEXTENCODING_ASCII_US)); const sal_Char *pStr = aStr.getStr(); if( rIdStr.Len() == 36 @@ -300,7 +300,7 @@ sal_Bool SvGlobalName::MakeId( const String & rIdStr ) String SvGlobalName::GetHexName() const { - rtl::OStringBuffer aHexBuffer; + OStringBuffer aHexBuffer; sal_Char buf[ 10 ]; sal_uInt32 Data1; @@ -328,7 +328,7 @@ String SvGlobalName::GetHexName() const sprintf( buf, "%2.2x", pImp->szData[ i ] ); aHexBuffer.append(buf); } - return rtl::OStringToOUString(aHexBuffer.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); + return OStringToOUString(aHexBuffer.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); } com::sun::star::uno::Sequence < sal_Int8 > SvGlobalName::GetByteSequence() const diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index ffe8d348176c..66e4a28909c7 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -110,7 +110,7 @@ void TOOLS_DLLPUBLIC ReadObjects( SvPersistListReadable& rLst, SvPersistStream & #ifdef DBG_UTIL if( nObjLen + nObjPos != rStm.Tell() ) { - rtl::OStringBuffer aStr("false list len: read = "); + OStringBuffer aStr("false list len: read = "); aStr.append(static_cast<sal_Int64>(rStm.Tell() - nObjPos)); aStr.append(", should = "); aStr.append(static_cast<sal_Int64>(nObjLen)); @@ -586,7 +586,7 @@ sal_uInt32 SvPersistStream::ReadObj if( !pFunc ) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr("no class with id: " ); + OStringBuffer aStr("no class with id: " ); aStr.append(static_cast<sal_Int32>(nClassId)); aStr.append(" registered"); DBG_WARNING(aStr.getStr()); @@ -613,7 +613,7 @@ sal_uInt32 SvPersistStream::ReadObj #ifdef DBG_UTIL if( nObjLen + nObjPos != Tell() ) { - rtl::OStringBuffer aStr("false object len: read = "); + OStringBuffer aStr("false object len: read = "); aStr.append(static_cast<sal_Int64>((long)(Tell() - nObjPos))); aStr.append(", should = "); aStr.append(static_cast<sal_Int32>(nObjLen)); |