RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals

Change-Id: Ief6418425676d6943993513c4d05c8d22e4740cf
Reviewed-on: https://gerrit.libreoffice.org/2470
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>

2 files changed, 20 insertions, 20 deletions

diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 9bab7aabd23b..0912b7bdcc1d 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -89,11 +89,11 @@ class GlobalSettings_Access : public ::com::sun::star::lang::XComponent      ,
 
         sal_Bool                                                                            m_bDisposed   : 1,
                                                                                             m_bConfigRead : 1;
-        rtl::OUString                                                                       m_aConfigSettingsAccess;
-        rtl::OUString                                                                       m_aNodeRefStates;
-        rtl::OUString                                                                       m_aPropStatesEnabled;
-        rtl::OUString                                                                       m_aPropLocked;
-        rtl::OUString                                                                       m_aPropDocked;
+        OUString                                                                       m_aConfigSettingsAccess;
+        OUString                                                                       m_aNodeRefStates;
+        OUString                                                                       m_aPropStatesEnabled;
+        OUString                                                                       m_aPropLocked;
+        OUString                                                                       m_aPropDocked;
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >        m_xConfigAccess;
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>         m_xContext;
 };
@@ -112,11 +112,11 @@ GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::un
     ThreadHelpBase(),
     m_bDisposed( sal_False ),
     m_bConfigRead( sal_False ),
-    m_aConfigSettingsAccess( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_ROOT_ACCESS )),
-    m_aNodeRefStates( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_NODEREF_STATES )),
-    m_aPropStatesEnabled( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_PROPERTY_STATESENABLED )),
-    m_aPropLocked( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_PROPERTY_LOCKED )),
-    m_aPropDocked( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_PROPERTY_DOCKED )),
+    m_aConfigSettingsAccess( GLOBALSETTINGS_ROOT_ACCESS ),
+    m_aNodeRefStates( GLOBALSETTINGS_NODEREF_STATES ),
+    m_aPropStatesEnabled( GLOBALSETTINGS_PROPERTY_STATESENABLED ),
+    m_aPropLocked( GLOBALSETTINGS_PROPERTY_LOCKED ),
+    m_aPropDocked( GLOBALSETTINGS_PROPERTY_DOCKED ),
     m_xContext( rxContext )
 {
 }
@@ -252,10 +252,10 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess()
             css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider =
                  css::configuration::theDefaultProvider::get( m_xContext );
 
-            aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
-            aPropValue.Value = css::uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GLOBALSETTINGS_ROOT_ACCESS )));
+            aPropValue.Name  = OUString( "nodepath" );
+            aPropValue.Value = css::uno::makeAny( OUString( GLOBALSETTINGS_ROOT_ACCESS ));
             aArgs[0] = css::uno::makeAny( aPropValue );
-            aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ));
+            aPropValue.Name = OUString( "lazywrite" );
             aPropValue.Value = css::uno::makeAny( sal_True );
             aArgs[1] = css::uno::makeAny( aPropValue );
 
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index f18f6f2d2664..c268cfb0213b 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -110,8 +110,8 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons
     {
         // Retrieve known modules and insert them into our boost::unordered_map to speed-up access time.
         Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY_THROW );
-        const Sequence< ::rtl::OUString >     aNameSeq   = xNameAccess->getElementNames();
-        const ::rtl::OUString*                pNameSeq   = aNameSeq.getConstArray();
+        const Sequence< OUString >     aNameSeq   = xNameAccess->getElementNames();
+        const OUString*                pNameSeq   = aNameSeq.getConstArray();
         for ( sal_Int32 n = 0; n < aNameSeq.getLength(); n++ )
             m_aModuleToModuleUICfgMgrMap.insert( ModuleToModuleCfgMgr::value_type(  pNameSeq[n], Reference< XUIConfigurationManager >() ));
     }
@@ -175,7 +175,7 @@ throw ( RuntimeException )
 }
 
 // XModuleUIConfigurationManagerSupplier
-Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const ::rtl::OUString& ModuleIdentifier )
+Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const OUString& ModuleIdentifier )
 throw ( NoSuchElementException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::getUIConfigurationManager" );
@@ -193,7 +193,7 @@ throw ( NoSuchElementException, RuntimeException)
     // Create instance on demand
     if ( !pIter->second.is() )
     {
-        ::rtl::OUString sShort;
+        OUString sShort;
         try
         {
             Sequence< PropertyValue > lProps;
@@ -210,17 +210,17 @@ throw ( NoSuchElementException, RuntimeException)
         }
         catch( const Exception& )
         {
-            sShort = ::rtl::OUString();
+            sShort = OUString();
         }
 
         if (sShort.isEmpty())
             throw NoSuchElementException();
         PropertyValue   aArg;
         Sequence< Any > aArgs( 2 );
-        aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleShortName" ));
+        aArg.Name = OUString( "ModuleShortName" );
         aArg.Value <<= sShort;
         aArgs[0] <<= aArg;
-        aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ));
+        aArg.Name = OUString( "ModuleIdentifier" );
         aArg.Value <<= ModuleIdentifier;
         aArgs[1] <<= aArg;