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>

8 files changed, 139 insertions, 139 deletions

diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index 24f2cb5ac48a..823ca67e89b3 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -71,7 +71,7 @@ AddonsToolBoxFactory::~AddonsToolBoxFactory()
 {
 }
 
-static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, const rtl::OUString& aContextList )
+static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList )
 {
     if ( aContextList.isEmpty() )
         return sal_True;
@@ -89,7 +89,7 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext(
     const Sequence< Sequence< PropertyValue > >& rPropSeqSeq,
     const Reference< XFrame >& rFrame )
 {
-    ::rtl::OUString aModuleIdentifier;
+    OUString aModuleIdentifier;
     try
     {
         aModuleIdentifier = m_xModuleManager->identify( rFrame );
@@ -115,14 +115,14 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext(
         {
             if ( rPropSeq[j].Name.equalsAsciiL( "Context", 7 ))
             {
-                ::rtl::OUString aContextList;
+                OUString aContextList;
                 if ( rPropSeq[j].Value >>= aContextList )
                     bIsCorrectContext = IsCorrectContext( aModuleIdentifier, aContextList );
                 nPropChecked++;
             }
             else if ( rPropSeq[j].Name.equalsAsciiL( "URL", 3 ))
             {
-                ::rtl::OUString aURL;
+                OUString aURL;
                 rPropSeq[j].Value >>= aURL;
                 bIsButton = !aURL.equalsAsciiL( "private:separator", 17 );
                 nPropChecked++;
@@ -141,7 +141,7 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext(
 
 // XUIElementFactory
 Reference< XUIElement > SAL_CALL AddonsToolBoxFactory::createUIElement(
-    const ::rtl::OUString& ResourceURL,
+    const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
 throw ( ::com::sun::star::container::NoSuchElementException,
         ::com::sun::star::lang::IllegalArgumentException,
@@ -152,7 +152,7 @@ throw ( ::com::sun::star::container::NoSuchElementException,
 
     Sequence< Sequence< PropertyValue > >   aConfigData;
     Reference< XFrame >                     xFrame;
-    rtl::OUString                           aResourceURL( ResourceURL );
+    OUString                           aResourceURL( ResourceURL );
 
     for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
     {
@@ -175,13 +175,13 @@ throw ( ::com::sun::star::container::NoSuchElementException,
     {
         PropertyValue aPropValue;
         Sequence< Any > aPropSeq( 3 );
-        aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+        aPropValue.Name = OUString( "Frame" );
         aPropValue.Value <<= xFrame;
         aPropSeq[0] <<= aPropValue;
-        aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationData" ));
+        aPropValue.Name = OUString( "ConfigurationData" );
         aPropValue.Value <<= aConfigData;
         aPropSeq[1] <<= aPropValue;
-        aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ));
+        aPropValue.Name = OUString( "ResourceURL" );
         aPropValue.Value <<= aResourceURL;
         aPropSeq[2] <<= aPropValue;
 
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 50f736ca8258..759de8d5c68e 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -50,9 +50,9 @@ using namespace ::com::sun::star::frame;
 
 namespace framework
 {
-rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl::OUString& aModuleName )
+OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aModuleName )
 {
-    rtl::OUStringBuffer aKey( aCommandURL );
+    OUStringBuffer aKey( aCommandURL );
     aKey.appendAscii( "-" );
     aKey.append( aModuleName );
     return aKey.makeStringAndClear();
@@ -61,12 +61,12 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl
 //*****************************************************************************************************************
 //  XInterface, XTypeProvider
 //*****************************************************************************************************************
-ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, const ::rtl::OUString& _sRoot,bool _bAskValue ) :
+ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, const OUString& _sRoot,bool _bAskValue ) :
     ThreadHelpBase(),
-    m_aPropCommand( RTL_CONSTASCII_USTRINGPARAM( "Command" )),
-    m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
-    m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )),
-    m_aPropValue( RTL_CONSTASCII_USTRINGPARAM( "Value" )),
+    m_aPropCommand( "Command" ),
+    m_aPropModule( "Module" ),
+    m_aPropController( "Controller" ),
+    m_aPropValue( "Value" ),
     m_sRoot(_sRoot),
     m_bConfigAccessInitialized( sal_False ),
     m_bAskValue(_bAskValue)
@@ -85,7 +85,7 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory()
         xContainer->removeContainerListener(m_xConfigAccessListener);
 }
 
-rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
+OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getServiceFromCommandModule" );
     // SAFE
@@ -97,15 +97,15 @@ rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule
     else if ( !rModule.isEmpty() )
     {
         // Try to detect if we have a generic popup menu controller
-        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
+        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, OUString() ));
 
         if ( pIter != m_aMenuControllerMap.end() )
             return pIter->second.m_aImplementationName;
     }
 
-    return rtl::OUString();
+    return OUString();
 }
-rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const
+OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getValueFromCommandModule" );
     // SAFE
@@ -118,38 +118,38 @@ rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule(
     else if ( !rModule.isEmpty() )
     {
         // Try to detect if we have a generic popup menu controller
-        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() ));
+        pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, OUString() ));
 
         if ( pIter != m_aMenuControllerMap.end() )
             return pIter->second.m_aValue;
     }
 
