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

7 files changed, 197 insertions, 197 deletions

diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index 179d63963d19..2c1d8d555a6b 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -84,7 +84,7 @@ sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const
 }
 
 //-----------------------------------------------
-sal_Bool AcceleratorCache::hasCommand(const ::rtl::OUString& sCommand) const
+sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const
 {
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -119,7 +119,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
 
 //-----------------------------------------------
 void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey    ,
-                                         const ::rtl::OUString&    sCommand)
+                                         const OUString&    sCommand)
 {
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
@@ -136,7 +136,7 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey    ,
 }
 
 //-----------------------------------------------
-AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUString& sCommand) const
+AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sCommand) const
 {
     TKeyList lKeys;
 
@@ -146,7 +146,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr
     TCommand2Keys::const_iterator pCommand = m_lCommand2Keys.find(sCommand);
     if (pCommand == m_lCommand2Keys.end())
         throw css::container::NoSuchElementException(
-                ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >());
+                OUString(), css::uno::Reference< css::uno::XInterface >());
     lKeys = pCommand->second;
 
     aReadLock.unlock();
@@ -156,9 +156,9 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr
 }
 
 //-----------------------------------------------
-::rtl::OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const
+OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const
 {
-    ::rtl::OUString sCommand;
+    OUString sCommand;
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -166,7 +166,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUStr
     TKey2Commands::const_iterator pKey = m_lKey2Commands.find(aKey);
     if (pKey == m_lKey2Commands.end())
         throw css::container::NoSuchElementException(
-                ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >());
+                OUString(), css::uno::Reference< css::uno::XInterface >());
     sCommand = pKey->second;
 
     aReadLock.unlock();
@@ -189,7 +189,7 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
     // get its registered command
     // Because we must know its place inside the optimized
     // structure, which bind keys to commands, too!
-    ::rtl::OUString sCommand = pKey->second;
+    OUString sCommand = pKey->second;
     pKey = m_lKey2Commands.end(); // nobody should use an undefined value .-)
 
     // remove key from primary list
@@ -203,7 +203,7 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
 }
 
 //-----------------------------------------------
-void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand)
+void AcceleratorCache::removeCommand(const OUString& sCommand)
 {
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 2a0330d30a58..c2cd26cd33f8 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -67,10 +67,10 @@ namespace framework
     namespace fpc = ::framework::pattern::configuration;
 #endif
 
-    ::rtl::OUString lcl_getKeyString(salhelper::SingletonRef<framework::KeyMapping>& _rKeyMapping, const css::awt::KeyEvent& aKeyEvent)
+    OUString lcl_getKeyString(salhelper::SingletonRef<framework::KeyMapping>& _rKeyMapping, const css::awt::KeyEvent& aKeyEvent)
     {
         const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier...
-        ::rtl::OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex));
+        OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex));
 
         if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT )
             sKeyBuffer.appendAscii("_SHIFT");
@@ -133,7 +133,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
+OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
     throw(css::container::NoSuchElementException,
           css::uno::RuntimeException            )
 {
@@ -143,7 +143,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
     AcceleratorCache& rCache = impl_getCFG();
     if (!rCache.hasKey(aKeyEvent))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString(),
+                OUString(),
                 static_cast< ::cppu::OWeakObject* >(this));
     return rCache.getCommandByKey(aKeyEvent);
 
@@ -152,7 +152,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
 
 //-----------------------------------------------
 void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
-                                                    const ::rtl::OUString&    sCommand )
+                                                    const OUString&    sCommand )
                                                     throw(css::lang::IllegalArgumentException,
                                                     css::uno::RuntimeException         )
 {
@@ -163,13 +163,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
         (aKeyEvent.Modifiers == 0)
         )
         throw css::lang::IllegalArgumentException(
-        ::rtl::OUString("Such key event seams not to be supported by any operating system."),
+        OUString("Such key event seams not to be supported by any operating system."),
         static_cast< ::cppu::OWeakObject* >(this),
         0);
 
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
-        ::rtl::OUString("Empty command strings are not allowed here."),
+        OUString("Empty command strings are not allowed here."),
         static_cast< ::cppu::OWeakObject* >(this),
         1);
 
@@ -194,7 +194,7 @@ throw(css::container::NoSuchElementException,
     AcceleratorCache& rCache = impl_getCFG(sal_True); // true => force using of a writeable cache
     if (!rCache.hasKey(aKeyEvent))
         throw css::container::NoSuchElementException(
-        ::rtl::OUString(),
+        OUString(),
         static_cast< ::cppu::OWeakObject* >(this));
     rCache.removeKey(aKeyEvent);
 
@@ -202,14 +202,14 @@ throw(css::container::NoSuchElementException,
 }
 
 //-----------------------------------------------
-css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand)
+css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
     throw(css::lang::IllegalArgumentException   ,
           css::container::NoSuchElementException,
           css::uno::RuntimeException            )
 {
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString("Empty command strings are not allowed here."),
+                OUString("Empty command strings are not allowed here."),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -219,7 +219,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
     AcceleratorCache& rCache = impl_getCFG();
     if (!rCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString(),
+                OUString(),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     AcceleratorCache::TKeyList lKeys  = rCache.getKeysByCommand(sCommand);
@@ -229,7 +229,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
 }
 
 //-----------------------------------------------
-css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList)
+css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
     throw(css::lang::IllegalArgumentException   ,
           css::uno::RuntimeException            )
 {
@@ -243,10 +243,10 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
 
     for (i=0; i<c; ++i)
     {
-        const ::rtl::OUString& rCommand = lCommandList[i];
+        const OUString& rCommand = lCommandList[i];
         if (rCommand.isEmpty())
             throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString("Empty command strings are not allowed here."),
+                    OUString("Empty command strings are not allowed here."),
                     static_cast< ::cppu::OWeakObject* >(this),
                     (sal_Int16)i);
 
@@ -268,14 +268,14 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
 }
 
 //-----------------------------------------------
