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

8 files changed, 27 insertions, 37 deletions

diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h
index b1d1b09c5dac..85ed6fcab8cc 100755
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -80,17 +80,17 @@ ref struct Constants
 };
 
 //------------------------------------------------------------------------------
-inline ::System::String ^ ustring_to_String( ::rtl::OUString const & ustr )
+inline ::System::String ^ ustring_to_String( OUString const & ustr )
 {
     return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
 }
 
 //------------------------------------------------------------------------------
-inline ::rtl::OUString String_to_ustring( ::System::String ^ str )
+inline OUString String_to_ustring( ::System::String ^ str )
 {
     OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );
     pin_ptr<const wchar_t> chars = PtrToStringChars( str );
-    return ::rtl::OUString( chars, str->Length );
+    return OUString( chars, str->Length );
 }
 
 /* If the argument type is a typedef for an interface then the interface
diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h
index e4aa0cf6babf..3c37f6c4f6bb 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -32,16 +32,16 @@ namespace util
 {
 
 //------------------------------------------------------------------------------
-inline ::System::String ^ ustring_to_String( ::rtl::OUString const & ustr )
+inline ::System::String ^ ustring_to_String( OUString const & ustr )
 {
     return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
 }
 //------------------------------------------------------------------------------
-inline ::rtl::OUString String_to_ustring( ::System::String ^ str )
+inline OUString String_to_ustring( ::System::String ^ str )
 {
     OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );
     pin_ptr<wchar_t const> chars = PtrToStringChars( str );
-    return ::rtl::OUString( chars, str->Length );
+    return OUString( chars, str->Length );
 }
 
 template< typename T >
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index b03504fcc90c..441f5adeaf7b 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -40,7 +40,7 @@ System::Type^ loadCliType(System::String ^ typeName);
 System::Type^ mapUnoType(typelib_TypeDescription const * pTD);
 System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD);
 typelib_TypeDescriptionReference* mapCliType(System::Type^ cliType);
-rtl::OUString mapCliString(System::String ^ data);
+OUString mapCliString(System::String ^ data);
 System::String^ mapUnoString(rtl_uString const * data);
 System::String^ mapUnoTypeName(rtl_uString const * typeName);
 
@@ -105,9 +105,9 @@ ref struct Constants
 
 struct BridgeRuntimeError
 {
-    ::rtl::OUString m_message;
+    OUString m_message;
 
-    inline BridgeRuntimeError( ::rtl::OUString const & message )
+    inline BridgeRuntimeError( OUString const & message )
         : m_message( message )
         {}
 };
@@ -160,7 +160,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
     {
         throw BridgeRuntimeError(
             "cannot get comprehensive type description for " +
-            *reinterpret_cast< ::rtl::OUString const * >( &td_ref->pTypeName ) );
+            *reinterpret_cast< OUString const * >( &td_ref->pTypeName ) );
     }
 }
 
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index b68d04c329e2..6195e2f4967a 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -33,9 +33,6 @@
 #include "cli_proxy.h"
 
 namespace sri= System::Runtime::InteropServices;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
 
 namespace cli_uno
 {
@@ -147,8 +144,8 @@ void SAL_CALL Mapping_uno2cli(
     catch (BridgeRuntimeError & err)
     {
 #if OSL_DEBUG_LEVEL >= 1
-        rtl::OString cstr_msg(
-            rtl::OUStringToOString(
+        OString cstr_msg(
+            OUStringToOString(
                 "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_FAIL( cstr_msg.getStr() );
 #else
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 828e7f4f41e1..f8b5d4b7c348 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -44,8 +44,6 @@ namespace ucss = unoidl::com::sun::star;
 
 using namespace std;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 
 namespace cli_uno
@@ -183,7 +181,7 @@ System::Type^ loadCliType(System::String ^ unoName)
     }
     catch( System::Exception ^ e)
     {
-        rtl::OUString ouMessage(mapCliString(e->Message));
+        OUString ouMessage(mapCliString(e->Message));
         throw BridgeRuntimeError(ouMessage);
     }
     return retVal;
@@ -237,7 +235,7 @@ System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD)
     case typelib_TypeClass_INTERFACE:
     {
         //special handling for XInterface, since it does not exist in cli.
-        rtl::OUString usXInterface("com.sun.star.uno.XInterface");
+        OUString usXInterface("com.sun.star.uno.XInterface");
         if (usXInterface.equals(pTD->pTypeName))
             retVal= System::Object::typeid;
         else
@@ -1072,7 +1070,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
             {
                 typelib_TypeDescriptionReference * member_type= NULL;
 
-                rtl::OUString usUnoException("com.sun.star.uno.Exception");
+                OUString usUnoException("com.sun.star.uno.Exception");
                 for (; nPos < nMembers; ++nPos)
                 {
                     member_type= comp_td->ppTypeRefs[nPos];
@@ -1092,7 +1090,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                         // System.Exception property. Type.GetField("Message") returns null
                         if ( ! aField && usUnoException.equals(td.get()->pTypeName))
                         {// get Exception.Message property
-                            rtl::OUString usMessageMember("Message");
+                            OUString usMessageMember("Message");
                             if (usMessageMember.equals(comp_td->ppMemberNames[nPos]))
                             {
                                 sr::PropertyInfo^ pi= cliType->GetProperty(
@@ -1625,7 +1623,7 @@ void Bridge::map_to_cli(
                     pCTD = pCTD->pBaseTypeDescription;
                 int nPos = -1;
 
-                rtl::OUString usMessageMember("Message");
+                OUString usMessageMember("Message");
                 for (int i = 0; i < pCTD->nMembers; i ++)
                 {
 #if OSL_DEBUG_LEVEL >= 2
@@ -1685,7 +1683,7 @@ void Bridge::map_to_cli(
                 ((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, nullptr,
                 true);
         }
-        rtl::OUString usUnoException("com.sun.star.uno.Exception");
+        OUString usUnoException("com.sun.star.uno.Exception");
         for (sal_Int32 nPos = comp_td->nMembers; nPos--; )
         {
             typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ];
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 0aa031161daa..f7f865f4b802 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -39,10 +39,6 @@ namespace ucss = unoidl::com::sun::star;
 
 using namespace cli_uno;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
-using ::rtl::OUStringBuffer;
 extern "C"
 {
 //------------------------------------------------------------------------------
@@ -651,7 +647,7 @@ srrm::IMessage^ UnoInterfaceProxy::constructReturnMessage(
 //################################################################################
 CliProxy::CliProxy(Bridge const* bridge, System::Object^ cliI,
                          typelib_TypeDescription const* td,
-                         const rtl::OUString& usOid):
+                         const OUString& usOid):
     m_ref(1),
     m_bridge(bridge),
     m_cliI(cliI),
@@ -776,7 +772,7 @@ void CliProxy::makeMethodInfos()
 }
 
 sr::MethodInfo^ CliProxy::getMethodInfo(int nUnoFunctionPos,
-                                           const rtl::OUString& usMethodName, MethodKind methodKind)
+                                           const OUString& usMethodName, MethodKind methodKind)
 {
     sr::MethodInfo^ ret = nullptr;
 #if OSL_DEBUG_LEVEL >= 2
@@ -877,7 +873,7 @@ CliProxy::~CliProxy()
 uno_Interface* CliProxy::create(Bridge const * bridge,
                                  System::Object^ cliI,
                                  typelib_TypeDescription const* pTD,
-                                 const rtl::OUString& ousOid)
+                                 const OUString& ousOid)
 {
     uno_Interface* proxy= static_cast<uno_Interface*>(
         new CliProxy(bridge, cliI, pTD, ousOid));
diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h
index 657cc69c0c98..5f63a7581d88 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -99,7 +99,7 @@ public:
     static System::Object^ create(Bridge * bridge,
                                   uno_Interface * pUnoI,
                                   typelib_InterfaceTypeDescription* pTd,
-                                  const rtl::OUString& oid);
+                                  const OUString& oid);
 
     /** RealProxy::Invoke */
     virtual srrm::IMessage^ Invoke(srrm::IMessage^ msg) override;