-    return rtl::OUString();
+    return OUString();
 }
 
 
 void ConfigurationAccess_ControllerFactory::addServiceToCommandModule(
-    const rtl::OUString& rCommandURL,
-    const rtl::OUString& rModule,
-    const rtl::OUString& rServiceSpecifier )
+    const OUString& rCommandURL,
+    const OUString& rModule,
+    const OUString& rServiceSpecifier )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::addServiceToCommandModule" );
     // SAFE
     ResetableGuard aLock( m_aLock );
 
-    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
-    m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,::rtl::OUString()) ));
+    OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
+    m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,OUString()) ));
 }
 
 void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule(
-    const rtl::OUString& rCommandURL,
-    const rtl::OUString& rModule )
+    const OUString& rCommandURL,
+    const OUString& rModule )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule" );
     // SAFE
     ResetableGuard aLock( m_aLock );
 
-    rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
+    OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule );
     m_aMenuControllerMap.erase( aHashKey );
 }
 
@@ -157,10 +157,10 @@ void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule(
 void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementInserted" );
-    rtl::OUString   aCommand;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
-    rtl::OUString   aValue;
+    OUString   aCommand;
+    OUString   aModule;
+    OUString   aService;
+    OUString   aValue;
 
     // SAFE
     ResetableGuard aLock( m_aLock );
@@ -169,7 +169,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont
     {
         // Create hash key from command and module as they are together a primary key to
         // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
+        OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
         ControllerInfo& rControllerInfo = m_aMenuControllerMap[ aHashKey ];
         rControllerInfo.m_aImplementationName = aService;
         rControllerInfo.m_aValue = aValue;
@@ -179,10 +179,10 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont
 void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementRemoved" );
-    rtl::OUString   aCommand;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
-    rtl::OUString   aValue;
+    OUString   aCommand;
+    OUString   aModule;
+    OUString   aService;
+    OUString   aValue;
 
     // SAFE
     ResetableGuard aLock( m_aLock );
@@ -191,7 +191,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont
     {
         // Create hash key from command and module as they are together a primary key to
         // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
+        OUString aHashKey( getHashKeyFromStrings( aCommand, aModule ));
         m_aMenuControllerMap.erase( aHashKey );
     }
 }
@@ -223,7 +223,7 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData()
         Sequence< Any > aArgs( 1 );
         PropertyValue   aPropValue;
 
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+        aPropValue.Name  = OUString( "nodepath" );
         aPropValue.Value <<= m_sRoot;
         aArgs[0] <<= aPropValue;
 
@@ -262,13 +262,13 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData()
     ResetableGuard aLock( m_aLock );
     if ( m_xConfigAccess.is() )
     {
-        Sequence< rtl::OUString >   aPopupMenuControllers = m_xConfigAccess->getElementNames();
+        Sequence< OUString >   aPopupMenuControllers = m_xConfigAccess->getElementNames();
 
-        rtl::OUString aCommand;
-        rtl::OUString aModule;
-        rtl::OUString aService;
-        rtl::OUString aHashKey;
-        rtl::OUString aValue;
+        OUString aCommand;
+        OUString aModule;
+        OUString aService;
+        OUString aHashKey;
+        OUString aValue;
 
         m_aMenuControllerMap.clear();
         for ( sal_Int32 i = 0; i < aPopupMenuControllers.getLength(); i++ )
@@ -293,7 +293,7 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData()
     }
 }
 
-sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier,rtl::OUString& aValue  ) const
+sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue  ) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::impl_getElementProps" );
     Reference< XPropertySet > xPropertySet;
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index 53670710d475..6cf90ce300e8 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -81,7 +81,7 @@ MenuBarFactory::~MenuBarFactory()
 
 // XUIElementFactory
 Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement(
-    const ::rtl::OUString& ResourceURL,
+    const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
 throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
 {
@@ -94,7 +94,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
     CreateUIElement(ResourceURL,Args,"MenuOnly","private:resource/menubar/",xMenuBar,xModuleManager, comphelper::getComponentContext(m_xServiceManager));
     return xMenuBar;
 }
-void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
+void MenuBarFactory::CreateUIElement(const OUString& ResourceURL
                                      , const Sequence< PropertyValue >& Args
                                      ,const char* _pExtraMode
                                      ,const char* _pAsciiName
@@ -105,7 +105,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
     Reference< XUIConfigurationManager > xCfgMgr;
     Reference< XUIConfigurationManager > xConfigSource;
     Reference< XFrame >                  xFrame;
-    rtl::OUString                        aResourceURL( ResourceURL );
+    OUString                        aResourceURL( ResourceURL );
     sal_Bool                             bPersistent( sal_True );
     sal_Bool                             bExtraMode( sal_False );
 
@@ -122,7 +122,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
         else if ( _pExtraMode && Args[n].Name.equalsAscii( _pExtraMode ))
             Args[n].Value >>= bExtraMode;
     }
-    if ( aResourceURL.indexOf( rtl::OUString::createFromAscii(_pAsciiName)) != 0 )
+    if ( aResourceURL.indexOf( OUString::createFromAscii(_pAsciiName)) != 0 )
         throw IllegalArgumentException();
 
     // Identify frame and determine document based ui configuration manager/module ui configuration manager
@@ -147,7 +147,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
 
         if ( !bHasSettings )
         {
-            rtl::OUString aModuleIdentifier = _xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ));
+            OUString aModuleIdentifier = _xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ));
             if ( !aModuleIdentifier.isEmpty() )
             {
                 Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier =
@@ -160,21 +160,21 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
 
     PropertyValue aPropValue;
     Sequence< Any > aPropSeq( _pExtraMode ? 5 : 4);
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+    aPropValue.Name = OUString( "Frame" );
     aPropValue.Value <<= xFrame;
     aPropSeq[0] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+    aPropValue.Name = OUString( "ConfigurationSource" );
     aPropValue.Value <<= xCfgMgr;
     aPropSeq[1] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ));
+    aPropValue.Name = OUString( "ResourceURL" );
     aPropValue.Value <<= aResourceURL;
     aPropSeq[2] <<= aPropValue;
-    aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
+    aPropValue.Name = OUString( "Persistent" );
     aPropValue.Value <<= bPersistent;
     aPropSeq[3] <<= aPropValue;
     if ( _pExtraMode )
     {
-        aPropValue.Name = rtl::OUString::createFromAscii(_pExtraMode);
+        aPropValue.Name = OUString::createFromAscii(_pExtraMode);
         aPropValue.Value <<= bExtraMode;
         aPropSeq[4] <<= aPropValue;
     }
diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx
index 90a58477a9b2..e49e346a9507 100644
--- a/framework/source/uifactory/popupmenucontrollerfactory.cxx
+++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx
@@ -64,7 +64,7 @@ PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XMultiS
     ToolbarControllerFactory(xServiceManager,true)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PopupMenuControllerFactory::PopupMenuControllerFactory" );
-    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/PopupMenu" )) );
+    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), OUString( "/org.openoffice.Office.UI.Controller/Registered/PopupMenu" ) );
     m_pConfigAccess->acquire();
 }
 
diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx
index b0e0342f3e94..3496d170577e 100644
--- a/framework/source/uifactory/statusbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx
@@ -61,7 +61,7 @@ DEFINE_INIT_SERVICE                     (   StatusbarControllerFactory, {} )
 StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XMultiServiceFactory >& xServiceManager ) :
     ToolbarControllerFactory(xServiceManager,true)
 {
-    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/StatusBar" )),true );
+    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), OUString( "/org.openoffice.Office.UI.Controller/Registered/StatusBar" ),true );
     m_pConfigAccess->acquire();
 }
 
diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx
index 91cefa24f44a..76c23060f3cd 100644
--- a/framework/source/uifactory/toolbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx
@@ -64,7 +64,7 @@ ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XMultiServi
     m_bConfigRead( sal_False ),
     m_xServiceManager( xServiceManager )
 {
-    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/ToolBar" )) );
+    m_pConfigAccess = new ConfigurationAccess_ControllerFactory( comphelper::getComponentContext(m_xServiceManager), OUString( "/org.openoffice.Office.UI.Controller/Registered/ToolBar" ) );
     m_pConfigAccess->acquire();
 }
 
@@ -86,7 +86,7 @@ ToolbarControllerFactory::~ToolbarControllerFactory()
 
 // XMultiComponentFactory
 Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext(
-    const ::rtl::OUString& aServiceSpecifier,
+    const OUString& aServiceSpecifier,
     const Reference< XComponentContext >& )
 throw (Exception, RuntimeException)
 {
@@ -99,7 +99,7 @@ throw (Exception, RuntimeException)
         m_pConfigAccess->readConfigurationData();
     }
 
-    rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() );
+    OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, OUString() );
     if ( !aServiceName.isEmpty() )
         return m_xServiceManager->createInstance( aServiceName );
     else
@@ -108,15 +108,15 @@ throw (Exception, RuntimeException)
 }
 
 Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext(
-    const ::rtl::OUString&                  ServiceSpecifier,
+    const OUString&                  ServiceSpecifier,
     const Sequence< Any >&                  Arguments,
     const Reference< XComponentContext >& )
 throw (Exception, RuntimeException)
 {
-    const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
-    const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" ));
+    const OUString aPropModuleName( "ModuleName" );
+    const OUString aPropValueName( "Value" );
 
-    rtl::OUString   aPropName;
+    OUString   aPropName;
     PropertyValue   aPropValue;
 
     // Retrieve the optional module name form the Arguments sequence. It is used as a part of
@@ -139,7 +139,7 @@ throw (Exception, RuntimeException)
 
     // Append the command URL to the Arguments sequence so that one controller can be
     // used for more than one command URL.
-    aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
+    aPropValue.Name     = OUString( "CommandURL" );
     aPropValue.Value  <<= ServiceSpecifier;
     aNewArgs[nAppendIndex] <<= aPropValue;
 
@@ -147,7 +147,7 @@ throw (Exception, RuntimeException)
     {
         // Append the optional value argument. It's an empty string if no additional info
         // is provided to the controller.
-        rtl::OUString aValue = m_pConfigAccess->getValueFromCommandModule( ServiceSpecifier, aPropName );
+        OUString aValue = m_pConfigAccess->getValueFromCommandModule( ServiceSpecifier, aPropName );
         aPropValue.Name = aPropValueName;
         aPropValue.Value <<= aValue;
         aNewArgs[nAppendIndex+1] <<= aPropValue;
@@ -163,7 +163,7 @@ throw (Exception, RuntimeException)
             m_pConfigAccess->readConfigurationData();
         }
 
-        rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName );
+        OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName );
         Reference< XMultiServiceFactory > xServiceManager( m_xServiceManager );
 
         aLock.unlock();
@@ -177,16 +177,16 @@ throw (Exception, RuntimeException)
     }
 }
 
