From 6f50961e69406a17d6ec998956a6b33208b1001b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Oct 2018 12:06:00 +0200 Subject: remove more rtl::OUString and OString prefixes which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cppu/source/AffineBridge/AffineBridge.cxx | 4 +- cppu/source/LogBridge/LogBridge.cxx | 10 ++--- cppu/source/UnsafeBridge/UnsafeBridge.cxx | 4 +- cppu/source/helper/purpenv/Proxy.hxx | 4 +- .../helper/purpenv/helper_purpenv_Environment.cxx | 28 ++++++------- .../source/helper/purpenv/helper_purpenv_Proxy.cxx | 2 +- cppu/source/threadpool/current.cxx | 4 +- cppu/source/typelib/static_types.cxx | 3 -- cppu/source/typelib/typelib.cxx | 20 ++++----- cppu/source/uno/EnvStack.cxx | 32 +++++++-------- cppu/source/uno/IdentityMapping.cxx | 2 +- cppu/source/uno/cascade_mapping.cxx | 48 +++++++++++----------- cppu/source/uno/eq.hxx | 2 +- cppu/source/uno/lbenv.cxx | 14 +++---- cppu/source/uno/lbmap.cxx | 2 - cppu/source/uno/loadmodule.cxx | 4 +- cppu/source/uno/loadmodule.hxx | 2 +- 17 files changed, 87 insertions(+), 98 deletions(-) (limited to 'cppu/source') diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 2a14b3c890d8..1e2a45ac84cf 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -66,7 +66,7 @@ public: virtual void v_enter() override; virtual void v_leave() override; - virtual bool v_isValid(rtl::OUString * pReason) override; + virtual bool v_isValid(OUString * pReason) override; void innerDispatch(); void outerDispatch(bool loop); @@ -311,7 +311,7 @@ void AffineBridge::v_leave() m_innerMutex.release(); } -bool AffineBridge::v_isValid(rtl::OUString * pReason) +bool AffineBridge::v_isValid(OUString * pReason) { bool result = m_enterCount > 0; if (!result) diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index da8b1e64e702..4d7b922e50ce 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -51,7 +51,7 @@ public: virtual void v_enter() override; virtual void v_leave() override; - virtual bool v_isValid(rtl::OUString * pReason) override; + virtual bool v_isValid(OUString * pReason) override; }; LogBridge::LogBridge() @@ -108,7 +108,7 @@ void LogBridge::v_leave() m_mutex.release(); } -bool LogBridge::v_isValid(rtl::OUString * pReason) +bool LogBridge::v_isValid(OUString * pReason) { bool result = m_count > 0; if (!result) @@ -134,7 +134,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason) switch(_pTypeRef->eTypeClass) { case typelib_TypeClass_STRING: - SAL_INFO("cppu.log", "" << *static_cast< ::rtl::OUString*>(pArg)); + SAL_INFO("cppu.log", "" << *static_cast< OUString*>(pArg)); break; case typelib_TypeClass_BOOLEAN: SAL_INFO("cppu.log", "" << *static_cast(pArg)); @@ -201,9 +201,9 @@ static void LogProbe( void * pArgs[], uno_Any ** ppException ) { - ::rtl::OString sTemp; + OString sTemp; if ( pMemberType && pMemberType->pTypeName ) - sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US); + sTemp = OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US); if ( pre ) { SAL_INFO("cppu.log", "{ LogBridge () " << sTemp ); diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 892390b7a263..7cf945d44391 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -43,7 +43,7 @@ public: virtual void v_enter() override; virtual void v_leave() override; - virtual bool v_isValid(rtl::OUString * pReason) override; + virtual bool v_isValid(OUString * pReason) override; }; UnsafeBridge::UnsafeBridge() @@ -103,7 +103,7 @@ void UnsafeBridge::v_leave() m_mutex.release(); } -bool UnsafeBridge::v_isValid(rtl::OUString * pReason) +bool UnsafeBridge::v_isValid(OUString * pReason) { bool result = m_count > 0; if (!result) diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index f53702ef93d3..6f99ee7d42be 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -42,7 +42,7 @@ class Proxy : public uno_Interface // mapping information uno_Interface * m_pUnoI; // wrapped interface typelib_InterfaceTypeDescription * m_pTypeDescr; - rtl::OUString m_aOId; + OUString m_aOId; cppu::helper::purpenv::ProbeFun * m_probeFun; void * m_pProbeContext; @@ -53,7 +53,7 @@ public: uno_Environment * pFrom, uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr, - rtl::OUString const & rOId, + OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext); ~Proxy(); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx index 9bead78d0ce0..ceeee6eb0deb 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx @@ -72,19 +72,19 @@ public: void registerProxyInterface (void ** ppProxy, uno_freeProxyFunc freeProxy, - rtl::OUString const & oid, + OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr); void revokeInterface (void * pInterface); void getObjectIdentifier (void * pInterface, - rtl::OUString * pOid); + OUString * pOid); void getRegisteredInterface (void **, - rtl::OUString const & oid, + OUString const & oid, typelib_InterfaceTypeDescription *); void getRegisteredInterfaces(void ***, sal_Int32 * pnLen, uno_memAlloc memAlloc); void computeObjectIdentifier(void * pInterface, - rtl::OUString * pOid); + OUString * pOid); void acquireInterface (void * pInterface); void releaseInterface (void * pInterface); @@ -92,7 +92,7 @@ public: virtual void v_leave() override; virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) override; virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) override; - virtual bool v_isValid (rtl::OUString * pReason) override; + virtual bool v_isValid (OUString * pReason) override; protected: oslInterlockedCount m_nRef; @@ -170,7 +170,7 @@ static void s_getObjectIdentifier(uno_ExtEnvironment * pExtEnv, void * pInterface) { Base * pBase = static_cast(pExtEnv->aBase.pReserved); - pBase->getObjectIdentifier(pInterface, reinterpret_cast(ppOId)); + pBase->getObjectIdentifier(pInterface, reinterpret_cast(ppOId)); } static void s_getRegisteredInterface(uno_ExtEnvironment * pExtEnv, @@ -196,7 +196,7 @@ static void s_computeObjectIdentifier(uno_ExtEnvironment * pExtEnv, void * pInterface) { Base * pBase = static_cast(pExtEnv->aBase.pReserved); - pBase->computeObjectIdentifier(pInterface, reinterpret_cast(ppOId)); + pBase->computeObjectIdentifier(pInterface, reinterpret_cast(ppOId)); } static void s_acquireInterface(uno_ExtEnvironment * pExtEnv, void * pInterface) { @@ -317,7 +317,7 @@ extern "C" { static void s_registerProxyInterface_v(va_list * pParam) void Base::registerProxyInterface(void ** ppProxy, uno_freeProxyFunc freeProxy, - rtl::OUString const & oid, + OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr) { uno_Environment_invoke(m_pEnv, @@ -354,14 +354,14 @@ extern "C" { static void s_getObjectIdentifier_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); - rtl::OUString * pOId = va_arg(*pParam, rtl::OUString *); + OUString * pOId = va_arg(*pParam, OUString *); ExtEnv_getObjectIdentifier * pGetObjectIdentifier = va_arg(*pParam, ExtEnv_getObjectIdentifier *); pGetObjectIdentifier(pExtEnv, reinterpret_cast(pOId), pInterface); }} -void Base::getObjectIdentifier(void * pInterface, rtl::OUString * pOid) +void Base::getObjectIdentifier(void * pInterface, OUString * pOid) { uno_Environment_invoke(m_pEnv, s_getObjectIdentifier_v, @@ -385,7 +385,7 @@ extern "C" { static void s_getRegisteredInterface_v(va_list * pParam) }} void Base::getRegisteredInterface(void ** ppInterface, - rtl::OUString const & oid, + OUString const & oid, typelib_InterfaceTypeDescription * pTypeDescr) { uno_Environment_invoke(m_pEnv, @@ -428,14 +428,14 @@ extern "C" { static void s_computeObjectIdentifier_v(va_list * pParam) { uno_ExtEnvironment * pExtEnv = va_arg(*pParam, uno_ExtEnvironment *); void * pInterface = va_arg(*pParam, void *); - rtl::OUString * pOId = va_arg(*pParam, rtl::OUString *); + OUString * pOId = va_arg(*pParam, OUString *); ExtEnv_computeObjectIdentifier * pComputeObjectIdentifier = va_arg(*pParam, ExtEnv_computeObjectIdentifier *); pComputeObjectIdentifier(pExtEnv, reinterpret_cast(pOId), pInterface); }} -void Base::computeObjectIdentifier(void * pInterface, rtl::OUString * pOid) +void Base::computeObjectIdentifier(void * pInterface, OUString * pOid) { uno_Environment_invoke(m_pEnv, s_computeObjectIdentifier_v, @@ -501,7 +501,7 @@ void Base::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) m_pEnterable->callOut_v(pCallee, pParam); } -bool Base::v_isValid(rtl::OUString * pReason) +bool Base::v_isValid(OUString * pReason) { return m_pEnterable->isValid(pReason); } diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index 7ee3a4dadb0d..a781ff1d7796 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -195,7 +195,7 @@ Proxy::Proxy(uno::Mapping const & to_from, uno_Environment * pFrom, uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr, - rtl::OUString const & rOId, + OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext ) diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index b5c839b193cd..ed8891fabf8f 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -239,7 +239,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( // release inout parameter if (*ppCurrentContext) { - target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext); + target_env = Environment(OUString(pEnvTypeName), pEnvContext); OSL_ASSERT( target_env.is() ); if (! target_env.is()) return false; @@ -258,7 +258,7 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( if (! target_env.is()) { - target_env = Environment(rtl::OUString(pEnvTypeName), pEnvContext); + target_env = Environment(OUString(pEnvTypeName), pEnvContext); OSL_ASSERT( target_env.is() ); if (! target_env.is()) return false; diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index fe16b365b7f3..2ccac42f5df1 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -35,9 +35,6 @@ using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; - extern "C" { diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 1c8f17761cb8..ccfe85c9abe7 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -44,10 +44,6 @@ using namespace std; using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; - #ifdef _WIN32 #pragma pack(push, 8) #endif @@ -292,7 +288,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() typelib_TypeDescriptionReference * pTDR = (*aIt).second; if (pTDR) { - OString aTypeName( rtl::OUStringToOString( pTDR->pTypeName, RTL_TEXTENCODING_ASCII_US ) ); + OString aTypeName( OUStringToOString( pTDR->pTypeName, RTL_TEXTENCODING_ASCII_US ) ); SAL_INFO("cppu.typelib", "remaining type: " << aTypeName << "; ref count = " << pTDR->nRefCount); } else @@ -749,7 +745,7 @@ void newTypeDescription( pTmp->ppTypeRefs = new typelib_TypeDescriptionReference *[ nMembers ]; pTmp->ppMemberNames = new rtl_uString *[ nMembers ]; bool polymorphic = eTypeClass == typelib_TypeClass_STRUCT - && rtl::OUString::unacquired(&pTypeName).indexOf('<') >= 0; + && OUString::unacquired(&pTypeName).indexOf('<') >= 0; OSL_ASSERT(!polymorphic || pStructMembers != nullptr); if (polymorphic) { reinterpret_cast< typelib_StructTypeDescription * >(pTmp)-> @@ -915,7 +911,7 @@ public: sal_Int32 getBaseMembers() const { return members; } private: - typedef std::set< rtl::OUString > Set; + typedef std::set< OUString > Set; void calculate( sal_Int32 directBaseIndex, Set & directBaseSet, @@ -1035,14 +1031,14 @@ extern "C" void SAL_CALL typelib_typedescription_newMIInterface( for (sal_Int32 j = 0; j < pBase->nMembers; ++j) { typelib_TypeDescriptionReference const * pDirectBaseMember = pDirectBase->ppAllMembers[i->directBaseMemberOffset + j]; - rtl::OUStringBuffer aBuf(pDirectBaseMember->pTypeName); + OUStringBuffer aBuf(pDirectBaseMember->pTypeName); aBuf.append(":@"); aBuf.append(i->directBaseIndex); aBuf.append(','); aBuf.append(i->memberOffset + j); aBuf.append(':'); aBuf.append(pITD->aBase.pTypeName); - rtl::OUString aName(aBuf.makeStringAndClear()); + OUString aName(aBuf.makeStringAndClear()); typelib_TypeDescriptionReference * pDerivedMember = nullptr; typelib_typedescriptionreference_new( &pDerivedMember, pDirectBaseMember->eTypeClass, @@ -1119,7 +1115,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod( OSL_FAIL("Bad interface method type name"); return; } - rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); + OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); typelib_InterfaceTypeDescription * pInterface = nullptr; typelib_typedescription_getByName( reinterpret_cast< typelib_TypeDescription ** >(&pInterface), @@ -1211,7 +1207,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( OSL_FAIL("Bad interface attribute type name"); return; } - rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); + OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); typelib_InterfaceTypeDescription * pInterface = nullptr; typelib_typedescription_getByName( reinterpret_cast< typelib_TypeDescription ** >(&pInterface), @@ -1753,7 +1749,7 @@ typelib_TypeDescriptionReference ** copyExceptions( } bool createDerivedInterfaceMemberDescription( - typelib_TypeDescription ** result, rtl::OUString const & name, + typelib_TypeDescription ** result, OUString const & name, typelib_TypeDescriptionReference * baseRef, typelib_TypeDescription const * base, typelib_TypeDescription * interface, sal_Int32 index, sal_Int32 position) diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 4a2fd8146328..9907011987f9 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -111,7 +111,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl *ppEnv = nullptr; } - rtl::OUString currPurpose; + OUString currPurpose; uno_Environment * pCurrEnv = s_getCurrent(); if (pCurrEnv) // no environment means no purpose @@ -119,7 +119,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl if (pTypeName && rtl_uString_getLength(pTypeName)) { - rtl::OUString envDcp(pTypeName); + OUString envDcp(pTypeName); envDcp += currPurpose; uno_getEnvironment(ppEnv, envDcp.pData, nullptr); @@ -133,20 +133,20 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl } else { - rtl::OUString uno_envDcp(UNO_LB_UNO); + OUString uno_envDcp(UNO_LB_UNO); uno_getEnvironment(ppEnv, uno_envDcp.pData, nullptr); } } } -static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const & str2) +static OUString s_getPrefix(OUString const & str1, OUString const & str2) { sal_Int32 nIndex1 = 0; sal_Int32 nIndex2 = 0; sal_Int32 sim = 0; - rtl::OUString token1; - rtl::OUString token2; + OUString token1; + OUString token2; do { @@ -158,7 +158,7 @@ static rtl::OUString s_getPrefix(rtl::OUString const & str1, rtl::OUString const } while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2); - rtl::OUString result; + OUString result; if (sim) result = str1.copy(0, sim - 1); @@ -170,17 +170,17 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un { int res = 0; - rtl::OUString nextPurpose; + OUString nextPurpose; - rtl::OUString currPurpose; + OUString currPurpose; if (pCurrEnv) currPurpose = cppu::EnvDcp::getPurpose(pCurrEnv->pTypeName); - rtl::OUString targetPurpose; + OUString targetPurpose; if (pTargetEnv) targetPurpose = cppu::EnvDcp::getPurpose(pTargetEnv->pTypeName); - rtl::OUString intermPurpose(s_getPrefix(currPurpose, targetPurpose)); + OUString intermPurpose(s_getPrefix(currPurpose, targetPurpose)); if (currPurpose.getLength() > intermPurpose.getLength()) { sal_Int32 idx = currPurpose.lastIndexOf(':'); @@ -202,7 +202,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un if (!nextPurpose.isEmpty()) { - rtl::OUString next_envDcp(UNO_LB_UNO); + OUString next_envDcp(UNO_LB_UNO); next_envDcp += nextPurpose; uno_getEnvironment(ppEnv, next_envDcp.pData, nullptr); @@ -360,21 +360,21 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea { int result = 1; - rtl::OUString typeName(cppu::EnvDcp::getTypeName(pEnv->pTypeName)); + OUString typeName(cppu::EnvDcp::getTypeName(pEnv->pTypeName)); if (typeName == UNO_LB_UNO) { cppu::Enterable * pEnterable = static_cast(pEnv->pReserved); if (pEnterable) - result = pEnterable->isValid(reinterpret_cast(pReason)); + result = pEnterable->isValid(reinterpret_cast(pReason)); } else { - rtl::OUString envDcp(UNO_LB_UNO); + OUString envDcp(UNO_LB_UNO); envDcp += cppu::EnvDcp::getPurpose(pEnv->pTypeName); uno::Environment env(envDcp); - result = env.isValid(reinterpret_cast(pReason)); + result = env.isValid(reinterpret_cast(pReason)); } return result; diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx index 36f0d15192c4..6b7ad09f98c6 100644 --- a/cppu/source/uno/IdentityMapping.cxx +++ b/cppu/source/uno/IdentityMapping.cxx @@ -46,7 +46,7 @@ static void s_free(uno_Mapping * pMapping) static void s_acquire(uno_Mapping * pMapping) { - static rtl::OUString s_purpose; + static OUString s_purpose; if (1 == osl_atomic_increment(&static_cast(pMapping)->m_nRef)) { diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 60a8704e8347..3cb34a65bb1c 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -151,14 +151,14 @@ extern "C" { static void s_MediatorMapping_free(uno_Mapping * pMapping) }} -static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & str2) +static OUString getPrefix(OUString const & str1, OUString const & str2) { sal_Int32 nIndex1 = 0; sal_Int32 nIndex2 = 0; sal_Int32 sim = 0; - rtl::OUString token1; - rtl::OUString token2; + OUString token1; + OUString token2; do { @@ -170,7 +170,7 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & } while(nIndex1 == nIndex2 && nIndex1 >= 0 && token1 == token2); - rtl::OUString result; + OUString result; if (sim) result = str1.copy(0, sim - 1); @@ -178,12 +178,12 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & return result; } -// rtl::OUString str1("abc:def:ghi"); -// rtl::OUString str2("abc:def"); -// rtl::OUString str3("abc"); -// rtl::OUString str4(""); +// OUString str1("abc:def:ghi"); +// OUString str2("abc:def"); +// OUString str3("abc"); +// OUString str4(""); -// rtl::OUString pref; +// OUString pref; // pref = getPrefix(str1, str1); // pref = getPrefix(str1, str2); @@ -203,16 +203,16 @@ void getCascadeMapping(uno_Mapping ** ppMapping, if (pAddPurpose && pAddPurpose->length) return; - rtl::OUString uno_envType(UNO_LB_UNO); + OUString uno_envType(UNO_LB_UNO); - rtl::OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName); - rtl::OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName); - rtl::OUString from_envPurpose = cppu::EnvDcp::getPurpose(pFrom->pTypeName); - rtl::OUString to_envPurpose = cppu::EnvDcp::getPurpose(pTo->pTypeName); + OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName); + OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName); + OUString from_envPurpose = cppu::EnvDcp::getPurpose(pFrom->pTypeName); + OUString to_envPurpose = cppu::EnvDcp::getPurpose(pTo->pTypeName); #ifdef LOG_CALLING_named_purpose_getMapping - rtl::OString s_from_name = rtl::OUStringToOString(pFrom->pTypeName, RTL_TEXTENCODING_ASCII_US); - rtl::OString s_to_name = rtl::OUStringToOString(pTo->pTypeName, RTL_TEXTENCODING_ASCII_US); + OString s_from_name = OUStringToOString(pFrom->pTypeName, RTL_TEXTENCODING_ASCII_US); + OString s_to_name = OUStringToOString(pTo->pTypeName, RTL_TEXTENCODING_ASCII_US); std::cerr << __FUNCTION__ << " - creating mediation "; std::cerr << "pFrom: " << s_from_name.getStr(); @@ -229,16 +229,16 @@ void getCascadeMapping(uno_Mapping ** ppMapping, // chained uno -> uno if (from_envType == uno_envType && to_envType == uno_envType) { - rtl::OUString purpose = getPrefix(from_envPurpose, to_envPurpose); + OUString purpose = getPrefix(from_envPurpose, to_envPurpose); - rtl::OUString uno_envDcp = uno_envType; + OUString uno_envDcp = uno_envType; uno_envDcp += purpose; // direct mapping possible? // uno:bla-->uno:bla:blubb if (from_envPurpose == purpose) { - rtl::OUString rest = to_envPurpose.copy(purpose.getLength()); + OUString rest = to_envPurpose.copy(purpose.getLength()); sal_Int32 index = rest.indexOf(':', 1); if (index == -1) @@ -251,7 +251,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, } else if (to_envPurpose == purpose) { - rtl::OUString rest = from_envPurpose.copy(purpose.getLength()); + OUString rest = from_envPurpose.copy(purpose.getLength()); sal_Int32 index = rest.indexOf(':', 1); if (index == -1) @@ -268,7 +268,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, else if (from_envType != uno_envType && to_envType == uno_envType) // -> UNO ? // mediate via uno:purpose(fromEnv) { - rtl::OUString envDcp = uno_envType; + OUString envDcp = uno_envType; envDcp += from_envPurpose; uno_getEnvironment(&pInterm, envDcp.pData, nullptr); @@ -276,7 +276,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, else if (from_envType == uno_envType && to_envType != uno_envType) // UNO -> ? // mediate via uno(context) { - rtl::OUString envDcp = uno_envType; + OUString envDcp = uno_envType; envDcp += to_envPurpose; uno_getEnvironment(&pInterm, envDcp.pData, nullptr); @@ -284,9 +284,9 @@ void getCascadeMapping(uno_Mapping ** ppMapping, else // everything else // mediate via uno:purpose { - rtl::OUString purpose = getPrefix(from_envPurpose, to_envPurpose); + OUString purpose = getPrefix(from_envPurpose, to_envPurpose); - rtl::OUString uno_envDcp = uno_envType; + OUString uno_envDcp = uno_envType; uno_envDcp += purpose; uno_getEnvironment(&pInterm, uno_envDcp.pData, nullptr); diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index df0be91ed0b1..a2191a34222f 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -166,7 +166,7 @@ inline bool _equalSequence( { for ( sal_Int32 nPos = nElements; nPos--; ) { - if ( static_cast(pDestElements)[nPos] != static_cast(pSourceElements)[nPos] ) + if ( static_cast(pDestElements)[nPos] != static_cast(pSourceElements)[nPos] ) return false; } return true; diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index d442ca0bc7d7..a336dd33eaf8 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -45,8 +45,6 @@ #include -using ::rtl::OUString; - namespace { @@ -677,7 +675,7 @@ void writeLine( void writeLine( void * stream, const OUString & rLine, const sal_Char * pFilter ) { - ::rtl::OString aLine( ::rtl::OUStringToOString( + OString aLine( OUStringToOString( rLine, RTL_TEXTENCODING_ASCII_US ) ); writeLine( stream, aLine.getStr(), pFilter ); } @@ -689,7 +687,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment( SAL_THROW_EXTERN_C() { OSL_ENSURE( pEnv, "### null ptr!" ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (! pEnv->pExtEnv) { @@ -781,7 +779,7 @@ extern "C" void SAL_CALL uno_dumpEnvironmentByName( } else { - ::rtl::OUStringBuffer buf( 32 ); + OUStringBuffer buf( 32 ); buf.append( "environment \"" ); buf.append( pEnvDcp ); buf.append( "\" does not exist!" ); @@ -798,7 +796,7 @@ namespace public: makeOIdPart() { - ::rtl::OUStringBuffer aRet( 64 ); + OUStringBuffer aRet( 64 ); aRet.append( "];" ); // pid oslProcessInfo info; @@ -855,7 +853,7 @@ static void unoenv_computeObjectIdentifier( { (*pUnoI->release)( pUnoI ); // interface - ::rtl::OUStringBuffer oid( 64 ); + OUStringBuffer oid( 64 ); oid.append( reinterpret_cast< sal_Int64 >(pUnoI), 16 ); oid.append( ';' ); // environment[context] @@ -1084,7 +1082,7 @@ static uno_Environment * initDefaultEnvironment( OUString envPurpose = cppu::EnvDcp::getPurpose(rEnvDcp); if (!envPurpose.isEmpty()) { - rtl::OUString libStem( + OUString libStem( envPurpose.copy(envPurpose.lastIndexOf(':') + 1) + "_uno_uno"); if(!loadEnv(libStem, pEnv)) { diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index c203523efa2c..b5fdf82ac0f6 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -48,8 +48,6 @@ using namespace std; using namespace osl; using namespace com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace cppu { diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx index ef8e65a7ffb9..c72de19be33d 100644 --- a/cppu/source/uno/loadmodule.cxx +++ b/cppu/source/uno/loadmodule.cxx @@ -31,8 +31,8 @@ namespace cppu { namespace detail { #ifndef DISABLE_DYNLOADING -bool loadModule(osl::Module& rModule, rtl::OUString const & name) { - rtl::OUStringBuffer b; +bool loadModule(osl::Module& rModule, OUString const & name) { + OUStringBuffer b; #if defined SAL_DLLPREFIX b.append(SAL_DLLPREFIX); #endif diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx index 9021118477d6..8a964e088174 100644 --- a/cppu/source/uno/loadmodule.hxx +++ b/cppu/source/uno/loadmodule.hxx @@ -37,7 +37,7 @@ namespace cppu { namespace detail { @return false if the module could not be loaded, otherwise true */ -bool loadModule(osl::Module & rModule, ::rtl::OUString const & name); +bool loadModule(osl::Module & rModule, OUString const & name); #endif -- cgit