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 <noel.grandin@collabora.co.uk>

8 files changed, 51 insertions, 55 deletions

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<cppu::Enterable *>(pEnv->pReserved);
         if (pEnterable)
-            result = pEnterable->isValid(reinterpret_cast<rtl::OUString *>(pReason));
+            result = pEnterable->isValid(reinterpret_cast<OUString *>(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<rtl::OUString *>(pReason));
+        result = env.isValid(reinterpret_cast<OUString *>(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<IdentityMapping *>(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) // <ANY> -> 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 -> <ANY>?
         // 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<OUString *>(pDestElements)[nPos] != static_cast<const ::rtl::OUString *>(pSourceElements)[nPos] )
+            if ( static_cast<OUString *>(pDestElements)[nPos] != static_cast<const OUString *>(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 <stdio.h>
 
 
-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