-Sequence< ::rtl::OUString > SAL_CALL ToolbarControllerFactory::getAvailableServiceNames()
+Sequence< OUString > SAL_CALL ToolbarControllerFactory::getAvailableServiceNames()
 throw (RuntimeException)
 {
-    return Sequence< ::rtl::OUString >();
+    return Sequence< OUString >();
 }
 
 // XUIControllerRegistration
 sal_Bool SAL_CALL ToolbarControllerFactory::hasController(
-    const ::rtl::OUString& aCommandURL,
-    const rtl::OUString& aModuleName )
+    const OUString& aCommandURL,
+    const OUString& aModuleName )
 throw (::com::sun::star::uno::RuntimeException)
 {
     ResetableGuard aLock( m_aLock );
@@ -201,9 +201,9 @@ throw (::com::sun::star::uno::RuntimeException)
 }
 
 void SAL_CALL ToolbarControllerFactory::registerController(
-    const ::rtl::OUString& aCommandURL,
-    const ::rtl::OUString& aModuleName,
-    const ::rtl::OUString& aControllerImplementationName )
+    const OUString& aCommandURL,
+    const OUString& aModuleName,
+    const OUString& aControllerImplementationName )
 throw (RuntimeException)
 {
     // SAFE
@@ -220,8 +220,8 @@ throw (RuntimeException)
 }
 
 void SAL_CALL ToolbarControllerFactory::deregisterController(
-    const ::rtl::OUString& aCommandURL,
-    const rtl::OUString& aModuleName )
+    const OUString& aCommandURL,
+    const OUString& aModuleName )
 throw (RuntimeException)
 {
     // SAFE
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index dd366b7ca760..8669247b9b86 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -59,9 +59,9 @@ namespace framework
 {
 
 // global function needed by both implementations
-rtl::OUString getHashKeyFromStrings( const rtl::OUString& aType, const rtl::OUString& aName, const rtl::OUString& aModuleName )
+OUString getHashKeyFromStrings( const OUString& aType, const OUString& aName, const OUString& aModuleName )
 {
-    rtl::OUStringBuffer aKey( aType );
+    OUStringBuffer aKey( aType );
     aKey.appendAscii( "^" );
     aKey.append( aName );
     aKey.appendAscii( "^" );
@@ -75,12 +75,12 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aType, const rtl::OUSt
 //*****************************************************************************************************************
 
 
-ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Reference< XComponentContext >& rxContext, const ::rtl::OUString& _sRoot ) :
+ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Reference< XComponentContext >& rxContext, const OUString& _sRoot ) :
     ThreadHelpBase(),
-    m_aPropType( RTL_CONSTASCII_USTRINGPARAM( "Type" )),
-    m_aPropName( RTL_CONSTASCII_USTRINGPARAM( "Name" )),
-    m_aPropModule( RTL_CONSTASCII_USTRINGPARAM( "Module" )),
-    m_aPropFactory( RTL_CONSTASCII_USTRINGPARAM( "FactoryImplementation" )),
+    m_aPropType( "Type" ),
+    m_aPropName( "Name" ),
+    m_aPropModule( "Module" ),
+    m_aPropFactory( "FactoryImplementation" ),
     m_sRoot(_sRoot),
     m_bConfigAccessInitialized( sal_False )
 {
@@ -98,7 +98,7 @@ ConfigurationAccess_FactoryManager::~ConfigurationAccess_FactoryManager()
         xContainer->removeContainerListener(m_xConfigListener);
 }
 
-rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const
+OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactorySpecifierFromTypeNameModule" );
     // SAFE
@@ -110,7 +110,7 @@ rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNam
         return pIter->second;
     else
     {
-        pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rtl::OUString() ));
+        pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, OUString() ));
         if ( pIter != m_aFactoryManagerMap.end() )
             return pIter->second;
         else
@@ -119,28 +119,28 @@ rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNam
             sal_Int32 nIndex = rName.indexOf( '_' );
             if ( nIndex > 0 )
             {
-                rtl::OUString aName = rName.copy( 0, nIndex+1 );
-                pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, aName, rtl::OUString() ));
+                OUString aName = rName.copy( 0, nIndex+1 );
+                pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, aName, OUString() ));
                 if ( pIter != m_aFactoryManagerMap.end() )
                     return pIter->second;
             }
 
-            pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rtl::OUString(), rtl::OUString() ));
+            pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, OUString(), OUString() ));
             if ( pIter != m_aFactoryManagerMap.end() )
                 return pIter->second;
         }
     }
 
-    return rtl::OUString();
+    return OUString();
 }
 
-void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier )
+void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule, const OUString& rServiceSpecifier )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::addFactorySpecifierToTypeNameModule" );
     // SAFE
     ResetableGuard aLock( m_aLock );
 
-    rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule );
+    OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule );
 
     FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey );
 
@@ -151,13 +151,13 @@ void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( co
 }
 
 
-void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule )
+void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::removeFactorySpecifierFromTypeNameModule" );
     // SAFE
     ResetableGuard aLock( m_aLock );
 
-    rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule );
+    OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule );
 
     FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey );
 