@@ -139,7 +139,7 @@ private:
         Bridge * bridge,
         uno_Interface * pUnoI,
         typelib_InterfaceTypeDescription* pTD,
-        const rtl::OUString& oid );
+        const OUString& oid );
 
     static srrm::IMessage^ constructReturnMessage(System::Object^ retVal,
                            array<System::Object^>^ outArgs,
@@ -178,7 +178,7 @@ struct CliProxy: public uno_Interface
     gcroot<System::Type^> m_type;
     const com::sun::star::uno::TypeDescription m_unoType;
     const gcroot<System::String^> m_oid;
-    const rtl::OUString m_usOid;
+    const OUString m_usOid;
 
     enum MethodKind {MK_METHOD = 0, MK_SET, MK_GET};
     /** The array contains MethodInfos  of the cli object. Each one reflects an
@@ -235,13 +235,13 @@ struct CliProxy: public uno_Interface
 
     CliProxy( Bridge const* bridge, System::Object^ cliI,
                  typelib_TypeDescription const* pTD,
-                 const rtl::OUString& usOid);
+                 const OUString& usOid);
     ~CliProxy();
 
     static uno_Interface* create(Bridge const * bridge,
                                  System::Object^ cliI,
                                  typelib_TypeDescription const * TD,
-                                 rtl::OUString const & usOid );
+                                 OUString const & usOid );
 
     /** Prepares an array (m_arMethoInfos) containing MethodInfo object of the
         interface and all inherited interfaces. At index null is the first
@@ -276,7 +276,7 @@ struct CliProxy: public uno_Interface
        Position of the method in the uno interface.
      */
     sr::MethodInfo^ getMethodInfo(int nUnoFunctionPos,
-                                  const rtl::OUString & usMethodName,
+                                  const OUString & usMethodName,
                                   MethodKind mk);
 
     void SAL_CALL uno_DispatchMethod(
diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx
index 93ab81e62328..c1598d98f376 100644
--- a/cli_ure/source/uno_bridge/cli_uno.cxx
+++ b/cli_ure/source/uno_bridge/cli_uno.cxx
@@ -24,7 +24,6 @@
 
 namespace sr=System::Reflection;
 
-using ::rtl::OUStringBuffer;
 
 namespace cli_uno
 {