-void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand)
+void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
     throw(css::lang::IllegalArgumentException   ,
           css::container::NoSuchElementException,
           css::uno::RuntimeException            )
 {
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString("Empty command strings are not allowed here."),
+                OUString("Empty command strings are not allowed here."),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
@@ -285,7 +285,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
     AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache!
     if (!rCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString("Command does not exists inside this container."),
+                OUString("Command does not exists inside this container."),
                 static_cast< ::cppu::OWeakObject* >(this));
     rCache.removeCommand(sCommand);
 
@@ -316,7 +316,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
         xIn = xStream->getInputStream();
     if (!xIn.is())
         throw css::io::IOException(
-        ::rtl::OUString("Could not open accelerator configuration for reading."),
+        OUString("Could not open accelerator configuration for reading."),
         static_cast< ::cppu::OWeakObject* >(this));
 
     // impl_ts_load() does not clear the cache
@@ -355,7 +355,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
 
     if (!xOut.is())
         throw css::io::IOException(
-        ::rtl::OUString("Could not open accelerator configuration for saving."),
+        OUString("Could not open accelerator configuration for saving."),
         static_cast< ::cppu::OWeakObject* >(this));
 
     impl_ts_save(xOut);
@@ -382,7 +382,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
 
     if (!xOut.is())
         throw css::io::IOException(
-                ::rtl::OUString("Could not open accelerator configuration for saving."),
+                OUString("Could not open accelerator configuration for saving."),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     impl_ts_save(xOut);
@@ -474,7 +474,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::u
 
 //-----------------------------------------------
 // IStorageListener
-void XMLBasedAcceleratorConfiguration::changesOccurred(const ::rtl::OUString& /*sPath*/)
+void XMLBasedAcceleratorConfiguration::changesOccurred(const OUString& /*sPath*/)
 {
     reload();
 }
@@ -618,7 +618,7 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
     css::uno::Reference< css::uno::XInterface >     xCFG      = fpc::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR),
         "/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY);
     css::uno::Reference< css::beans::XPropertySet > xProp     (xCFG, css::uno::UNO_QUERY_THROW);
-    ::rtl::OUString                                 sISOLocale;
+    OUString                                 sISOLocale;
     xProp->getPropertyValue("ooLocale") >>= sISOLocale;
 
     if (sISOLocale.isEmpty())
@@ -660,7 +660,7 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un
                                 , m_pPrimaryWriteCache(0                        )
                                 , m_pSecondaryWriteCache(0                      )
 {
-    const ::rtl::OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators");
+    const OUString CFG_ENTRY_ACCELERATORS("org.openoffice.Office.Accelerators");
     m_xCfg = css::uno::Reference< css::container::XNameAccess > (
              ::comphelper::ConfigurationHelper::openConfig( comphelper::getComponentContext(m_xSMGR), CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ),
              css::uno::UNO_QUERY );
@@ -693,7 +693,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
+OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
     throw(css::container::NoSuchElementException,
           css::uno::RuntimeException            )
 {
@@ -705,7 +705,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
 
     if (!rPrimaryCache.hasKey(aKeyEvent) && !rSecondaryCache.hasKey(aKeyEvent))
         throw css::container::NoSuchElementException(
-        ::rtl::OUString(),
+        OUString(),
         static_cast< ::cppu::OWeakObject* >(this));
 
     if (rPrimaryCache.hasKey(aKeyEvent))
@@ -718,7 +718,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
 
 //-----------------------------------------------
 void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
-                                                    const ::rtl::OUString&    sCommand )
+                                                    const OUString&    sCommand )
                                                     throw(css::lang::IllegalArgumentException,
                                                     css::uno::RuntimeException         )
 {
@@ -731,13 +731,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
         (aKeyEvent.Modifiers == 0)
         )
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString("Such key event seams not to be supported by any operating system."),
+                OUString("Such key event seams not to be supported by any operating system."),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
     if (sCommand.isEmpty())
                 throw css::lang::IllegalArgumentException(
-                ::rtl::OUString("Empty command strings are not allowed here."),
+                OUString("Empty command strings are not allowed here."),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -749,7 +749,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
 
     if ( rPrimaryCache.hasKey(aKeyEvent) )
     {
-        ::rtl::OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
+        OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
         if ( sCommand != sOriginalCommand )
         {
             if (rSecondaryCache.hasCommand(sOriginalCommand))
@@ -772,7 +772,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
 
     else if ( rSecondaryCache.hasKey(aKeyEvent) )
     {
-        ::rtl::OUString sOriginalCommand = rSecondaryCache.getCommandByKey(aKeyEvent);
+        OUString sOriginalCommand = rSecondaryCache.getCommandByKey(aKeyEvent);
         if (sCommand != sOriginalCommand)
         {
             if (rPrimaryCache.hasCommand(sCommand))
@@ -816,15 +816,15 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
 
     if (!rPrimaryCache.hasKey(aKeyEvent) && !rSecondaryCache.hasKey(aKeyEvent))
         throw css::container::NoSuchElementException(
-        ::rtl::OUString(),
+        OUString(),
         static_cast< ::cppu::OWeakObject* >(this));
 
     if (rPrimaryCache.hasKey(aKeyEvent))
     {
-        ::rtl::OUString sDelCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
+        OUString sDelCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
         if (!sDelCommand.isEmpty())
         {
-            ::rtl::OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
+            OUString sOriginalCommand = rPrimaryCache.getCommandByKey(aKeyEvent);
             if (rSecondaryCache.hasCommand(sOriginalCommand))
             {
                 AcceleratorCache::TKeyList lSecondaryKeys = rSecondaryCache.getKeysByCommand(sOriginalCommand);
@@ -838,7 +838,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
     }
     else
     {
-        ::rtl::OUString sDelCommand = rSecondaryCache.getCommandByKey(aKeyEvent);
+        OUString sDelCommand = rSecondaryCache.getCommandByKey(aKeyEvent);
         if (!sDelCommand.isEmpty())
             rSecondaryCache.removeKey(aKeyEvent);
     }
@@ -847,14 +847,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
 }
 
 //-----------------------------------------------
-css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand)
+css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
     throw(css::lang::IllegalArgumentException   ,
         css::container::NoSuchElementException,
         css::uno::RuntimeException            )
 {
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString("Empty command strings are not allowed here."),
+                OUString("Empty command strings are not allowed here."),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -866,7 +866,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
 
     if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString(),
+                OUString(),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     AcceleratorCache::TKeyList lKeys  = rPrimaryCache.getKeysByCommand(sCommand);
@@ -901,7 +901,7 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator
 }
 
 //-----------------------------------------------
-css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList)
+css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
     throw(css::lang::IllegalArgumentException   ,
         css::uno::RuntimeException            )
 {
@@ -915,10 +915,10 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
 
     for (i=0; i<c; ++i)
     {
-        const ::rtl::OUString& rCommand = lCommandList[i];
+        const OUString& rCommand = lCommandList[i];
         if (rCommand.isEmpty())
             throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString("Empty command strings are not allowed here."),
+                    OUString("Empty command strings are not allowed here."),
                     static_cast< ::cppu::OWeakObject* >(this),
                     (sal_Int16)i);
 
@@ -944,14 +944,14 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
 }
 
 //-----------------------------------------------
-void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand)
+void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
     throw(css::lang::IllegalArgumentException   ,
         css::container::NoSuchElementException,
         css::uno::RuntimeException            )
 {
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString("Empty command strings are not allowed here."),
+                OUString("Empty command strings are not allowed here."),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
@@ -963,7 +963,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 
     if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString("Command does not exists inside this container."),
+                OUString("Command does not exists inside this container."),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (rPrimaryCache.hasCommand(sCommand))
@@ -1055,17 +1055,17 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
         return;
 
     long nOpenModes = css::embed::ElementModes::READWRITE;
-    css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString("accelerator"), nOpenModes);
+    css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(OUString("accelerator"), nOpenModes);
     if (!xAcceleratorTypeStorage.is())
         return;
 
-    css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString("current"), nOpenModes);
+    css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(OUString("current"), nOpenModes);
     css::uno::Reference< css::io::XOutputStream > xOut;
     if (xStream.is())
         xOut = xStream->getOutputStream();
     if (!xOut.is())
         throw css::io::IOException(
-        ::rtl::OUString("Could not open accelerator configuration for saving."),
+        OUString("Could not open accelerator configuration for saving."),
         static_cast< ::cppu::OWeakObject* >(this));
 
     // the original m_aCache has been split into primay cache and secondary cache...
@@ -1160,7 +1160,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
     throw(css::uno::RuntimeException)
 {
     css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
-    ::rtl::OUString sConfig = xNamed->getName();
+    OUString sConfig = xNamed->getName();
     if ( sConfig == "Global" )
     {
         m_xCfg = css::uno::Reference< css::container::XNameAccess > (
@@ -1214,25 +1214,25 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
         // So we try to split the path into 3 parts (module isnt important here, because we already know it ... because
         // these instance is bound to a specific module configuration ... or it''s the global configuration where no module is given at all.
 
-        ::rtl::OUString sOrgPath ;
-        ::rtl::OUString sPath    ;
-        ::rtl::OUString sKey;
+        OUString sOrgPath ;
+        OUString sPath    ;
+        OUString sKey;
 
         aChange.Accessor >>= sOrgPath;
         sPath              = sOrgPath;
-        ::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
-        ::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
+        OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
+        OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
 
         if ( sGlobalModules == CFG_ENTRY_GLOBAL )
         {
-            ::rtl::OUString sModule;
+            OUString sModule;
             sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
             if ( !sKey.isEmpty() && !sPath.isEmpty() )
                 reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey);
         }
         else if ( sGlobalModules == CFG_ENTRY_MODULES )
         {
-            ::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
+            OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
             sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
 
             if ( !sKey.isEmpty() && !sPath.isEmpty() )
@@ -1263,28 +1263,28 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
         xModules->getByName(m_sModuleCFG) >>= xAccess;
     }
 
-    const ::rtl::OUString sIsoLang       = impl_ts_getLocale();
-    const ::rtl::OUString sDefaultLocale("en-US");
+    const OUString sIsoLang       = impl_ts_getLocale();
+    const OUString sDefaultLocale("en-US");
 
     css::uno::Reference< css::container::XNameAccess > xKey;
     css::uno::Reference< css::container::XNameAccess > xCommand;
     if (xAccess.is())
     {
-        css::uno::Sequence< ::rtl::OUString > lKeys = xAccess->getElementNames();
+        css::uno::Sequence< OUString > lKeys = xAccess->getElementNames();
         sal_Int32 nKeys = lKeys.getLength();
         for ( sal_Int32 i=0; i<nKeys; ++i )
         {
-            ::rtl::OUString sKey = lKeys[i];
+            OUString sKey = lKeys[i];
             xAccess->getByName(sKey) >>= xKey;
             xKey->getByName(CFG_PROP_COMMAND) >>= xCommand;
 
-            css::uno::Sequence< ::rtl::OUString > lLocales = xCommand->getElementNames();
+            css::uno::Sequence< OUString > lLocales = xCommand->getElementNames();
             sal_Int32 nLocales = lLocales.getLength();
-            ::std::vector< ::rtl::OUString > aLocales;
+            ::std::vector< OUString > aLocales;
             for ( sal_Int32 j=0; j<nLocales; ++j )
                 aLocales.push_back(lLocales[j]);
 
-            ::std::vector< ::rtl::OUString >::const_iterator pFound;
+            ::std::vector< OUString >::const_iterator pFound;
             for ( pFound = aLocales.begin(); pFound != aLocales.end(); ++pFound )
             {
                 if ( *pFound == sIsoLang )
@@ -1303,8 +1303,8 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
                     continue;
             }
 
-            ::rtl::OUString sLocale = *pFound;
-            ::rtl::OUString sCommand;
+            OUString sLocale = *pFound;
+            OUString sCommand;
             xCommand->getByName(sLocale) >>= sCommand;
             if (sCommand.isEmpty())
                 continue;
@@ -1312,11 +1312,11 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
             css::awt::KeyEvent aKeyEvent;
 
             sal_Int32 nIndex = 0;
-            ::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex);
-            ::rtl::OUString sPrefix("KEY_");
+            OUString sKeyCommand = sKey.getToken(0, '_', nIndex);
+            OUString sPrefix("KEY_");
             aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand);
 
-            css::uno::Sequence< ::rtl::OUString > sToken(4);
+            css::uno::Sequence< OUString > sToken(4);
             const sal_Int32 nToken = 4;
             sal_Bool bValid = sal_True;
             sal_Int32 k;
@@ -1375,14 +1375,14 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
 
         for ( pIt  = lPrimaryWriteKeys.begin(); pIt != lPrimaryWriteKeys.end(); ++pIt )
         {
-            ::rtl::OUString sCommand = m_pPrimaryWriteCache->getCommandByKey(*pIt);
+            OUString sCommand = m_pPrimaryWriteCache->getCommandByKey(*pIt);
             if (!m_aPrimaryReadCache.hasKey(*pIt))
             {
                 insertKeyToConfiguration(*pIt, sCommand, sal_True);
             }
             else
             {
-                ::rtl::OUString sReadCommand = m_aPrimaryReadCache.getCommandByKey(*pIt);
+                OUString sReadCommand = m_aPrimaryReadCache.getCommandByKey(*pIt);
                 if (sReadCommand != sCommand)
                     insertKeyToConfiguration(*pIt, sCommand, sal_True);
             }
@@ -1419,14 +1419,14 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
 
         for ( pIt  = lSecondaryWriteKeys.begin(); pIt != lSecondaryWriteKeys.end(); ++pIt )
         {
-            ::rtl::OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt);
+            OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt);
             if (!m_aSecondaryReadCache.hasKey(*pIt))
             {
                 insertKeyToConfiguration(*pIt, sCommand, sal_False);
             }
             else
             {
-                ::rtl::OUString sReadCommand = m_aSecondaryReadCache.getCommandByKey(*pIt);
+                OUString sReadCommand = m_aSecondaryReadCache.getCommandByKey(*pIt);
                 if (sReadCommand != sCommand)
                     insertKeyToConfiguration(*pIt, sCommand, sal_False);
             }
@@ -1452,7 +1452,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
 }
 
 //-----------------------------------------------
-void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand, const sal_Bool bPreferred )
+void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred )
 {
     css::uno::Reference< css::container::XNameAccess > xAccess;
     css::uno::Reference< css::container::XNameContainer > xContainer;
@@ -1479,7 +1479,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
         xModules->getByName(m_sModuleCFG) >>= xContainer;
     }
 
-    const ::rtl::OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
+    const OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
     css::uno::Reference< css::container::XNameAccess > xKey;
     css::uno::Reference< css::container::XNameContainer > xCommand;
     if ( !xContainer->hasByName(sKey) )
@@ -1491,7 +1491,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
     xContainer->getByName(sKey) >>= xKey;
 
     xKey->getByName(CFG_PROP_COMMAND) >>= xCommand;
-    ::rtl::OUString sLocale = impl_ts_getLocale();
+    OUString sLocale = impl_ts_getLocale();
     if ( !xCommand->hasByName(sLocale) )
         xCommand->insertByName(sLocale, css::uno::makeAny(sCommand));
     else
@@ -1520,12 +1520,12 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
         xModules->getByName(m_sModuleCFG) >>= xContainer;
     }
 
-    const ::rtl::OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
+    const OUString sKey = lcl_getKeyString(m_rKeyMapping,aKeyEvent);
     xContainer->removeByName(sKey);
 }
 
 //-----------------------------------------------