@@ -179,7 +179,7 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac
     FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.begin();
     while ( pIter != m_aFactoryManagerMap.end() )
     {
-        rtl::OUString aFactory = pIter->first;
+        OUString aFactory = pIter->first;
         if ( !aFactory.isEmpty() )
         {
             sal_Int32                 nToken = 0;
@@ -214,10 +214,10 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac
 void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementInserted" );
-    rtl::OUString   aType;
-    rtl::OUString   aName;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
+    OUString   aType;
+    OUString   aName;
+    OUString   aModule;
+    OUString   aService;
 
     // SAFE
     ResetableGuard aLock( m_aLock );
@@ -226,7 +226,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain
     {
         // Create hash key from type, name and module as they are together a primary key to
         // the UNO service that implements a user interface factory.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
+        OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
         m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService ));
     }
 }
@@ -234,10 +234,10 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain
 void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementRemoved " );
-    rtl::OUString   aType;
-    rtl::OUString   aName;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
+    OUString   aType;
+    OUString   aName;
+    OUString   aModule;
+    OUString   aService;
 
     // SAFE
     ResetableGuard aLock( m_aLock );
@@ -246,7 +246,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain
     {
         // Create hash key from command and model as they are together a primary key to
         // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
+        OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
         m_aFactoryManagerMap.erase( aHashKey );
     }
 }
@@ -254,10 +254,10 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain
 void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementReplaced" );
-    rtl::OUString   aType;
-    rtl::OUString   aName;
-    rtl::OUString   aModule;
-    rtl::OUString   aService;
+    OUString   aType;
+    OUString   aName;
+    OUString   aModule;
+    OUString   aService;
 
     // SAFE
     ResetableGuard aLock( m_aLock );
@@ -266,7 +266,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const Contain
     {
         // Create hash key from command and model as they are together a primary key to
         // the UNO service that implements the popup menu controller.
-        rtl::OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
+        OUString aHashKey( getHashKeyFromStrings( aType, aName, aModule ));
         m_aFactoryManagerMap.erase( aHashKey );
         m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService ));
     }
@@ -293,7 +293,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData()
         Sequence< Any > aArgs( 1 );
         PropertyValue   aPropValue;
 
-        aPropValue.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+        aPropValue.Name  = OUString( "nodepath" );
         aPropValue.Value <<= m_sRoot;
         aArgs[0] <<= aPropValue;
 
@@ -310,13 +310,13 @@ void ConfigurationAccess_FactoryManager::readConfigurationData()
 
     if ( m_xConfigAccess.is() )
     {
-        Sequence< rtl::OUString >   aUIElementFactories = m_xConfigAccess->getElementNames();
+        Sequence< OUString >   aUIElementFactories = m_xConfigAccess->getElementNames();
 
-        rtl::OUString             aType;
-        rtl::OUString             aName;
-        rtl::OUString             aModule;
-        rtl::OUString             aService;
-        rtl::OUString             aHashKey;
+        OUString             aType;
+        OUString             aName;
+        OUString             aModule;
+        OUString             aService;
+        OUString             aHashKey;
         Reference< XPropertySet > xPropertySet;
         for ( sal_Int32 i = 0; i < aUIElementFactories.getLength(); i++ )
         {
@@ -340,7 +340,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData()
     }
 }
 
-sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const
+sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::impl_getElementProps" );
     Reference< XPropertySet > xPropertySet;
@@ -385,7 +385,7 @@ UIElementFactoryManager::UIElementFactoryManager( const Reference< XComponentCon
     m_xContext(rxContext)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::UIElementFactoryManager" );
-    m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Factories/Registered/UIElementFactories" )) );
+    m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, OUString( "/org.openoffice.Office.UI.Factories/Registered/UIElementFactories" ) );
     m_pConfigAccess->acquire();
     m_xModuleManager = ModuleManager::create( rxContext );
 }
@@ -400,7 +400,7 @@ UIElementFactoryManager::~UIElementFactoryManager()
 
 // XUIElementFactory
 Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement(
-    const ::rtl::OUString& ResourceURL,
+    const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
 throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
 {
@@ -414,9 +414,9 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
         m_pConfigAccess->readConfigurationData();
     }
 
-    const rtl::OUString aPropFrame( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+    const OUString aPropFrame( "Frame" );
 
-    rtl::OUString   aModuleId;
+    OUString   aModuleId;
     PropertyValue   aPropValue;
     Reference< XFrame > xFrame;
 
@@ -466,7 +466,7 @@ throw ( RuntimeException )
     return m_pConfigAccess->getFactoriesDescription();
 }
 
-Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const ::rtl::OUString& aResourceURL, const ::rtl::OUString& aModuleId )
+Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const OUString& aResourceURL, const OUString& aModuleId )
 throw ( RuntimeException )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactory" );
