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

2 files changed, 30 insertions, 30 deletions

diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index a8ef1f858d6f..44ac1c8a6ae3 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -48,7 +48,7 @@ namespace COMPMOD_NAMESPACE
     {
         ResMgr*     m_pResources;
         sal_Bool    m_bInitialized;
-        rtl::OString m_sFilePrefix;
+        OString m_sFilePrefix;
 
     public:
         /// ctor
@@ -57,7 +57,7 @@ namespace COMPMOD_NAMESPACE
 
         /// get the manager for the resources of the module
         ResMgr* getResManager();
-        void    setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
+        void    setResourceFilePrefix(const OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
     };
 
     //-------------------------------------------------------------------------
@@ -84,7 +84,7 @@ namespace COMPMOD_NAMESPACE
             // create a manager with a fixed prefix
             m_pResources = ResMgr::CreateResMgr(m_sFilePrefix.getStr());
             DBG_ASSERT(m_pResources,
-                    rtl::OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ")
+                    OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ")
                 .append(m_sFilePrefix)
                 .append(")!").getStr());
 
@@ -99,7 +99,7 @@ namespace COMPMOD_NAMESPACE
     ::osl::Mutex    OModule::s_aMutex;
     sal_Int32       OModule::s_nClients = 0;
     OModuleImpl*    OModule::s_pImpl = NULL;
-    ::rtl::OString  OModule::s_sResPrefix;
+    OString  OModule::s_sResPrefix;
     //-------------------------------------------------------------------------
     ResMgr* OModule::getResManager()
     {
@@ -108,7 +108,7 @@ namespace COMPMOD_NAMESPACE
     }
 
     //-------------------------------------------------------------------------
-    void OModule::setResourceFilePrefix(const ::rtl::OString& _rPrefix)
+    void OModule::setResourceFilePrefix(const OString& _rPrefix)
     {
         ::osl::MutexGuard aGuard(s_aMutex);
         s_sResPrefix = _rPrefix;
@@ -147,15 +147,15 @@ namespace COMPMOD_NAMESPACE
     //- registration helper
     //--------------------------------------------------------------------------
 
-    Sequence< ::rtl::OUString >*                OModule::s_pImplementationNames = NULL;
-    Sequence< Sequence< ::rtl::OUString > >*    OModule::s_pSupportedServices = NULL;
+    Sequence< OUString >*                OModule::s_pImplementationNames = NULL;
+    Sequence< Sequence< OUString > >*    OModule::s_pSupportedServices = NULL;
     Sequence< sal_Int64 >*                      OModule::s_pCreationFunctionPointers = NULL;
     Sequence< sal_Int64 >*                      OModule::s_pFactoryFunctionPointers = NULL;
 
     //--------------------------------------------------------------------------
     void OModule::registerComponent(
-        const ::rtl::OUString& _rImplementationName,
-        const Sequence< ::rtl::OUString >& _rServiceNames,
+        const OUString& _rImplementationName,
+        const Sequence< OUString >& _rServiceNames,
         ComponentInstantiation _pCreateFunction,
         FactoryInstantiation _pFactoryFunction)
     {
@@ -163,8 +163,8 @@ namespace COMPMOD_NAMESPACE
         {
             OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers,
                 "OModule::registerComponent : inconsistent state (the pointers (1)) !");
-            s_pImplementationNames = new Sequence< ::rtl::OUString >;
-            s_pSupportedServices = new Sequence< Sequence< ::rtl::OUString > >;
+            s_pImplementationNames = new Sequence< OUString >;
+            s_pSupportedServices = new Sequence< Sequence< OUString > >;
             s_pCreationFunctionPointers = new Sequence< sal_Int64 >;
             s_pFactoryFunctionPointers = new Sequence< sal_Int64 >;
         }
@@ -189,7 +189,7 @@ namespace COMPMOD_NAMESPACE
     }
 
     //--------------------------------------------------------------------------
-    void OModule::revokeComponent(const ::rtl::OUString& _rImplementationName)
+    void OModule::revokeComponent(const OUString& _rImplementationName)
     {
         if (!s_pImplementationNames)
         {
@@ -204,7 +204,7 @@ namespace COMPMOD_NAMESPACE
             "OModule::revokeComponent : inconsistent state !");
 
         sal_Int32 nLen = s_pImplementationNames->getLength();
-        const ::rtl::OUString* pImplNames = s_pImplementationNames->getConstArray();
+        const OUString* pImplNames = s_pImplementationNames->getConstArray();
         for (sal_Int32 i=0; i<nLen; ++i, ++pImplNames)
         {
             if (pImplNames->equals(_rImplementationName))
@@ -228,7 +228,7 @@ namespace COMPMOD_NAMESPACE
 
     //--------------------------------------------------------------------------
     Reference< XInterface > OModule::getComponentFactory(
-        const ::rtl::OUString& _rImplementationName,
+        const OUString& _rImplementationName,
         const Reference< XMultiServiceFactory >& _rxServiceManager)
     {
         OSL_ENSURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !");
@@ -251,8 +251,8 @@ namespace COMPMOD_NAMESPACE
 
 
         sal_Int32 nLen = s_pImplementationNames->getLength();
-        const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
-        const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
+        const OUString* pImplName = s_pImplementationNames->getConstArray();
+        const Sequence< OUString >* pServices = s_pSupportedServices->getConstArray();
         const sal_Int64* pComponentFunction = s_pCreationFunctionPointers->getConstArray();
         const sal_Int64* pFactoryFunction = s_pFactoryFunctionPointers->getConstArray();
 
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index da972aca8db0..810b5ec07f88 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -47,9 +47,9 @@ namespace COMPMOD_NAMESPACE
 typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation)
         (
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager,
-            const ::rtl::OUString & _rComponentName,
+            const OUString & _rComponentName,
             ::cppu::ComponentInstantiation _pCreateFunction,
-            const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames,
+            const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames,
             rtl_ModuleCount* _pModuleCounter
         );
 
@@ -70,12 +70,12 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
         static ::osl::Mutex     s_aMutex;       /// access safety
         static sal_Int32        s_nClients;     /// number of registered clients
         static OModuleImpl*     s_pImpl;        /// impl class. lives as long as at least one client for the module is registered
-        static ::rtl::OString   s_sResPrefix;
+        static OString   s_sResPrefix;
 
         // auto registration administration
-        static  ::com::sun::star::uno::Sequence< ::rtl::OUString >*
+        static  ::com::sun::star::uno::Sequence< OUString >*
             s_pImplementationNames;
-        static  ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
+        static  ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >*
             s_pSupportedServices;
         static  ::com::sun::star::uno::Sequence< sal_Int64 >*
             s_pCreationFunctionPointers;
@@ -84,7 +84,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
 
     public:
         // can be set as long as no resource has been accessed ...
-        static void     setResourceFilePrefix(const ::rtl::OString& _rPrefix);
+        static void     setResourceFilePrefix(const OString& _rPrefix);
 
         /// get the vcl res manager of the module
         static ResMgr*  getResManager();
@@ -101,8 +101,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
             @see revokeComponent
         */
         static void registerComponent(
-            const ::rtl::OUString& _rImplementationName,
-            const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames,
+            const OUString& _rImplementationName,
+            const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames,
             ::cppu::ComponentInstantiation _pCreateFunction,
             FactoryInstantiation _pFactoryFunction);
 
@@ -111,7 +111,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
                 the implementation name of the component
         */
         static void revokeComponent(
-            const ::rtl::OUString& _rImplementationName);
+            const OUString& _rImplementationName);
 
         /** creates a Factory for the component with the given implementation name.
             <p>Usually used from within component_getFactory.<p/>
@@ -123,7 +123,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
                         the XInterface access to a factory for the component
         */
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory(
-            const ::rtl::OUString& _rImplementationName,
+            const OUString& _rImplementationName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager
             );
 
@@ -173,8 +173,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
         /** automatically registeres a multi instance component
             <p>Assumed that the template argument has the three methods
                 <ul>
-                    <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/>
-                    <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/>
+                    <li><code>static OUString getImplementationName_Static()</code><li/>
+                    <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/>
                     <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                         Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
                         </li>
@@ -215,8 +215,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
         /** automatically registeres a single instance component
             <p>Assumed that the template argument has the three methods
                 <ul>
-                    <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/>
-                    <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/>
+                    <li><code>static OUString getImplementationName_Static()</code><li/>
+                    <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/>
                     <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                         Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
                         </li>