-void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPrimarySecondary, const ::rtl::OUString& sGlobalModules, const ::rtl::OUString& sModule, const ::rtl::OUString& sKey )
+void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey )
 {
     css::uno::Reference< css::container::XNameAccess > xAccess;
     css::uno::Reference< css::container::XNameContainer > xContainer;
@@ -1543,13 +1543,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
     }
 
     css::awt::KeyEvent aKeyEvent;
-    ::rtl::OUString sKeyIdentifier;
+    OUString sKeyIdentifier;
 
     sal_Int32 nIndex = 0;
     sKeyIdentifier = sKey.getToken(0, '_', nIndex);
-    aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString("KEY_")+sKeyIdentifier);
+    aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(OUString("KEY_")+sKeyIdentifier);
 
-    css::uno::Sequence< ::rtl::OUString > sToken(3);
+    css::uno::Sequence< OUString > sToken(3);
     const sal_Int32 nToken = 3;
     for (sal_Int32 i=0; i<nToken; ++i)
     {
@@ -1569,11 +1569,11 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
 
     css::uno::Reference< css::container::XNameAccess > xKey;
     css::uno::Reference< css::container::XNameAccess > xCommand;
-    ::rtl::OUString sCommand;
+    OUString sCommand;
 
     if (xContainer->hasByName(sKey))
     {
-        ::rtl::OUString sLocale = impl_ts_getLocale();
+        OUString sLocale = impl_ts_getLocale();
         xContainer->getByName(sKey)    >>= xKey;
         xKey->getByName(CFG_PROP_COMMAND)  >>= xCommand;
         xCommand->getByName(sLocale)       >>= sCommand;
@@ -1656,7 +1656,7 @@ OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
     css::uno::Reference< css::uno::XInterface >     xCFG      = fpc::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR),
         "/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY);
     css::uno::Reference< css::beans::XPropertySet > xProp     (xCFG, css::uno::UNO_QUERY_THROW);
-    ::rtl::OUString                                 sISOLocale;
+    OUString                                 sISOLocale;
     xProp->getPropertyValue("ooLocale") >>= sISOLocale;
 
     if (sISOLocale.isEmpty())
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 82ffbe68c471..7c8cb5e6a8d2 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -101,7 +101,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque
 
     ::comphelper::SequenceAsHashMap lArgs(lArguments);
     m_xDocumentRoot = lArgs.getUnpackedValueOrDefault(
-                        ::rtl::OUString("DocumentRoot"),
+                        OUString("DocumentRoot"),
                         css::uno::Reference< css::embed::XStorage >());
 
     aWriteLock.unlock();
@@ -170,7 +170,7 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache()
         m_aPresetHandler.connectToResource(
             PresetHandler::E_DOCUMENT,
             PresetHandler::RESOURCETYPE_ACCELERATOR(),
-            ::rtl::OUString(),
+            OUString(),
             xDocumentRoot,
             aLanguageTag);
 
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index 09ce133eef2c..9e50ff352eae 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -146,7 +146,7 @@ KeyMapping::KeyMapping()
     sal_Int32 i = 0;
     while(KeyIdentifierMap[i].Code != 0)
     {
-        ::rtl::OUString sIdentifier = ::rtl::OUString::createFromAscii(KeyIdentifierMap[i].Identifier);
+        OUString sIdentifier = OUString::createFromAscii(KeyIdentifierMap[i].Identifier);
         sal_Int16       nCode       = KeyIdentifierMap[i].Code;
 
         m_lIdentifierHash[sIdentifier] = nCode      ;
@@ -162,7 +162,7 @@ KeyMapping::~KeyMapping()
 }
 
 //-----------------------------------------------
-sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier)
+sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
     throw(css::lang::IllegalArgumentException)
 {
     Identifier2CodeHash::const_iterator pIt = m_lIdentifierHash.find(sIdentifier);
@@ -182,18 +182,18 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier)
 }
 
 //-----------------------------------------------