@@ -478,14 +478,14 @@ throw ( RuntimeException )
         m_pConfigAccess->readConfigurationData();
     }
 
-    rtl::OUString aType;
-    rtl::OUString aName;
+    OUString aType;
+    OUString aName;
 
     WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( aResourceURL, aType, aName );
 
     Reference< XComponentContext > xContext( m_xContext );
 
-    rtl::OUString aServiceSpecifier = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId );
+    OUString aServiceSpecifier = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId );
 
     aLock.unlock();
     if ( !aServiceSpecifier.isEmpty() )
@@ -494,7 +494,7 @@ throw ( RuntimeException )
         return Reference< XUIElementFactory >();
 }
 
-void SAL_CALL UIElementFactoryManager::registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId, const ::rtl::OUString& aFactoryImplementationName )
+void SAL_CALL UIElementFactoryManager::registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId, const OUString& aFactoryImplementationName )
 throw ( ElementExistException, RuntimeException )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::registerFactory" );
@@ -511,7 +511,7 @@ throw ( ElementExistException, RuntimeException )
     // SAFE
 }
 
-void SAL_CALL UIElementFactoryManager::deregisterFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId )
+void SAL_CALL UIElementFactoryManager::deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId )
 throw ( NoSuchElementException, RuntimeException )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::deregisterFactory" );
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 496e74e2b643..41d940773fff 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -66,7 +66,7 @@ WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference<
     ThreadHelpBase( &Application::GetSolarMutex() ),
     m_bConfigRead( sal_False )
 {
-    m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories" )) );
+    m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, OUString( "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories" ) );
     m_pConfigAccess->acquire();
     m_xModuleManager = frame::ModuleManager::create( rxContext );
 }
@@ -79,7 +79,7 @@ WindowContentFactoryManager::~WindowContentFactoryManager()
     m_pConfigAccess->release();
 }
 
-void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName )
+void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const OUString& aResourceURL, OUString& aType, OUString& aName )
 {
     const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
     const char      RESOURCEURL_PREFIX[] = "private:resource/";
@@ -87,12 +87,12 @@ void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const rtl::OU
     if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) &&
         ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
     {
-        rtl::OUString aTmpStr( aResourceURL.copy( RESOURCEURL_PREFIX_SIZE ));
+        OUString aTmpStr( aResourceURL.copy( RESOURCEURL_PREFIX_SIZE ));
         sal_Int32 nToken = 0;
         sal_Int32 nPart  = 0;
         do
         {
-            ::rtl::OUString sToken = aTmpStr.getToken( 0, '/', nToken);
+            OUString sToken = aTmpStr.getToken( 0, '/', nToken);
             if ( !sToken.isEmpty() )
             {
                 if ( nPart == 0 )
@@ -123,7 +123,7 @@ throw (uno::Exception, uno::RuntimeException)
 {
     uno::Reference< uno::XInterface > xWindow;
     uno::Reference< frame::XFrame >   xFrame;
-    ::rtl::OUString                   aResourceURL;
+    OUString                   aResourceURL;
 
     for (sal_Int32 i=0; i < Arguments.getLength(); i++ )
     {
@@ -146,9 +146,9 @@ throw (uno::Exception, uno::RuntimeException)
     // UNSAFE
 
     // Determine the module identifier
-    ::rtl::OUString aType;
-    ::rtl::OUString aName;
-    ::rtl::OUString aModuleId;
+    OUString aType;
+    OUString aName;
+    OUString aModuleId;
     try
     {
         if ( xFrame.is() && xModuleManager.is() )
@@ -163,7 +163,7 @@ throw (uno::Exception, uno::RuntimeException)
          !aName.isEmpty() &&
          !aModuleId.isEmpty() )
     {
-        ::rtl::OUString                   aImplementationName;
+        OUString                   aImplementationName;
         uno::Reference< uno::XInterface > xHolder( static_cast<cppu::OWeakObject*>(this), uno::UNO_QUERY );
 
         // Detetmine the implementation name of the window content factory dependent on the