-::rtl::OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
+OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
 {
     Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode);
     if (pIt != m_lCodeHash.end())
         return pIt->second;
 
     // If we have no well known identifier - use the pure code value!
-    return ::rtl::OUString::valueOf((sal_Int32)nCode);
+    return OUString::valueOf((sal_Int32)nCode);
 }
 
 //-----------------------------------------------
-sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier,
+sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier,
                                                                     sal_uInt16&      rCode      )
 {
     sal_Int32 nCode = sIdentifier.toInt32();
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 2a675cc36568..4e9357b0796d 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -94,12 +94,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
     WriteGuard aWriteLock(m_aLock);
 
     ::comphelper::SequenceAsHashMap lArgs(lArguments);
-    m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString("ModuleIdentifier"), ::rtl::OUString());
-    m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString("Locale")          , ::rtl::OUString("x-default"));
+    m_sModule = lArgs.getUnpackedValueOrDefault(OUString("ModuleIdentifier"), OUString());
+    m_sLocale = lArgs.getUnpackedValueOrDefault(OUString("Locale")          , OUString("x-default"));
 
     if (m_sModule.isEmpty())
         throw css::uno::RuntimeException(
-                ::rtl::OUString("The module dependend accelerator configuration service was initialized with an empty module identifier!"),
+                OUString("The module dependend accelerator configuration service was initialized with an empty module identifier!"),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     aWriteLock.unlock();
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 39b9773d9c2a..0ba15b8bde76 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -63,39 +63,39 @@ namespace framework
 {
 
 //-----------------------------------------------
-::rtl::OUString PresetHandler::PRESET_DEFAULT()
+OUString PresetHandler::PRESET_DEFAULT()
 {
-    return ::rtl::OUString("default");
+    return OUString("default");
 }
 
 //-----------------------------------------------
-::rtl::OUString PresetHandler::TARGET_CURRENT()
+OUString PresetHandler::TARGET_CURRENT()
 {
-    return ::rtl::OUString("current");
+    return OUString("current");
 }
 
 //-----------------------------------------------
-::rtl::OUString PresetHandler::RESOURCETYPE_MENUBAR()
+OUString PresetHandler::RESOURCETYPE_MENUBAR()
 {
-    return ::rtl::OUString("menubar");
+    return OUString("menubar");
 }
 
 //-----------------------------------------------
-::rtl::OUString PresetHandler::RESOURCETYPE_TOOLBAR()
+OUString PresetHandler::RESOURCETYPE_TOOLBAR()
 {
-    return ::rtl::OUString("toolbar");
+    return OUString("toolbar");
 }
 
 //-----------------------------------------------
-::rtl::OUString PresetHandler::RESOURCETYPE_ACCELERATOR()
+OUString PresetHandler::RESOURCETYPE_ACCELERATOR()
 {
-    return ::rtl::OUString("accelerator");
+    return OUString("accelerator");
 }
 
 //-----------------------------------------------
-::rtl::OUString PresetHandler::RESOURCETYPE_STATUSBAR()
+OUString PresetHandler::RESOURCETYPE_STATUSBAR()
 {
-    return ::rtl::OUString("statusbar");
+    return OUString("statusbar");
 }
 
 //-----------------------------------------------
@@ -177,23 +177,23 @@ void PresetHandler::forgetCachedStorages()
 
 namespace {
 
-::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID)
+OUString lcl_getLocalizedMessage(::sal_Int32 nID)
 {
-    ::rtl::OUString sMessage("Unknown error.");
+    OUString sMessage("Unknown error.");
 
     switch(nID)
     {
         case ID_CORRUPT_UICONFIG_SHARE :
-                sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE )));
+                sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE )));
 
                 break;
 
         case ID_CORRUPT_UICONFIG_USER :
-                sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_USER )));
+                sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_USER )));
                 break;
 
         case ID_CORRUPT_UICONFIG_GENERAL :
-                sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL )));
+                sMessage = OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL )));
                 break;
     }
 
@@ -210,8 +210,8 @@ void lcl_throwCorruptedUIConfigurationException(
         lcl_getLocalizedMessage(id),
         css::uno::Reference< css::uno::XInterface >(),
         (exception.getValueTypeName() +
-         rtl::OUString(": \"") + e.Message +
-         rtl::OUString("\"")));
+         OUString(": \"") + e.Message +
+         OUString("\"")));
 }
 
 }
@@ -232,7 +232,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
         xSMGR->createInstance(SERVICENAME_PATHSETTINGS),
         css::uno::UNO_QUERY_THROW);
 
-    ::rtl::OUString sShareLayer;
+    OUString sShareLayer;
     xPathSettings->getPropertyValue(BASEPATH_SHARE_LAYER) >>= sShareLayer;
 
     // "UIConfig" is a "multi path" ... use first part only here!
@@ -243,7 +243,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
     // Note: May be an user uses URLs without a final slash! Check it ...
     nPos = sShareLayer.lastIndexOf('/');
     if (nPos != sShareLayer.getLength()-1)
-        sShareLayer += ::rtl::OUString("/");
+        sShareLayer += OUString("/");
 
     sShareLayer += RELPATH_SHARE_LAYER; // folder
     /*
@@ -292,13 +292,13 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
         xSMGR->createInstance(SERVICENAME_PATHSETTINGS),
         css::uno::UNO_QUERY_THROW);
 
-    ::rtl::OUString sUserLayer;
+    OUString sUserLayer;
     xPathSettings->getPropertyValue(BASEPATH_USER_LAYER) >>= sUserLayer ;
 
     // Note: May be an user uses URLs without a final slash! Check it ...
     sal_Int32 nPos = sUserLayer.lastIndexOf('/');
     if (nPos != sUserLayer.getLength()-1)
-        sUserLayer += ::rtl::OUString("/");
+        sUserLayer += OUString("/");
 
     sUserLayer  += RELPATH_USER_LAYER; // storage file
 
@@ -369,8 +369,8 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(
 
 //-----------------------------------------------
 void PresetHandler::connectToResource(      PresetHandler::EConfigType                   eConfigType  ,
-                                      const ::rtl::OUString&                             sResource    ,
-                                      const ::rtl::OUString&                             sModule      ,
+                                      const OUString&                             sResource    ,
+                                      const OUString&                             sModule      ,
                                       const css::uno::Reference< css::embed::XStorage >& xDocumentRoot,
                                       const LanguageTag&                                 rLanguageTag )
 {
@@ -397,7 +397,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
     {
         if (!xDocumentRoot.is())
             throw css::uno::RuntimeException(
-                    ::rtl::OUString("There is valid root storage, where the UI configuration can work on."),
+                    OUString("There is valid root storage, where the UI configuration can work on."),
                     css::uno::Reference< css::uno::XInterface >());
         m_lDocumentStorages.setRootStorage(xDocumentRoot);
         xShare = xDocumentRoot;
@@ -420,10 +420,10 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
     sal_Int32 eShareMode = (css::embed::ElementModes::READ      | css::embed::ElementModes::NOCREATE);
     sal_Int32 eUserMode  = (css::embed::ElementModes::READWRITE                                     );
 
-    ::rtl::OUStringBuffer sRelPathBuf(1024);
-    ::rtl::OUString       sRelPathShare;
-    ::rtl::OUString       sRelPathNoLang;
-    ::rtl::OUString       sRelPathUser;
+    OUStringBuffer sRelPathBuf(1024);
+    OUString       sRelPathShare;
+    OUString       sRelPathNoLang;
+    OUString       sRelPathUser;
     switch(eConfigType)
     {
         case E_GLOBAL :
@@ -489,7 +489,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
         // First try to find the right localized set inside share layer.
         // Fallbacks are allowed there.
         OUString             aShareLocale( rLanguageTag.getBcp47());
-        ::rtl::OUString      sLocalizedSharePath(sRelPathShare);
+        OUString      sLocalizedSharePath(sRelPathShare);
         sal_Bool             bAllowFallbacks    = sal_True     ;
         xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, sal_True , aShareLocale, bAllowFallbacks);
 
@@ -497,7 +497,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
         // Normaly the corresponding sub dir should be created matching the specified locale.
         // Because we allow creation of storages inside user layer by default.
         OUString             aUserLocale( rLanguageTag.getBcp47());
-        ::rtl::OUString      sLocalizedUserPath(sRelPathUser);
+        OUString      sLocalizedUserPath(sRelPathUser);
                              bAllowFallbacks    = sal_False  ;
         xUser = impl_openLocalizedPathIgnoringErrors(sLocalizedUserPath, eUserMode , sal_False, aUserLocale, bAllowFallbacks);
 
@@ -507,8 +507,8 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
 
     // read content of level 3 (presets, targets)
           css::uno::Reference< css::container::XNameAccess > xAccess ;
-          css::uno::Sequence< ::rtl::OUString >              lNames  ;
-    const ::rtl::OUString*                                   pNames  ;
+          css::uno::Sequence< OUString >              lNames  ;
+    const OUString*                                   pNames  ;
           sal_Int32                                          c       ;
           sal_Int32                                          i       ;
           OUStringList                                       lPresets;
@@ -524,7 +524,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
 
         for (i=0; i<c; ++i)
         {
-            ::rtl::OUString sTemp = pNames[i];
+            OUString sTemp = pNames[i];
             sal_Int32       nPos  = sTemp.indexOf(FILE_EXTENSION);
             if (nPos > -1)
                 sTemp = sTemp.copy(0,nPos);
@@ -542,7 +542,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
 
         for (i=0; i<c; ++i)
         {
-            ::rtl::OUString sTemp = pNames[i];
+            OUString sTemp = pNames[i];
             sal_Int32       nPos  = sTemp.indexOf(FILE_EXTENSION);
             if (nPos > -1)
                 sTemp = sTemp.copy(0,nPos);
@@ -575,8 +575,8 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
 }
 
 //-----------------------------------------------
-void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset,
-                                       const ::rtl::OUString& sTarget)
+void PresetHandler::copyPresetToTarget(const OUString& sPreset,
+                                       const OUString& sTarget)
 {
     // dont check our preset list, if element exists
     // We try to open it and forward all errors to the user!
@@ -598,10 +598,10 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset,
        return;
     }
 
-    ::rtl::OUString sPresetFile(sPreset);
+    OUString sPresetFile(sPreset);
     sPresetFile += FILE_EXTENSION;
 
-    ::rtl::OUString sTargetFile(sTarget);
+    OUString sTargetFile(sTarget);
     sTargetFile += FILE_EXTENSION;
 
     // remove existing elements before you try to copy the preset to that location ...
@@ -618,7 +618,7 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset,
 }
 
 //-----------------------------------------------
-css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::OUString& sPreset,
+css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset,
                                                                   sal_Bool bUseNoLangGlobal)
 {
     // SAFE -> ----------------------------------
@@ -631,7 +631,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O
     if (!xFolder.is())
        return css::uno::Reference< css::io::XStream >();
 
-    ::rtl::OUString sFile(sPreset);
+    OUString sFile(sPreset);
     sFile += FILE_EXTENSION;
 
     // inform user about errors (use original exceptions!)
@@ -640,7 +640,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O
 }
 
 //-----------------------------------------------
-css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::OUString& sTarget         ,
+css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget         ,
                                                                         sal_Bool         bCreateIfMissing)
 {
     // SAFE -> ----------------------------------
@@ -653,7 +653,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O
     if (!xFolder.is())
        return css::uno::Reference< css::io::XStream >();
 
-    ::rtl::OUString sFile(sTarget);
+    OUString sFile(sTarget);
     sFile += FILE_EXTENSION;
 
     sal_Int32 nOpenMode = css::embed::ElementModes::READWRITE;
@@ -694,7 +694,7 @@ void PresetHandler::commitUserChanges()
     if (!xWorking.is())
        return;
 
-    ::rtl::OUString sPath;
+    OUString sPath;
 
     switch(eCfgType)
     {
@@ -722,7 +722,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener)
 {
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
-    ::rtl::OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer!
+    OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer!
     EConfigType     eCfgType = m_eConfigType;
     aReadLock.unlock();
     // <- SAFE ----------------------------------
@@ -752,7 +752,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener)
 {
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
-    ::rtl::OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer!
+    OUString sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer!
     EConfigType     eCfgType = m_eConfigType;
     aReadLock.unlock();
     // <- SAFE ----------------------------------
@@ -778,7 +778,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener)
 }
 
 //-----------------------------------------------
-css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const ::rtl::OUString& sPath ,
+css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath ,
                                                                                              sal_Int32        eMode ,
                                                                                              sal_Bool         bShare)
 {
@@ -798,12 +798,12 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
 }
 
 //-----------------------------------------------
-::std::vector< ::rtl::OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue(
-        const ::std::vector< ::rtl::OUString >& lLocalizedValues,
+::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue(
+        const ::std::vector< OUString >& lLocalizedValues,
         OUString& rLanguageTag,
         sal_Bool bAllowFallbacks )
 {
-    ::std::vector< ::rtl::OUString >::const_iterator pFound = lLocalizedValues.end();
+    ::std::vector< OUString >::const_iterator pFound = lLocalizedValues.end();
     if (bAllowFallbacks)
     {
         pFound = LanguageTag::getFallback(lLocalizedValues, rLanguageTag);
@@ -830,15 +830,15 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
 
 //-----------------------------------------------
 css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors(
-        ::rtl::OUString&      sPath         ,
+        OUString&      sPath         ,
         sal_Int32             eMode         ,
         sal_Bool              bShare        ,
         OUString&             rLanguageTag  ,
         sal_Bool              bAllowFallback)
 {
     css::uno::Reference< css::embed::XStorage >      xPath         = impl_openPathIgnoringErrors(sPath, eMode, bShare);
-    ::std::vector< ::rtl::OUString >                 lSubFolders   = impl_getSubFolderNames(xPath);
-    ::std::vector< ::rtl::OUString >::const_iterator pLocaleFolder = impl_findMatchingLocalizedValue(lSubFolders, rLanguageTag, bAllowFallback);
+    ::std::vector< OUString >                 lSubFolders   = impl_getSubFolderNames(xPath);
+    ::std::vector< OUString >::const_iterator pLocaleFolder = impl_findMatchingLocalizedValue(lSubFolders, rLanguageTag, bAllowFallback);
 
     // no fallback ... creation not allowed => no storage
     if (
@@ -850,7 +850,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
     // it doesnt matter, if there is a locale fallback or not
     // If creation of storages is allowed, we do it anyway.
     // Otherwhise we have no acc config at all, which can make other trouble.
-    ::rtl::OUString sLocalizedPath;
+    OUString sLocalizedPath;
     sLocalizedPath  = sPath;
     sLocalizedPath += PATH_SEPERATOR;
     if (pLocaleFolder != lSubFolders.end())
@@ -863,21 +863,21 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
     if (xLocalePath.is())
         sPath = sLocalizedPath;
     else
-        sPath = ::rtl::OUString();
+        sPath = OUString();
 
     return xLocalePath;
 }
 
 //-----------------------------------------------
-::std::vector< ::rtl::OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder)
+::std::vector< OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder)
 {
     css::uno::Reference< css::container::XNameAccess > xAccess(xFolder, css::uno::UNO_QUERY);
     if (!xAccess.is())
-        return ::std::vector< ::rtl::OUString >();
+        return ::std::vector< OUString >();
 
-          ::std::vector< ::rtl::OUString >      lSubFolders;
-    const css::uno::Sequence< ::rtl::OUString > lNames = xAccess->getElementNames();
-    const ::rtl::OUString*                      pNames = lNames.getConstArray();
+          ::std::vector< OUString >      lSubFolders;
+    const css::uno::Sequence< OUString > lNames = xAccess->getElementNames();
+    const OUString*                      pNames = lNames.getConstArray();
           sal_Int32                             c      = lNames.getLength();
           sal_Int32                             i      = 0;
 
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index ed05f6f32a8d..40d875c2b51e 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -42,7 +42,7 @@
 
 #define PATH_SEPERATOR_ASCII        "/"
 #define PATH_SEPERATOR_UNICODE      ((sal_Unicode)'/')
-#define PATH_SEPERATOR              ::rtl::OUString(PATH_SEPERATOR_ASCII)
+#define PATH_SEPERATOR              OUString(PATH_SEPERATOR_ASCII)
 
 
 namespace framework
@@ -102,10 +102,10 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() cons
 }
 
 //-----------------------------------------------
-css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl::OUString& sPath    ,
+css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUString& sPath    ,
                                                                           sal_Int32        nOpenMode)
 {
-    ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+    OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
     OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
 
     // SAFE -> ----------------------------------
@@ -115,15 +115,15 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl:
     // <- SAFE ----------------------------------
 
     css::uno::Reference< css::embed::XStorage > xChild  ;
-    ::rtl::OUString                             sRelPath;
+    OUString                             sRelPath;
     OUStringList::const_iterator                pIt     ;
 
     for (  pIt  = lFolders.begin();
            pIt != lFolders.end()  ;
          ++pIt                    )
     {
-        const ::rtl::OUString& sChild     = *pIt;
-              ::rtl::OUString  sCheckPath (sRelPath);
+        const OUString& sChild     = *pIt;
+              OUString  sCheckPath (sRelPath);
                                sCheckPath += sChild;
                                sCheckPath += PATH_SEPERATOR;
 
@@ -187,13 +187,13 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl:
 }
 
 //-----------------------------------------------
-StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUString& sPath)
+StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sPath)
 {
-    ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+    OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
     OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
 
     StorageHolder::TStorageList  lStoragesOfPath;
-    ::rtl::OUString              sRelPath       ;
+    OUString              sRelPath       ;
     OUStringList::const_iterator pIt            ;
 
     // SAFE -> ----------------------------------
@@ -203,8 +203,8 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr
            pIt != lFolders.end()  ;
          ++pIt                    )
     {
-        const ::rtl::OUString& sChild     = *pIt;
-              ::rtl::OUString  sCheckPath (sRelPath);
+        const OUString& sChild     = *pIt;
+              OUString  sCheckPath (sRelPath);
                                sCheckPath += sChild;
                                sCheckPath += PATH_SEPERATOR;
 
@@ -231,7 +231,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr
 }
 
 //-----------------------------------------------
-void StorageHolder::commitPath(const ::rtl::OUString& sPath)
+void StorageHolder::commitPath(const OUString& sPath)
 {
     StorageHolder::TStorageList lStorages = getAllPathStorages(sPath);
 
@@ -258,9 +258,9 @@ void StorageHolder::commitPath(const ::rtl::OUString& sPath)
 }
 
 //-----------------------------------------------
-void StorageHolder::closePath(const ::rtl::OUString& rPath)
+void StorageHolder::closePath(const OUString& rPath)
 {
-    ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(rPath);
+    OUString sNormedPath = StorageHolder::impl_st_normPath(rPath);
     OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
 
     /* convert list of paths in the following way:
@@ -269,12 +269,12 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath)
         [2] = "path_3" => "path_1/path_2/path_3"
     */
     OUStringList::iterator pIt1       ;
-    ::rtl::OUString        sParentPath;
+    OUString        sParentPath;
     for (  pIt1  = lFolders.begin();
            pIt1 != lFolders.end()  ;
          ++pIt1                    )
     {
-        ::rtl::OUString sCurrentRelPath  = sParentPath;
+        OUString sCurrentRelPath  = sParentPath;
                         sCurrentRelPath += *pIt1;
                         sCurrentRelPath += PATH_SEPERATOR;
         *pIt1       = sCurrentRelPath;
@@ -289,7 +289,7 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath)
            pIt2 != lFolders.rend()  ;
          ++pIt2                     )
     {
-        ::rtl::OUString             sPath = *pIt2;
+        OUString             sPath = *pIt2;
         TPath2StorageInfo::iterator pPath = m_lStorages.find(sPath);
         if (pPath == m_lStorages.end())
             continue; // ???
@@ -308,9 +308,9 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath)
 }
 
 //-----------------------------------------------
-void StorageHolder::notifyPath(const ::rtl::OUString& sPath)
+void StorageHolder::notifyPath(const OUString& sPath)
 {
-    ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+    OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
 
     // SAFE -> ------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -336,9 +336,9 @@ void StorageHolder::notifyPath(const ::rtl::OUString& sPath)
 
 //-----------------------------------------------
 void StorageHolder::addStorageListener(      IStorageListener* pListener,
-                                       const ::rtl::OUString&  sPath    )
+                                       const OUString&  sPath    )
 {
-    ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+    OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
 
     // SAFE -> ------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -358,9 +358,9 @@ void StorageHolder::addStorageListener(      IStorageListener* pListener,
 
 //-----------------------------------------------
 void StorageHolder::removeStorageListener(      IStorageListener* pListener,
-                                          const ::rtl::OUString&  sPath    )
+                                          const OUString&  sPath    )
 {
-    ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
+    OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
 
     // SAFE -> ------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -379,7 +379,7 @@ void StorageHolder::removeStorageListener(      IStorageListener* pListener,
 }
 
 //-----------------------------------------------
-::rtl::OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
+OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
 {
     // SAFE -> ------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -395,7 +395,7 @@ void StorageHolder::removeStorageListener(      IStorageListener* pListener,
     }
 
     if (pIt == m_lStorages.end())
-        return ::rtl::OUString();
+        return OUString();
 
     return pIt->first;
 
@@ -405,15 +405,15 @@ void StorageHolder::removeStorageListener(      IStorageListener* pListener,
 //-----------------------------------------------
 css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild)
 {
-    ::rtl::OUString sChildPath = getPathOfStorage(xChild);
+    OUString sChildPath = getPathOfStorage(xChild);
     return getParentStorage(sChildPath);
 }
 
 //-----------------------------------------------
-css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const ::rtl::OUString& sChildPath)
+css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const OUString& sChildPath)
 {
     // normed path = "a/b/c/" ... we search for "a/b/"
-    ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath);
+    OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath);
     OUStringList    lFolders    = StorageHolder::impl_st_parsePath(sNormedPath);
     sal_Int32       c           = lFolders.size();
 
@@ -433,7 +433,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons
         return m_xRoot;
 
     // c)
-    ::rtl::OUString sParentPath;
+    OUString sParentPath;
     sal_Int32       i = 0;
     for (i=0; i<c-1; ++i)
     {
@@ -468,7 +468,7 @@ void StorageHolder::operator=(const StorageHolder& rCopy)
 
 //-----------------------------------------------
 css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage  ,
-                                                                                      const ::rtl::OUString&                             sSubStorage   ,
+                                                                                      const OUString&                             sSubStorage   ,
                                                                                             sal_Int32                                    eOpenMode     ,
                                                                                             sal_Bool                                     bAllowFallback)
 {
@@ -508,7 +508,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal
 
 //-----------------------------------------------
 css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage  ,
-                                                                                 const ::rtl::OUString&                             sSubStream    ,
+                                                                                 const OUString&                             sSubStream    ,
                                                                                        sal_Int32                                    eOpenMode     ,
                                                                                        sal_Bool                                     bAllowFallback)
 {
@@ -547,11 +547,11 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
 }
 
 //-----------------------------------------------
-::rtl::OUString StorageHolder::impl_st_normPath(const ::rtl::OUString& sPath)
+OUString StorageHolder::impl_st_normPath(const OUString& sPath)
 {
     // path must start without "/" but end with "/"!
 
-    ::rtl::OUString sNormedPath = sPath;
+    OUString sNormedPath = sPath;
 
     // "/bla" => "bla" && "/" => "" (!)
     if (sNormedPath.indexOf(PATH_SEPERATOR) == 0)
@@ -559,7 +559,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
 
     // "/" => "" || "" => "" ?
     if (sNormedPath.isEmpty())
-        return ::rtl::OUString();
+        return OUString();
 
     // "bla" => "bla/"
     if (sNormedPath.lastIndexOf(PATH_SEPERATOR) != (sNormedPath.getLength()-1))
@@ -569,13 +569,13 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
 }
 
 //-----------------------------------------------
-OUStringList StorageHolder::impl_st_parsePath(const ::rtl::OUString& sPath)
+OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath)
 {
     OUStringList lToken;
     sal_Int32    i  = 0;
     while (true)
     {
-        ::rtl::OUString sToken = sPath.getToken(0, PATH_SEPERATOR_UNICODE, i);
+        OUString sToken = sPath.getToken(0, PATH_SEPERATOR_UNICODE, i);
         if (i < 0)
             break;
         lToken.push_back(sToken);