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

13 files changed, 262 insertions, 264 deletions

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 00c3e0792757..20ffa4585f22 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -310,7 +310,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems)
     {
         OSL_FAIL("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.");
         throw css::uno::RuntimeException(
-                ::rtl::OUString("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."),
+                OUString("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."),
                 m_xOwner);
     }
 
@@ -337,7 +337,7 @@ void CacheLockGuard::unlock()
     {
         OSL_FAIL("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
         throw css::uno::RuntimeException(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")),
                 m_xOwner);
     }
     aWriteLock.unlock();
@@ -356,7 +356,7 @@ DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap&
 {
     m_nWorkingEntryID         = lArgs.getUnpackedValueOrDefault(PROP_ENTRY_ID, (sal_Int32)-1                                       );
     m_xProgress               = lArgs.getUnpackedValueOrDefault(PROP_PROGRESS, css::uno::Reference< css::task::XStatusIndicator >());
-    m_sSavePath               = lArgs.getUnpackedValueOrDefault(PROP_SAVEPATH, ::rtl::OUString()                                   );
+    m_sSavePath               = lArgs.getUnpackedValueOrDefault(PROP_SAVEPATH, OUString()                                   );
     m_xHoldRefForAsyncOpAlive = xOwner;
 };
 
@@ -386,7 +386,7 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy)
 //-----------------------------------------------
 void DispatchParams::forget()
 {
-    m_sSavePath       = ::rtl::OUString();
+    m_sSavePath       = OUString();
     m_nWorkingEntryID = -1;
     m_xProgress.clear();
     m_xHoldRefForAsyncOpAlive.clear();
@@ -715,7 +715,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
     throw(css::uno::RuntimeException)
 {
     if (!xListener.is())
-        throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
+        throw css::uno::RuntimeException(OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
     // container is threadsafe by using a shared mutex!
     m_lListener.addInterface(aURL.Complete, xListener);
 
@@ -750,7 +750,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
     throw(css::uno::RuntimeException)
 {
     if (!xListener.is())
-        throw css::uno::RuntimeException(::rtl::OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
+        throw css::uno::RuntimeException(OUString("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this));
     // container is threadsafe by using a shared mutex!
     m_lListener.removeInterface(aURL.Complete, xListener);
 }
@@ -845,7 +845,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
 
     for (i=0; i<c; ++i)
     {
-        ::rtl::OUString sPath;
+        OUString sPath;
         pChanges[i].Accessor >>= sPath;
 
         if ( sPath == CFG_ENTRY_AUTOSAVE_ENABLED )
@@ -935,7 +935,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
     aWriteLock.unlock();
     // <- SAFE ----------------------------------
 
-    rtl::OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY));
+    OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY));
     // throws a RuntimeException if an error occure!
     css::uno::Reference< css::container::XNameAccess > xCFG(
         ::comphelper::ConfigurationHelper::openConfig(xContext, sCFG_PACKAGE_RECOVERY, ::comphelper::ConfigurationHelper::E_STANDARD),
@@ -946,17 +946,17 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
 
     try
     {
-        rtl::OUString sCFG_PATH_AUTOSAVE(CFG_PATH_AUTOSAVE);
+        OUString sCFG_PATH_AUTOSAVE(CFG_PATH_AUTOSAVE);
         ::comphelper::ConfigurationHelper::readDirectKey(xContext,
                                                          sCFG_PACKAGE_RECOVERY,
                                                          sCFG_PATH_AUTOSAVE,
-                                                         rtl::OUString(CFG_ENTRY_MINSPACE_DOCSAVE),
+                                                         OUString(CFG_ENTRY_MINSPACE_DOCSAVE),
                                                          ::comphelper::ConfigurationHelper::E_STANDARD) >>= nMinSpaceDocSave;
 
         ::comphelper::ConfigurationHelper::readDirectKey(xContext,
                                                          sCFG_PACKAGE_RECOVERY,
                                                          sCFG_PATH_AUTOSAVE,
-                                                         rtl::OUString(CFG_ENTRY_MINSPACE_CONFIGSAVE),
+                                                         OUString(CFG_ENTRY_MINSPACE_CONFIGSAVE),
                                                          ::comphelper::ConfigurationHelper::E_STANDARD) >>= nMinSpaceConfigSave;
     }
     catch(const css::uno::Exception&)
@@ -985,11 +985,11 @@ void AutoRecovery::implts_readAutoSaveConfig()
 
     // AutoSave [bool]
     sal_Bool bEnabled = sal_False;
-    xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_AUTOSAVE_ENABLED)) >>= bEnabled;
+    xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_ENABLED)) >>= bEnabled;
 
     // UserAutoSave [bool]
     sal_Bool bUserEnabled = sal_False;
-    xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_USERAUTOSAVE_ENABLED)) >>= bUserEnabled;
+    xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_USERAUTOSAVE_ENABLED)) >>= bUserEnabled;
 
     // SAFE -> ------------------------------
     WriteGuard aWriteLock(m_aLock);
@@ -1017,7 +1017,7 @@ void AutoRecovery::implts_readAutoSaveConfig()
 
     // AutoSaveTimeIntervall [int] in min
     sal_Int32 nTimeIntervall = 15;
-    xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)) >>= nTimeIntervall;
+    xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)) >>= nTimeIntervall;
 
     // SAFE -> ----------------------------------
     aWriteLock.lock();
@@ -1050,14 +1050,14 @@ void AutoRecovery::implts_readConfig()
     css::uno::Any aValue;
 
     // RecoveryList [set]
-    aValue = xCommonRegistry->getByHierarchicalName(rtl::OUString(CFG_ENTRY_RECOVERYLIST));
+    aValue = xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_RECOVERYLIST));
     css::uno::Reference< css::container::XNameAccess > xList;
     aValue >>= xList;
     if (xList.is())
     {
-        const rtl::OUString sRECOVERY_ITEM_BASE_IDENTIFIER(RECOVERY_ITEM_BASE_IDENTIFIER);
-        const css::uno::Sequence< ::rtl::OUString > lItems = xList->getElementNames();
-        const ::rtl::OUString*                      pItems = lItems.getConstArray();
+        const OUString sRECOVERY_ITEM_BASE_IDENTIFIER(RECOVERY_ITEM_BASE_IDENTIFIER);
+        const css::uno::Sequence< OUString > lItems = xList->getElementNames();
+        const OUString*                      pItems = lItems.getConstArray();
               sal_Int32                             c      = lItems.getLength();
               sal_Int32                             i      = 0;
 
@@ -1072,22 +1072,22 @@ void AutoRecovery::implts_readConfig()
                 continue;
 
             AutoRecovery::TDocumentInfo aInfo;
-            aInfo.NewTempURL = ::rtl::OUString();
+            aInfo.NewTempURL = OUString();
             aInfo.Document   = css::uno::Reference< css::frame::XModel >();
-            xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL       ;
-            xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL   ;
-            xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL  ;
-            xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter   ;
-            xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE)) >>= aInfo.DocumentState;
-            xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_MODULE)) >>= aInfo.AppModule;
-            xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TITLE)) >>= aInfo.Title;
-            xItem->getPropertyValue(rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES)) >>= aInfo.ViewNames;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL       ;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL   ;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL  ;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter   ;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE)) >>= aInfo.DocumentState;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_MODULE)) >>= aInfo.AppModule;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TITLE)) >>= aInfo.Title;
+            xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_VIEWNAMES)) >>= aInfo.ViewNames;
             implts_specifyAppModuleAndFactory(aInfo);
             implts_specifyDefaultFilterAndExtension(aInfo);
 
             if (pItems[i].indexOf(sRECOVERY_ITEM_BASE_IDENTIFIER)==0)
             {
-                ::rtl::OUString sID = pItems[i].copy(sRECOVERY_ITEM_BASE_IDENTIFIER.getLength());
+                OUString sID = pItems[i].copy(sRECOVERY_ITEM_BASE_IDENTIFIER.getLength());
                 aInfo.ID = sID.toInt32();
                 // SAFE -> ----------------------
                 aWriteLock.lock();
@@ -1124,7 +1124,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
     if (rInfo.AppModule.isEmpty())
     {
         throw css::uno::RuntimeException(
-                ::rtl::OUString("Cant find out the default filter and its extension, if no application module is known!"),
+                OUString("Cant find out the default filter and its extension, if no application module is known!"),
                 static_cast< css::frame::XDispatch* >(this));
     }
 
@@ -1141,7 +1141,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
         {
             // open module config on demand and cache the update access
             xCFG = css::uno::Reference< css::container::XNameAccess >(
-                ::comphelper::ConfigurationHelper::openConfig(comphelper::getComponentContext(xSMGR), rtl::OUString(CFG_PACKAGE_MODULES),
+                ::comphelper::ConfigurationHelper::openConfig(comphelper::getComponentContext(xSMGR), OUString(CFG_PACKAGE_MODULES),
                 ::comphelper::ConfigurationHelper::E_STANDARD),
                 css::uno::UNO_QUERY_THROW);
 
@@ -1156,27 +1156,27 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
             xCFG->getByName(rInfo.AppModule),
             css::uno::UNO_QUERY_THROW);
 
-        xModuleProps->getByName(rtl::OUString(CFG_ENTRY_REALDEFAULTFILTER)) >>= rInfo.DefaultFilter;
+        xModuleProps->getByName(OUString(CFG_ENTRY_REALDEFAULTFILTER)) >>= rInfo.DefaultFilter;
 
         css::uno::Reference< css::container::XNameAccess > xFilterCFG(xSMGR->createInstance(SERVICENAME_FILTERFACTORY), css::uno::UNO_QUERY_THROW);
         css::uno::Reference< css::container::XNameAccess > xTypeCFG  (xSMGR->createInstance(SERVICENAME_TYPEDETECTION), css::uno::UNO_QUERY_THROW);
 
         ::comphelper::SequenceAsHashMap       lFilterProps        (xFilterCFG->getByName(rInfo.DefaultFilter));
-        ::rtl::OUString                       sTypeRegistration   = lFilterProps.getUnpackedValueOrDefault(rtl::OUString(FILTER_PROP_TYPE), ::rtl::OUString());
+        OUString                       sTypeRegistration   = lFilterProps.getUnpackedValueOrDefault(OUString(FILTER_PROP_TYPE), OUString());
         ::comphelper::SequenceAsHashMap       lTypeProps          (xTypeCFG->getByName(sTypeRegistration));
-        css::uno::Sequence< ::rtl::OUString > lExtensions         = lTypeProps.getUnpackedValueOrDefault(rtl::OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< ::rtl::OUString >());
+        css::uno::Sequence< OUString > lExtensions         = lTypeProps.getUnpackedValueOrDefault(OUString(TYPE_PROP_EXTENSIONS), css::uno::Sequence< OUString >());
         if (lExtensions.getLength())
         {
-            rInfo.Extension  = ::rtl::OUString(".");
+            rInfo.Extension  = OUString(".");
             rInfo.Extension += lExtensions[0];
         }
         else
-            rInfo.Extension = ::rtl::OUString(".unknown");
+            rInfo.Extension = OUString(".unknown");
     }
     catch(const css::uno::Exception&)
     {
-        rInfo.DefaultFilter = ::rtl::OUString();
-        rInfo.Extension     = ::rtl::OUString();
+        rInfo.DefaultFilter = OUString();
+        rInfo.Extension     = OUString();
     }
 }
 
@@ -1200,8 +1200,8 @@ void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo
         rInfo.AppModule = xManager->identify(rInfo.Document);
 
     ::comphelper::SequenceAsHashMap lModuleDescription(xManager->getByName(rInfo.AppModule));
-    lModuleDescription[rtl::OUString(CFG_ENTRY_PROP_EMPTYDOCUMENTURL)] >>= rInfo.FactoryURL;
-    lModuleDescription[rtl::OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService;
+    lModuleDescription[OUString(CFG_ENTRY_PROP_EMPTYDOCUMENTURL)] >>= rInfo.FactoryURL;
+    lModuleDescription[OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService;
 }
 
 //-----------------------------------------------
@@ -1212,7 +1212,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i
     i_rInfo.ViewNames.realloc(0);
 
     // obtain list of controllers of this document
-    ::std::vector< ::rtl::OUString > aViewNames;
+    ::std::vector< OUString > aViewNames;
     const Reference< XModel2 > xModel( i_rInfo.Document, UNO_QUERY );
     if ( xModel.is() )
     {
@@ -1220,7 +1220,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i
         while ( xEnumControllers->hasMoreElements() )
         {
             const Reference< XController2 > xController( xEnumControllers->nextElement(), UNO_QUERY );
-            ::rtl::OUString sViewName;
+            OUString sViewName;
             if ( xController.is() )
                 sViewName = xController->getViewControllerName();
             OSL_ENSURE( !sViewName.isEmpty(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" );
@@ -1232,7 +1232,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i
     else
     {
         const Reference< XController2 > xController( xModel->getCurrentController(), UNO_QUERY );
-        ::rtl::OUString sViewName;
+        OUString sViewName;
         if ( xController.is() )
             sViewName = xController->getViewControllerName();
         OSL_ENSURE( !sViewName.isEmpty(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" );
@@ -1272,15 +1272,15 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
         xCFG = css::uno::Reference< css::container::XHierarchicalNameAccess >(implts_openConfig(), css::uno::UNO_QUERY_THROW);
 
         css::uno::Reference< css::container::XNameAccess > xCheck;
-        xCFG->getByHierarchicalName(rtl::OUString(CFG_ENTRY_RECOVERYLIST)) >>= xCheck;
+        xCFG->getByHierarchicalName(OUString(CFG_ENTRY_RECOVERYLIST)) >>= xCheck;
 
         css::uno::Reference< css::container::XNameContainer >   xModify(xCheck, css::uno::UNO_QUERY_THROW);
         css::uno::Reference< css::lang::XSingleServiceFactory > xCreate(xCheck, css::uno::UNO_QUERY_THROW);
 
-        ::rtl::OUStringBuffer sIDBuf;
+        OUStringBuffer sIDBuf;
         sIDBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(RECOVERY_ITEM_BASE_IDENTIFIER));
         sIDBuf.append((sal_Int32)rInfo.ID);
-        ::rtl::OUString sID = sIDBuf.makeStringAndClear();
+        OUString sID = sIDBuf.makeStringAndClear();
 
         // remove
         if (bRemoveIt)
@@ -1307,14 +1307,14 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
             else
                 xCheck->getByName(sID) >>= xSet;
 
-            xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL), css::uno::makeAny(rInfo.OrgURL       ));
-            xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPURL), css::uno::makeAny(rInfo.OldTempURL   ));
-            xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL), css::uno::makeAny(rInfo.TemplateURL  ));
-            xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_FILTER), css::uno::makeAny(rInfo.RealFilter));
-            xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), css::uno::makeAny(rInfo.DocumentState));
-            xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_MODULE), css::uno::makeAny(rInfo.AppModule));
-            xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_TITLE), css::uno::makeAny(rInfo.Title));
-            xSet->setPropertyValue(rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES), css::uno::makeAny(rInfo.ViewNames));
+            xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL), css::uno::makeAny(rInfo.OrgURL       ));
+            xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL), css::uno::makeAny(rInfo.OldTempURL   ));
+            xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL), css::uno::makeAny(rInfo.TemplateURL  ));
+            xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_FILTER), css::uno::makeAny(rInfo.RealFilter));
+            xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), css::uno::makeAny(rInfo.DocumentState));
+            xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_MODULE), css::uno::makeAny(rInfo.AppModule));
+            xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TITLE), css::uno::makeAny(rInfo.Title));
+            xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_VIEWNAMES), css::uno::makeAny(rInfo.ViewNames));
 
             if (bNew)
                 xModify->insertByName(sID, css::uno::makeAny(xSet));
@@ -1742,7 +1742,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
     // and save an information about the real used filter by this document.
     // We save this document with DefaultFilter ... and load it with the RealFilter.
     implts_specifyDefaultFilterAndExtension(aNew);
-    aNew.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME()  , ::rtl::OUString());
+    aNew.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME()  , OUString());
 
     // Further we must know, if this document base on a template.
     // Then we must load it in a different way.
@@ -1925,22 +1925,22 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr
     css::uno::Reference< css::frame::XStorable > xDoc(rInfo.Document, css::uno::UNO_QUERY);
     rInfo.OrgURL = xDoc->getLocation();
 
-    ::rtl::OUString sRemoveURL1 = rInfo.OldTempURL;
-    ::rtl::OUString sRemoveURL2 = rInfo.NewTempURL;
-    rInfo.OldTempURL = ::rtl::OUString();
-    rInfo.NewTempURL = ::rtl::OUString();
+    OUString sRemoveURL1 = rInfo.OldTempURL;
+    OUString sRemoveURL2 = rInfo.NewTempURL;
+    rInfo.OldTempURL = OUString();
+    rInfo.NewTempURL = OUString();
 
     ::comphelper::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
-    rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), ::rtl::OUString());
+    rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString());
 
     css::uno::Reference< css::frame::XTitle > xDocTitle(xDocument, css::uno::UNO_QUERY);
     if (xDocTitle.is ())
         rInfo.Title = xDocTitle->getTitle ();
     else
     {
-        rInfo.Title      = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TITLE()     , ::rtl::OUString());
+        rInfo.Title      = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TITLE()     , OUString());
         if (rInfo.Title.isEmpty())
-            rInfo.Title  = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_DOCUMENTTITLE(), ::rtl::OUString());
+            rInfo.Title  = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_DOCUMENTTITLE(), OUString());
     }
 
     rInfo.UsedForSaving = sal_False;
@@ -2029,7 +2029,7 @@ void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo)
         try
         {
             css::uno::Reference< css::frame::XStorable > xStore(rInfo.Document, css::uno::UNO_QUERY_THROW);
-            ::rtl::OUString aURL = xStore->getLocation();
+            OUString aURL = xStore->getLocation();
             if ( !aURL.isEmpty() )
             {
                 ::svt::DocumentLockFile aLockFile( aURL );
@@ -2153,7 +2153,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(      sal_Bool        bAl
         xExternalProgress = pParams->m_xProgress;
 
     css::uno::Reference< css::frame::XDesktop2 > xDesktop   = css::frame::Desktop::create( comphelper::getComponentContext(xSMGR));
-    ::rtl::OUString                              sBackupPath(SvtPathOptions().GetBackupPath());
+    OUString                              sBackupPath(SvtPathOptions().GetBackupPath());
 
     css::uno::Reference< css::frame::XController > xActiveController;
     css::uno::Reference< css::frame::XModel >      xActiveModel     ;
@@ -2315,7 +2315,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(      sal_Bool        bAl
 }
 
 //-----------------------------------------------
-void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&                                    sBackupPath      ,
+void AutoRecovery::implts_saveOneDoc(const OUString&                                    sBackupPath      ,
                                            AutoRecovery::TDocumentInfo&                        rInfo            ,
                                      const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress)
 {
@@ -2333,7 +2333,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
     // if the document was loaded with a password, it should be
     // stored with password
     ::comphelper::MediaDescriptor lNewArgs;
-    ::rtl::OUString sPassword = lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PASSWORD(), ::rtl::OUString());
+    OUString sPassword = lOldArgs.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PASSWORD(), OUString());
     if (!sPassword.isEmpty())
         lNewArgs[::comphelper::MediaDescriptor::PROP_PASSWORD()] <<= sPassword;
 
@@ -2349,7 +2349,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
 
     // #i66598# use special handling of property "DocumentBaseURL" (it must be an empty string!)
     // for make hyperlinks working
-    lNewArgs[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= ::rtl::OUString();
+    lNewArgs[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString();
 
     // try to save this document as a new temp file everytimes.
     // Mark AutoSave state as "INCOMPLETE" if it failed.
@@ -2421,7 +2421,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
     else
     {
         // safe the state about error ...
-        rInfo.NewTempURL     = ::rtl::OUString();
+        rInfo.NewTempURL     = OUString();
         rInfo.DocumentState &= ~AutoRecovery::E_TRY_SAVE;
         rInfo.DocumentState |=  AutoRecovery::E_HANDLED;
         rInfo.DocumentState |=  AutoRecovery::E_INCOMPLETE;
@@ -2433,9 +2433,9 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
     // try to remove the old temp file.
     // Ignore any error here. We have a new temp file, which is up to date.
     // The only thing is: we fill the disk with temp files, if we cant remove old ones :-)
-    ::rtl::OUString sRemoveFile      = rInfo.OldTempURL;
+    OUString sRemoveFile      = rInfo.OldTempURL;
                     rInfo.OldTempURL = rInfo.NewTempURL;
-                    rInfo.NewTempURL = ::rtl::OUString();
+                    rInfo.NewTempURL = OUString();
 
     implts_flushConfigItem(rInfo);
 
@@ -2489,8 +2489,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
         ::comphelper::MediaDescriptor lDescriptor;
 
         // its an UI feature - so the "USER" itself must be set as referer
-        lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= ::rtl::OUString(REFERRER_USER);
-        lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString();
+        lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= OUString(REFERRER_USER);
+        lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= OUString();
 
         // recovered documents are loaded hidden, and shown all at once, later
         lDescriptor[::comphelper::MediaDescriptor::PROP_HIDDEN()] <<= true;
@@ -2518,8 +2518,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
             }
         }
 
-        ::rtl::OUString sLoadOriginalURL;
-        ::rtl::OUString sLoadBackupURL  ;
+        OUString sLoadOriginalURL;
+        OUString sLoadBackupURL  ;
 
         if (!bBackupWasTried)
             sLoadBackupURL = rInfo.OldTempURL;
@@ -2542,7 +2542,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
 
         // A "Salvaged" item must exists every time. The core can make something special then for recovery.
         // Of course it should be the real file name of the original file, in case we load the temp. backup here.
-        ::rtl::OUString sURL;
+        OUString sURL;
         if (!sLoadBackupURL.isEmpty())
         {
             sURL = sLoadBackupURL;
@@ -2642,7 +2642,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
 }
 
 //-----------------------------------------------
-void AutoRecovery::implts_openOneDoc(const ::rtl::OUString&               sURL       ,
+void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
                                            ::comphelper::MediaDescriptor& lDescriptor,
                                            AutoRecovery::TDocumentInfo&   rInfo      )
 {
@@ -2685,7 +2685,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString&               sURL
             Reference< XDocumentRecovery > xDocRecover( xModel, UNO_QUERY_THROW );
             xDocRecover->recoverFromFile(
                 sURL,
-                lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_SALVAGEDFILE(), ::rtl::OUString() ),
+                lDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_SALVAGEDFILE(), OUString() ),
                 lDescriptor.getAsConstPropertyValueList()
             );
 
@@ -2694,14 +2694,14 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString&               sURL
         }
 
         // re-create all the views
-        ::std::vector< ::rtl::OUString > aViewsToRestore( rInfo.ViewNames.getLength() );
+        ::std::vector< OUString > aViewsToRestore( rInfo.ViewNames.getLength() );
         if ( rInfo.ViewNames.getLength() )
             ::std::copy( rInfo.ViewNames.getConstArray(), rInfo.ViewNames.getConstArray() + rInfo.ViewNames.getLength(), aViewsToRestore.begin() );
         // if we don't have views for whatever reason, then create a default-view, at least
         if ( aViewsToRestore.empty() )
-            aViewsToRestore.push_back( ::rtl::OUString() );
+            aViewsToRestore.push_back( OUString() );
 
-        for (   ::std::vector< ::rtl::OUString >::const_iterator viewName = aViewsToRestore.begin();
+        for (   ::std::vector< OUString >::const_iterator viewName = aViewsToRestore.begin();
                 viewName != aViewsToRestore.end();
                 ++viewName
             )
@@ -2753,7 +2753,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString&               sURL
         }
 
         // re-throw
-        ::rtl::OUStringBuffer sMsg(256);
+        OUStringBuffer sMsg(256);
         sMsg.appendAscii("Recovery of \"");
         sMsg.append     (sURL            );
         sMsg.appendAscii("\" failed."    );
@@ -2767,7 +2767,7 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString&               sURL
 }
 
 //-----------------------------------------------
-void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString&               sBackupPath     ,
+void AutoRecovery::implts_generateNewTempURL(const OUString&               sBackupPath     ,
                                                    ::comphelper::MediaDescriptor& /*rMediaDescriptor*/,
                                                    AutoRecovery::TDocumentInfo&   rInfo           )
 {
@@ -2785,7 +2785,7 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString&
     // we should not save it realy. Then we put the information about such "empty document"
     // into the configuration and dont create any recovery file on disk.
     // We use the title of the document to make it unique.
-    ::rtl::OUStringBuffer sUniqueName;
+    OUStringBuffer sUniqueName;
     if (!rInfo.OrgURL.isEmpty())
     {
         css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
@@ -2800,7 +2800,7 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString&
 
     // TODO: Must we strip some illegal signes - if we use the title?
 
-    rtl::OUString sName(sUniqueName.makeStringAndClear());
+    OUString sName(sUniqueName.makeStringAndClear());
     String sExtension(rInfo.Extension);
     String sPath(sBackupPath);
     ::utl::TempFile aTempFile(sName, &sExtension, &sPath);
@@ -2814,7 +2814,7 @@ void AutoRecovery::implts_informListener(      sal_Int32                      eJ
 {
     // Helper shares mutex with us -> threadsafe!
     ::cppu::OInterfaceContainerHelper* pListenerForURL = 0;
-    ::rtl::OUString                    sJob            = AutoRecovery::implst_getJobDescription(eJob);
+    OUString                    sJob            = AutoRecovery::implst_getJobDescription(eJob);
 
     // inform listener, which are registered for any URLs(!)
     pListenerForURL = m_lListener.getContainer(sJob);
@@ -2837,10 +2837,10 @@ void AutoRecovery::implts_informListener(      sal_Int32                      eJ
 }
 
 //-----------------------------------------------
-::rtl::OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
+OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
 {
     // describe the current running operation
-    ::rtl::OUStringBuffer sFeature(256);
+    OUStringBuffer sFeature(256);
     sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL));
 
     // Attention: Because "eJob" is used as a flag field the order of checking these
@@ -2908,7 +2908,7 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
 
 //-----------------------------------------------
 css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent(      sal_Int32                    eJob      ,
-                                                                           const ::rtl::OUString&             sEventType,
+                                                                           const OUString&             sEventType,
                                                                                  AutoRecovery::TDocumentInfo* pInfo     )
 {
     css::frame::FeatureStateEvent aEvent;
@@ -2919,15 +2919,15 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent(
     {
         // pack rInfo for transport via UNO
         ::comphelper::NamedValueCollection aInfo;
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_ID), pInfo->ID );
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_ORIGINALURL), pInfo->OrgURL );
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_FACTORYURL), pInfo->FactoryURL );
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TEMPLATEURL), pInfo->TemplateURL );
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TEMPURL), pInfo->OldTempURL.isEmpty() ? pInfo->NewTempURL : pInfo->OldTempURL );
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule) ;
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_TITLE), pInfo->Title);
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_VIEWNAMES), pInfo->ViewNames);
-        aInfo.put( rtl::OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), pInfo->DocumentState);
+        aInfo.put( OUString(CFG_ENTRY_PROP_ID), pInfo->ID );
+        aInfo.put( OUString(CFG_ENTRY_PROP_ORIGINALURL), pInfo->OrgURL );
+        aInfo.put( OUString(CFG_ENTRY_PROP_FACTORYURL), pInfo->FactoryURL );
+        aInfo.put( OUString(CFG_ENTRY_PROP_TEMPLATEURL), pInfo->TemplateURL );
+        aInfo.put( OUString(CFG_ENTRY_PROP_TEMPURL), pInfo->OldTempURL.isEmpty() ? pInfo->NewTempURL : pInfo->OldTempURL );
+        aInfo.put( OUString(CFG_ENTRY_PROP_MODULE), pInfo->AppModule) ;
+        aInfo.put( OUString(CFG_ENTRY_PROP_TITLE), pInfo->Title);
+        aInfo.put( OUString(CFG_ENTRY_PROP_VIEWNAMES), pInfo->ViewNames);
+        aInfo.put( OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), pInfo->DocumentState);
 
         aEvent.State <<= aInfo.getPropertyValues();
     }
@@ -2981,9 +2981,9 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams)
     // documents exists and was saved.
     ::comphelper::ConfigurationHelper::writeDirectKey(
         comphelper::getComponentContext(m_xSMGR),
-        rtl::OUString(CFG_PACKAGE_RECOVERY),
-        rtl::OUString(CFG_PATH_RECOVERYINFO),
-        rtl::OUString(CFG_ENTRY_CRASHED),
+        OUString(CFG_PACKAGE_RECOVERY),
+        OUString(CFG_PATH_RECOVERYINFO),
+        OUString(CFG_ENTRY_CRASHED),
         css::uno::makeAny(sal_True),
         ::comphelper::ConfigurationHelper::E_STANDARD);
 
@@ -3042,9 +3042,9 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams)
     // Reset the configuration hint "we was crashed"!
     ::comphelper::ConfigurationHelper::writeDirectKey(
         comphelper::getComponentContext(m_xSMGR),
-        rtl::OUString(CFG_PACKAGE_RECOVERY),
-        rtl::OUString(CFG_PATH_RECOVERYINFO),
-        rtl::OUString(CFG_ENTRY_CRASHED),
+        OUString(CFG_PACKAGE_RECOVERY),
+        OUString(CFG_PATH_RECOVERYINFO),
+        OUString(CFG_ENTRY_CRASHED),
         css::uno::makeAny(sal_False),
         ::comphelper::ConfigurationHelper::E_STANDARD);
 }
@@ -3109,9 +3109,9 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/)
     // the on next startup we know what's happen last time
     ::comphelper::ConfigurationHelper::writeDirectKey(
         comphelper::getComponentContext(m_xSMGR),
-        rtl::OUString(CFG_PACKAGE_RECOVERY),
-        rtl::OUString(CFG_PATH_RECOVERYINFO),
-        rtl::OUString(CFG_ENTRY_SESSIONDATA),
+        OUString(CFG_PACKAGE_RECOVERY),
+        OUString(CFG_PATH_RECOVERYINFO),
+        OUString(CFG_ENTRY_SESSIONDATA),
         css::uno::makeAny(sal_True),
         ::comphelper::ConfigurationHelper::E_STANDARD);
 
@@ -3146,9 +3146,9 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams)
     LOG_RECOVERY("... reset config key 'SessionData'")
     ::comphelper::ConfigurationHelper::writeDirectKey(
         comphelper::getComponentContext(m_xSMGR),
-        rtl::OUString(CFG_PACKAGE_RECOVERY),
-        rtl::OUString(CFG_PATH_RECOVERYINFO),
-        rtl::OUString(CFG_ENTRY_SESSIONDATA),
+        OUString(CFG_PACKAGE_RECOVERY),
+        OUString(CFG_PATH_RECOVERYINFO),
+        OUString(CFG_ENTRY_SESSIONDATA),
         css::uno::makeAny(sal_False),
         ::comphelper::ConfigurationHelper::E_STANDARD);
 
@@ -3169,7 +3169,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams)
         if (rInfo.ID != aParams.m_nWorkingEntryID)
             continue;
 
-        ::rtl::OUString sSourceURL;
+        OUString sSourceURL;
         // Prefer temp file. It contains the changes against the original document!
         if (!rInfo.OldTempURL.isEmpty())
             sSourceURL = rInfo.OldTempURL;
@@ -3216,9 +3216,9 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams)
 }
 
 //-----------------------------------------------
-AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const ::rtl::OUString& sSource    ,
-                                                               const ::rtl::OUString& sTargetPath,
-                                                               const ::rtl::OUString& sTargetName)
+AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& sSource    ,
+                                                               const OUString& sTargetPath,
+                                                               const OUString& sTargetName)
 {
     // create content for the parent folder and call transfer on that content with the source content
     // and the destination file name as parameters
@@ -3283,9 +3283,9 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
                     sal_Bool bSessionData  = sal_False;
                     ::comphelper::ConfigurationHelper::readDirectKey(
                                                     comphelper::getComponentContext(m_xSMGR),
-                                                    rtl::OUString(CFG_PACKAGE_RECOVERY),
-                                                    rtl::OUString(CFG_PATH_RECOVERYINFO),
-                                                    rtl::OUString(CFG_ENTRY_SESSIONDATA),
+                                                    OUString(CFG_PACKAGE_RECOVERY),
+                                                    OUString(CFG_PATH_RECOVERYINFO),
+                                                    OUString(CFG_ENTRY_SESSIONDATA),
                                                     ::comphelper::ConfigurationHelper::E_READONLY) >>= bSessionData;
 
                     sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0));
@@ -3302,18 +3302,18 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
         case AUTORECOVERY_PROPHANDLE_CRASHED :
                 aValue = ::comphelper::ConfigurationHelper::readDirectKey(
                             comphelper::getComponentContext(m_xSMGR),
-                            rtl::OUString(CFG_PACKAGE_RECOVERY),
-                            rtl::OUString(CFG_PATH_RECOVERYINFO),
-                            rtl::OUString(CFG_ENTRY_CRASHED),
+                            OUString(CFG_PACKAGE_RECOVERY),
+                            OUString(CFG_PATH_RECOVERYINFO),
+                            OUString(CFG_ENTRY_CRASHED),
                             ::comphelper::ConfigurationHelper::E_READONLY);
                 break;
 
         case AUTORECOVERY_PROPHANDLE_EXISTS_SESSIONDATA :
                 aValue = ::comphelper::ConfigurationHelper::readDirectKey(
                             comphelper::getComponentContext(m_xSMGR),
-                            rtl::OUString(CFG_PACKAGE_RECOVERY),
-                            rtl::OUString(CFG_PATH_RECOVERYINFO),
-                            rtl::OUString(CFG_ENTRY_SESSIONDATA),
+                            OUString(CFG_PACKAGE_RECOVERY),
+                            OUString(CFG_PATH_RECOVERYINFO),
+                            OUString(CFG_ENTRY_SESSIONDATA),
                             ::comphelper::ConfigurationHelper::E_READONLY);
                 break;
     }
@@ -3459,7 +3459,7 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
 
     sal_uInt64 nFreeSpace = SAL_MAX_UINT64;
 
-    ::rtl::OUString     sBackupPath(SvtPathOptions().GetBackupPath());
+    OUString     sBackupPath(SvtPathOptions().GetBackupPath());
     ::osl::VolumeInfo   aInfo      (osl_VolumeInfo_Mask_FreeSpace);
     ::osl::FileBase::RC aRC         = ::osl::Directory::getVolumeInfo(sBackupPath, aInfo);
 
@@ -3479,13 +3479,13 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
 //-----------------------------------------------
 void AutoRecovery::impl_showFullDiscError()
 {
-    rtl::OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON));
-    rtl::OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG));
+    OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON));
+    OUString sMsg(FWK_RESSTR(STR_FULL_DISC_MSG));
 
-    rtl::OUString sBackupURL(SvtPathOptions().GetBackupPath());
+    OUString sBackupURL(SvtPathOptions().GetBackupPath());
     INetURLObject aConverter(sBackupURL);
     sal_Unicode aDelimiter;
-    rtl::OUString sBackupPath = aConverter.getFSysPath(INetURLObject::FSYS_DETECT, &aDelimiter);
+    OUString sBackupPath = aConverter.getFSysPath(INetURLObject::FSYS_DETECT, &aDelimiter);
     if (sBackupPath.getLength() < 1)
         sBackupPath = sBackupURL;
 
@@ -3621,7 +3621,7 @@ void AutoRecovery::impl_flushALLConfigChanges()
 }
 
 //-----------------------------------------------
-void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL)
+void AutoRecovery::st_impl_removeFile(const OUString& sURL)
 {
     if ( sURL.isEmpty())
         return;
@@ -3629,7 +3629,7 @@ void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL)
     try
     {
         ::ucbhelper::Content aContent = ::ucbhelper::Content(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getComponentContext(m_xSMGR));
-        aContent.executeCommand(::rtl::OUString("delete"), css::uno::makeAny(sal_True));
+        aContent.executeCommand(OUString("delete"), css::uno::makeAny(sal_True));
     }
     catch(const css::uno::Exception&)
     {
@@ -3641,13 +3641,13 @@ void AutoRecovery::st_impl_removeLockFile()
 {
     try
     {
-        ::rtl::OUString sUserURL;
+        OUString sUserURL;
         ::utl::Bootstrap::locateUserInstallation( sUserURL );
 
-        ::rtl::OUStringBuffer sLockURLBuf;
+        OUStringBuffer sLockURLBuf;
         sLockURLBuf.append     (sUserURL);
         sLockURLBuf.appendAscii("/.lock");
-        ::rtl::OUString sLockURL = sLockURLBuf.makeStringAndClear();
+        OUString sLockURL = sLockURLBuf.makeStringAndClear();
 
         AutoRecovery::st_impl_removeFile(sLockURL);
     }
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 6c7b4eede5a8..88515c03f10f 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -244,7 +244,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
     @return The implementation name of this class.
 */
 
-::rtl::OUString SAL_CALL BackingComp::getImplementationName()
+OUString SAL_CALL BackingComp::getImplementationName()
     throw(css::uno::RuntimeException)
 {
     return impl_getStaticImplementationName();
@@ -264,7 +264,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
             <br><FALSE/> otherwise.
 */
 
-sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const ::rtl::OUString& sServiceName )
+sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const OUString& sServiceName )
     throw(css::uno::RuntimeException)
 {
     return (
@@ -286,7 +286,7 @@ sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const ::rtl::OUString& sS
     @return A list of all supported uno service names.
 */
 
-css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames()
     throw(css::uno::RuntimeException)
 {
     return impl_getStaticSupportedServiceNames();
@@ -305,7 +305,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceN
     @return The implementation name of this class.
 */
 
-::rtl::OUString BackingComp::impl_getStaticImplementationName()
+OUString BackingComp::impl_getStaticImplementationName()
 {
     return IMPLEMENTATIONNAME_STARTMODULE;
 }
@@ -323,9 +323,9 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BackingComp::getSupportedServiceN
     @return A list of all supported uno service names.
 */
 
-css::uno::Sequence< ::rtl::OUString > BackingComp::impl_getStaticSupportedServiceNames()
+css::uno::Sequence< OUString > BackingComp::impl_getStaticSupportedServiceNames()
 {
-    css::uno::Sequence< ::rtl::OUString > lNames(1);
+    css::uno::Sequence< OUString > lNames(1);
     lNames[0] = "com.sun.star.frame.StartModule";
     return lNames;
 }
@@ -444,12 +444,12 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     // check some required states
     if (m_xFrame.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString("already attached"),
+                OUString("already attached"),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (!xFrame.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString("invalid frame reference"),
+                OUString("invalid frame reference"),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (!m_xWindow.is())
@@ -635,7 +635,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
 
     if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString("unexpected source or called twice"),
+                OUString("unexpected source or called twice"),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     m_xWindow = css::uno::Reference< css::awt::XWindow >();
@@ -726,7 +726,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
     throw(css::uno::RuntimeException)
 {
     throw css::uno::RuntimeException(
-            ::rtl::OUString("not supported"),
+            OUString("not supported"),
             static_cast< ::cppu::OWeakObject* >(this));
 }
 
@@ -773,7 +773,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
 
     if (m_xWindow.is())
         throw css::uno::Exception(
-                ::rtl::OUString("already initialized"),
+                OUString("already initialized"),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     css::uno::Reference< css::awt::XWindow > xParentWindow;
@@ -784,7 +784,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
        )
     {
         throw css::uno::Exception(
-                ::rtl::OUString("wrong or corrupt argument list"),
+                OUString("wrong or corrupt argument list"),
                 static_cast< ::cppu::OWeakObject* >(this));
     }
 
@@ -795,7 +795,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
 
     if (!m_xWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString("couldn't create component window"),
+                OUString("couldn't create component window"),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     // start listening for window disposing
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index 4cfa131ae101..fdf245f826e2 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -71,7 +71,7 @@ namespace framework
     {
         struct LoadRecentFile
         {
-            rtl::OUString                                                             aTargetURL;
+            OUString                                                             aTargetURL;
             com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >     aArgSeq;
         };
 
@@ -126,15 +126,15 @@ namespace framework
 
         void loadImage( const ResId& i_rId, PushButton& i_rButton );
 
-        void layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, const std::set<rtl::OUString>& i_rURLS,
+        void layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, const std::set<OUString>& i_rURLS,
                            SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod,
                            PushButton& i_rBtn,
                            MnemonicGenerator& i_rMnemonicGen,
                            const String& i_rStr = String()
                            );
 
-        void dispatchURL( const rtl::OUString& i_rURL,
-                          const rtl::OUString& i_rTarget = rtl::OUString( "_default" ),
+        void dispatchURL( const OUString& i_rURL,
+                          const OUString& i_rTarget = OUString( "_default" ),
                           const com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >& i_xProv = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >(),
                           const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& = com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >()
                           );
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 628730fed95a..b46b5c8fff3f 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -155,8 +155,8 @@ DEFINE_INIT_SERVICE                     (   Desktop,
                                                 InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider );
                                                 m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
 
-                                                ::rtl::OUStringBuffer sUntitledPrefix (256);
-                                                sUntitledPrefix.append      (::rtl::OUString( String( FwkResId( STR_UNTITLED_DOCUMENT ))));
+                                                OUStringBuffer sUntitledPrefix (256);
+                                                sUntitledPrefix.append      (OUString( String( FwkResId( STR_UNTITLED_DOCUMENT ))));
                                                 sUntitledPrefix.appendAscii (" ");
 
                                                 ::comphelper::NumberedCollection* pNumbers = new ::comphelper::NumberedCollection ();
@@ -431,7 +431,7 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra
     css::uno::Reference< css::lang::XServiceInfo > xInfo( xListener, css::uno::UNO_QUERY );
     if ( xInfo.is() )
     {
-        ::rtl::OUString sImplementationName = xInfo->getImplementationName();
+        OUString sImplementationName = xInfo->getImplementationName();
 
         // SYCNHRONIZED ->
         WriteGuard aWriteLock( m_aLock );
@@ -474,7 +474,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::
     css::uno::Reference< css::lang::XServiceInfo > xInfo( xListener, css::uno::UNO_QUERY );
     if ( xInfo.is() )
     {
-        ::rtl::OUString sImplementationName = xInfo->getImplementationName();
+        OUString sImplementationName = xInfo->getImplementationName();
 
         // SYCNHRONIZED ->
         WriteGuard aWriteLock( m_aLock );
@@ -630,8 +630,8 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th
     @onerror    We return a null reference.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const ::rtl::OUString&                                 sURL            ,
-                                                                                     const ::rtl::OUString&                                 sTargetFrameName,
+css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const OUString&                                 sURL            ,
+                                                                                     const OUString&                                 sTargetFrameName,
                                                                                            sal_Int32                                        nSearchFlags    ,
                                                                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments      ) throw(    css::io::IOException                ,
                                                                                                                                                                         css::lang::IllegalArgumentException ,
@@ -722,7 +722,7 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw
     @threadsafe yes
 *//*-*************************************************************************************************************/
 css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( const css::util::URL&  aURL             ,
-                                                                              const ::rtl::OUString& sTargetFrameName ,
+                                                                              const OUString& sTargetFrameName ,
                                                                                     sal_Int32        nSearchFlags     ) throw( css::uno::RuntimeException )
 {
     const char UNO_PROTOCOL[] = ".uno:";
@@ -899,7 +899,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator(
 }
 
 //*****************************************************************************************************************
-::rtl::OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException )
+OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException )
 {
     /* SAFE { */
     ReadGuard aReadLock( m_aLock );
@@ -908,7 +908,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator(
 }
 
 //*****************************************************************************************************************
-void SAL_CALL Desktop::setName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException )
+void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException )
 {
     /* SAFE { */
     WriteGuard aWriteLock( m_aLock );
@@ -1008,7 +1008,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css
     @onerror    A null reference is returned.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::rtl::OUString& sTargetFrameName ,
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUString& sTargetFrameName ,
                                                                              sal_Int32        nSearchFlags     ) throw( css::uno::RuntimeException )
 {
     css::uno::Reference< css::frame::XFrame > xTarget;
@@ -1089,7 +1089,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r
         // get threadsafe some necessary member which are neccessary for following functionality
         /* SAFE { */
         aReadLock.lock();
-        ::rtl::OUString sOwnName = m_sName;
+        OUString sOwnName = m_sName;
         aReadLock.unlock();
         /* } SAFE */
 
@@ -1461,7 +1461,7 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css
 }
 
 //-----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL Desktop::getUntitledPrefix()
+OUString SAL_CALL Desktop::getUntitledPrefix()
     throw (css::uno::RuntimeException)
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1780,7 +1780,7 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty
         css::beans::Property( DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, ::getCppuType((const css::uno::Reference< css::frame::XDispatchRecorderSupplier >*)NULL), css::beans::PropertyAttribute::TRANSIENT ),
         css::beans::Property( DESKTOP_PROPNAME_ISPLUGGED                , DESKTOP_PROPHANDLE_ISPLUGGED               , ::getBooleanCppuType()                                                                  , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ),
         css::beans::Property( DESKTOP_PROPNAME_SUSPENDQUICKSTARTVETO    , DESKTOP_PROPHANDLE_SUSPENDQUICKSTARTVETO   , ::getBooleanCppuType()                                                                  , css::beans::PropertyAttribute::TRANSIENT ),
-        css::beans::Property( DESKTOP_PROPNAME_TITLE                    , DESKTOP_PROPHANDLE_TITLE                   , ::getCppuType((const ::rtl::OUString*)NULL)                                             , css::beans::PropertyAttribute::TRANSIENT ),
+        css::beans::Property( DESKTOP_PROPNAME_TITLE                    , DESKTOP_PROPHANDLE_TITLE                   , ::getCppuType((const OUString*)NULL)                                             , css::beans::PropertyAttribute::TRANSIENT ),
     };
     // Use it to initialize sequence!
     const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, DESKTOP_PROPCOUNT );
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 86565ee1383f..40adc0695f5e 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -84,8 +84,8 @@ DispatchHelper::~DispatchHelper()
  */
 css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
                                 const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider ,
-                                const ::rtl::OUString&                                      sURL              ,
-                                const ::rtl::OUString&                                      sTargetFrameName  ,
+                                const OUString&                                      sURL              ,
+                                const OUString&                                      sTargetFrameName  ,
                                       sal_Int32                                             nSearchFlags      ,
                                 const css::uno::Sequence< css::beans::PropertyValue >&      lArguments        )
     throw(css::uno::RuntimeException)
@@ -120,7 +120,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
     css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments );
     sal_Int32 nLength = lArguments.getLength();
     aArguments.realloc( nLength + 1 );
-    aArguments[ nLength ].Name = ::rtl::OUString("SynchronMode");
+    aArguments[ nLength ].Name = OUString("SynchronMode");
     aArguments[ nLength ].Value <<= (sal_Bool) sal_True;
 
     css::uno::Any aResult;
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index e33e93d5af46..6c6a32aeec67 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -302,8 +302,8 @@ Frame::~Frame()
     @onerror    We return a null reference.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromURL( const ::rtl::OUString&                                 sURL            ,
-                                                                                   const ::rtl::OUString&                                 sTargetFrameName,
+css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromURL( const OUString&                                 sURL            ,
+                                                                                   const OUString&                                 sTargetFrameName,
                                                                                          sal_Int32                                        nSearchFlags    ,
                                                                                    const css::uno::Sequence< css::beans::PropertyValue >& lArguments      ) throw( css::io::IOException                ,
                                                                                                                                                                    css::lang::IllegalArgumentException ,
@@ -524,7 +524,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     if (!xWindow.is())
         throw css::uno::RuntimeException(
-                    ::rtl::OUString("Frame::initialize() called without a valid container window reference."),
+                    OUString("Frame::initialize() called without a valid container window reference."),
                     static_cast< css::frame::XFrame* >(this));
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -532,7 +532,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
 
     if ( m_xContainerWindow.is() )
         throw css::uno::RuntimeException(
-                ::rtl::OUString("Frame::initialized() is called more then once, which isnt useful nor allowed."),
+                OUString("Frame::initialized() is called more then once, which isnt useful nor allowed."),
                 static_cast< css::frame::XFrame* >(this));
 
     // Look for rejected calls first!
@@ -679,7 +679,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
 
     @onerror    An empty string is returned.
 *//*-*****************************************************************************************************/
-::rtl::OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException )
+OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException )
 {
     /* SAFE { */
     ReadGuard aReadLock( m_aLock );
@@ -701,7 +701,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
 
     @onerror    We do nothing.
 *//*-*****************************************************************************************************/
-void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException )
+void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeException )
 {
     /* SAFE { */
     WriteGuard aWriteLock( m_aLock );
@@ -738,7 +738,7 @@ void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::Ru
     @return     A reference to found or may be new created frame.
     @threadsafe yes
 *//*-*****************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl::OUString&  sTargetFrameName,
+css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString&  sTargetFrameName,
                                                                            sal_Int32         nSearchFlags    ) throw( css::uno::RuntimeException )
 {
     css::uno::Reference< css::frame::XFrame > xTarget;
@@ -858,7 +858,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
         // get threadsafe some necessary member which are neccessary for following functionality
         /* SAFE { */
         aReadLock.lock();
-        ::rtl::OUString sOwnName = m_sName;
+        OUString sOwnName = m_sName;
         aReadLock.unlock();
         /* } SAFE */
 
@@ -1676,7 +1676,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::
 }
 
 //*****************************************************************************************************************
-::rtl::OUString SAL_CALL Frame::getTitle()
+OUString SAL_CALL Frame::getTitle()
     throw (css::uno::RuntimeException)
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1691,7 +1691,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::
 }
 
 //*****************************************************************************************************************
-void SAL_CALL Frame::setTitle( const ::rtl::OUString& sTitle )
+void SAL_CALL Frame::setTitle( const OUString& sTitle )
     throw (css::uno::RuntimeException)
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1903,7 +1903,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException )
     // If may be later somewhere change the disposed-behaviour of this implementation
     // and doesn't throw any DisposedExceptions we must guarantee best matching default values ...
     m_eActiveState       = E_INACTIVE;
-    m_sName              = ::rtl::OUString();
+    m_sName              = OUString();
     m_bIsFrameTop        = sal_False;
     m_bConnected         = sal_False;
     m_nExternalLockCount = 0;
@@ -2017,7 +2017,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI
     @onerror    A null reference is returned.
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL&   aURL            ,
-                                                                            const ::rtl::OUString&  sTargetFrameName,
+                                                                            const OUString&  sTargetFrameName,
                                                                                   sal_Int32         nSearchFlags    ) throw( css::uno::RuntimeException )
 {
     const char UNO_PROTOCOL[] = ".uno:";
@@ -2544,12 +2544,12 @@ void Frame::impl_initializePropInfo()
         css::beans::Property(
             FRAME_PROPNAME_TITLE,
             FRAME_PROPHANDLE_TITLE,
-            ::getCppuType((const ::rtl::OUString*)NULL),
+            ::getCppuType((const OUString*)NULL),
             css::beans::PropertyAttribute::TRANSIENT));
 }
 
 //*****************************************************************************************************************
-void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
+void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/,
                                                  sal_Int32        nHandle  ,
                                            const css::uno::Any&   aValue   )
 
@@ -2567,7 +2567,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
     {
         case FRAME_PROPHANDLE_TITLE :
                 {
-                    ::rtl::OUString sExternalTitle;
+                    OUString sExternalTitle;
                     aValue >>= sExternalTitle;
                     setTitle (sExternalTitle);
                 }
@@ -2611,7 +2611,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
 }
 
 //*****************************************************************************************************************
-css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const ::rtl::OUString& /*sProperty*/,
+css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*/,
                                                           sal_Int32        nHandle  )
 {
     /* There is no need to lock any mutex here. Because we share the
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 56f6ac4c4b67..689917006e03 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -136,9 +136,9 @@ static DateTime _oslDateTimeToDateTime(const oslDateTime& aDateTime)
         Time(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds));
 }
 
-static ::rtl::OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
+static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
 {
-    ::rtl::OStringBuffer aDateTimeString;
+    OStringBuffer aDateTimeString;
     aDateTimeString.append((sal_Int32)aDateTime.GetYear());
     aDateTimeString.append("-");
     if (aDateTime.GetMonth()<10) aDateTimeString.append("0");
@@ -160,12 +160,12 @@ static ::rtl::OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool
     return OStringToOUString(aDateTimeString.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
 }
 
-static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTime)
+static sal_Bool _parseDateTime(const OUString& aString, DateTime& aDateTime)
 {
     // take apart a canonical literal xsd:dateTime string
     //CCYY-MM-DDThh:mm:ss(Z)
 
-    ::rtl::OUString aDateTimeString = aString.trim();
+    OUString aDateTimeString = aString.trim();
 
     // check length
     if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20)
@@ -174,10 +174,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
     sal_Int32 nDateLength = 10;
     sal_Int32 nTimeLength = 8;
 
-    ::rtl::OUString aUTCString("Z");
+    OUString aUTCString("Z");
 
-    ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
-    ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
+    OUString aDateString = aDateTimeString.copy(0, nDateLength);
+    OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
 
     sal_Int32 nIndex = 0;
     sal_Int32 nYear = aDateString.getToken(0, '-', nIndex).toInt32();
@@ -198,7 +198,7 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
     return sal_True;
 }
 
-static ::rtl::OUString _getCurrentDateString()
+static OUString _getCurrentDateString()
 {
     return _makeDateTimeString(DateTime( DateTime::SYSTEM));
 }
@@ -212,7 +212,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
 
     try
     {
-        ::rtl::OUString aBaseInstallPath;
+        OUString aBaseInstallPath;
         Bootstrap::PathStatus aBaseLocateResult =
             Bootstrap::locateBaseInstallation(aBaseInstallPath);
         if (aBaseLocateResult != Bootstrap::PATH_EXISTS)
@@ -224,40 +224,40 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
         // determine the filename of the license to show
         OUString aLangString( Application::GetSettings().GetUILanguageTag().getBcp47());
 #if defined(WNT)
-        ::rtl::OUString aLicensePath =
-            aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
-            + ::rtl::OUString::createFromAscii(szWNTLicenseName)
-            + ::rtl::OUString("_")
+        OUString aLicensePath =
+            aBaseInstallPath + OUString::createFromAscii(szLicensePath)
+            + OUString::createFromAscii(szWNTLicenseName)
+            + OUString("_")
             + aLangString
-            + ::rtl::OUString::createFromAscii(szWNTLicenseExt);
+            + OUString::createFromAscii(szWNTLicenseExt);
 #else
-        ::rtl::OUString aLicensePath =
-            aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
-            + ::rtl::OUString::createFromAscii(szUNXLicenseName)
-            + ::rtl::OUString("_")
+        OUString aLicensePath =
+            aBaseInstallPath + OUString::createFromAscii(szLicensePath)
+            + OUString::createFromAscii(szUNXLicenseName)
+            + OUString("_")
             + aLangString
-            + ::rtl::OUString::createFromAscii(szUNXLicenseExt);
+            + OUString::createFromAscii(szUNXLicenseExt);
 #endif
         // check if we need to show the license at all
         // open org.openoffice.Setup/Office/ooLicenseAcceptDate
-        ::rtl::OUString sAccessSrvc("com.sun.star.configuration.ConfigurationUpdateAccess");
+        OUString sAccessSrvc("com.sun.star.configuration.ConfigurationUpdateAccess");
 
         // get configuration provider
         Reference< XMultiServiceFactory > theConfigProvider = theDefaultProvider::get( m_xContext );
         Sequence< Any > theArgs(1);
         NamedValue v;
-        v.Name = ::rtl::OUString("NodePath");
-        v.Value <<= ::rtl::OUString("org.openoffice.Setup/Office");
+        v.Name = OUString("NodePath");
+        v.Value <<= OUString("org.openoffice.Setup/Office");
         theArgs[0] <<= v;
         Reference< XPropertySet > pset = Reference< XPropertySet >(
             theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
 
         // if we find a date there, compare it to baseinstall license date
-        ::rtl::OUString aAcceptDate;
-        if (pset->getPropertyValue(::rtl::OUString("ooLicenseAcceptDate")) >>= aAcceptDate)
+        OUString aAcceptDate;
+        if (pset->getPropertyValue(OUString("ooLicenseAcceptDate")) >>= aAcceptDate)
         {
             // get LicenseFileDate from base install
-            ::rtl::OUString aLicenseURL = aLicensePath;
+            OUString aLicenseURL = aLicensePath;
             DirectoryItem aDirItem;
             if (DirectoryItem::get(aLicenseURL, aDirItem) != FileBase::E_None)
                 return makeAny(sal_False);
@@ -289,7 +289,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
 
             // write org.openoffice.Setup/ooLicenseAcceptDate
             aAcceptDate = _getCurrentDateString();
-            pset->setPropertyValue(::rtl::OUString("ooLicenseAcceptDate"), makeAny(aAcceptDate));
+            pset->setPropertyValue(OUString("ooLicenseAcceptDate"), makeAny(aAcceptDate));
             Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
 
             // enable quickstarter
@@ -340,7 +340,7 @@ void SAL_CALL License::removeCloseListener(const css::uno::Reference< css::util:
 //   License Dialog
 //************************************************************************
 
-LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResMgr) :
+LicenseDialog::LicenseDialog(const OUString & aLicensePath, ResMgr *pResMgr) :
     ModalDialog(NULL, ResId(DLG_LICENSE, *pResMgr)),
     aLicenseML(this, ResId(ML_LICENSE, *pResMgr)),
     aInfo1FT(this, ResId(FT_INFO1, *pResMgr)),
@@ -372,7 +372,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
     aPBPageDown.SetStyle( aStyle );
 
     String aText = aInfo2FT.GetText();
-    aText.SearchAndReplaceAll( rtl::OUString("%PAGEDOWN"), aPBPageDown.GetText() );
+    aText.SearchAndReplaceAll( OUString("%PAGEDOWN"), aPBPageDown.GetText() );
     aInfo2FT.SetText( aText );
 
     aPBDecline.SetText( aStrNotAccept );
@@ -397,7 +397,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
         {
             nPosition += nBytesRead;
         }
-        ::rtl::OUString aLicenseString(pBuffer, nBytes, RTL_TEXTENCODING_UTF8,
+        OUString aLicenseString(pBuffer, nBytes, RTL_TEXTENCODING_UTF8,
                 OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE);
         delete[] pBuffer;
         aLicenseML.SetText(aLicenseString);
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 6a8a8c147d75..b057f2ceafd1 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(
         OUString& rUrl = rSeq[i];
         INetContentType eType = INetContentTypes::GetContentTypeFromURL( rUrl );
 
-        rtl::OUString aType( INetContentTypes::GetContentType( eType ) );
+        OUString aType( INetContentTypes::GetContentType( eType ) );
         if (!aType.isEmpty())
         {
             rUrl = aType;
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 6afad5741284..6c18d13627c6 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -42,7 +42,7 @@ namespace framework
 static const char CFGPATH_FACTORIES[] = "/org.openoffice.Setup/Office/Factories";
 static const char MODULEPROP_IDENTIFIER[] = "ooSetupFactoryModuleIdentifier";
 
-rtl::OUString ModuleManager::impl_getStaticImplementationName() {
+OUString ModuleManager::impl_getStaticImplementationName() {
     return IMPLEMENTATIONNAME_MODULEMANAGER;
 }
 
@@ -55,9 +55,9 @@ ModuleManager::impl_createFactory(
         impl_getSupportedServiceNames());
 }
 
-css::uno::Sequence< rtl::OUString >
+css::uno::Sequence< OUString >
 ModuleManager::impl_getSupportedServiceNames() {
-    css::uno::Sequence< rtl::OUString > s(1);
+    css::uno::Sequence< OUString > s(1);
     s[0] = "com.sun.star.frame.ModuleManager";
     return s;
 }
@@ -80,16 +80,16 @@ ModuleManager::~ModuleManager()
         m_xCFG.clear();
 }
 
-rtl::OUString ModuleManager::getImplementationName()
+OUString ModuleManager::getImplementationName()
     throw (css::uno::RuntimeException)
 {
     return impl_getStaticImplementationName();
 }
 
-sal_Bool ModuleManager::supportsService(rtl::OUString const & ServiceName)
+sal_Bool ModuleManager::supportsService(OUString const & ServiceName)
     throw (css::uno::RuntimeException)
 {
-    css::uno::Sequence< rtl::OUString > s(getSupportedServiceNames());
+    css::uno::Sequence< OUString > s(getSupportedServiceNames());
     for (sal_Int32 i = 0; i != s.getLength(); ++i) {
         if (s[i] == ServiceName) {
             return true;
@@ -98,13 +98,13 @@ sal_Bool ModuleManager::supportsService(rtl::OUString const & ServiceName)
     return false;
 }
 
-css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
+css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames()
     throw (css::uno::RuntimeException)
 {
     return impl_getSupportedServiceNames();
 }
 
-::rtl::OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule)
+OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule)
     throw(css::lang::IllegalArgumentException,
           css::frame::UnknownModuleException,
           css::uno::RuntimeException         )
@@ -123,7 +123,7 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
        )
     {
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString("Given module is not a frame nor a window, controller or model."),
+                OUString("Given module is not a frame nor a window, controller or model."),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
     }
@@ -141,7 +141,7 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
     // No fallbacks to higher components are allowed !
     // Note : A frame provides access to module components only ... but it's not a module by himself.
 
-    ::rtl::OUString sModule;
+    OUString sModule;
     if (xModel.is())
         sModule = implts_identify(xModel);
     else if (xController.is())
@@ -151,13 +151,13 @@ css::uno::Sequence< rtl::OUString > ModuleManager::getSupportedServiceNames()
 
     if (sModule.isEmpty())
         throw css::frame::UnknownModuleException(
-                ::rtl::OUString("Cant find suitable module for the given component."),
+                OUString("Cant find suitable module for the given component."),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     return sModule;
 }
 
-void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
+void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
                                            const css::uno::Any&   aValue)
     throw (css::lang::IllegalArgumentException   ,
            css::container::NoSuchElementException,
@@ -168,7 +168,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     if (lProps.empty() )
     {
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString("No properties given to replace part of module."),
+                OUString("No properties given to replace part of module."),
                 static_cast< cppu::OWeakObject * >(this),
                 2);
     }
@@ -186,7 +186,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     // we can close it without a flush ... and our read data wont be affected .-)
     css::uno::Reference< css::uno::XInterface >         xCfg      = ::comphelper::ConfigurationHelper::openConfig(
                                                                         comphelper::getComponentContext(xSMGR),
-                                                                        rtl::OUString(CFGPATH_FACTORIES),
+                                                                        OUString(CFGPATH_FACTORIES),
                                                                         ::comphelper::ConfigurationHelper::E_STANDARD);
     css::uno::Reference< css::container::XNameAccess >  xModules (xCfg, css::uno::UNO_QUERY_THROW);
     css::uno::Reference< css::container::XNameReplace > xModule  ;
@@ -195,7 +195,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     if (!xModule.is())
     {
         throw css::uno::RuntimeException(
-                ::rtl::OUString("Was not able to get write access to the requested module entry inside configuration."),
+                OUString("Was not able to get write access to the requested module entry inside configuration."),
                 static_cast< cppu::OWeakObject * >(this));
     }
 
@@ -204,7 +204,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
            pProp != lProps.end()  ;
          ++pProp                  )
     {
-        const ::rtl::OUString& sPropName  = pProp->first;
+        const OUString& sPropName  = pProp->first;
         const css::uno::Any&   aPropValue = pProp->second;
 
         // let "NoSuchElementException" out ! We support the same API ...
@@ -215,7 +215,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     ::comphelper::ConfigurationHelper::flush(xCfg);
 }
 
-css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
+css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
     throw(css::container::NoSuchElementException,
           css::lang::WrappedTargetException     ,
           css::uno::RuntimeException            )
@@ -227,34 +227,34 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
     if (!xModule.is())
     {
         throw css::uno::RuntimeException(
-                ::rtl::OUString("Was not able to get write access to the requested module entry inside configuration."),
+                OUString("Was not able to get write access to the requested module entry inside configuration."),
                 static_cast< cppu::OWeakObject * >(this));
     }
 
     // convert it to seq< PropertyValue >
-    const css::uno::Sequence< ::rtl::OUString > lPropNames = xModule->getElementNames();
+    const css::uno::Sequence< OUString > lPropNames = xModule->getElementNames();
           ::comphelper::SequenceAsHashMap       lProps     ;
           sal_Int32                             c          = lPropNames.getLength();
           sal_Int32                             i          = 0;
 
-    lProps[rtl::OUString(MODULEPROP_IDENTIFIER)] <<= sName;
+    lProps[OUString(MODULEPROP_IDENTIFIER)] <<= sName;
     for (i=0; i<c; ++i)
     {
-        const ::rtl::OUString& sPropName         = lPropNames[i];
+        const OUString& sPropName         = lPropNames[i];
                                lProps[sPropName] = xModule->getByName(sPropName);
     }
 
     return css::uno::makeAny(lProps.getAsConstPropertyValueList());
 }
 
-css::uno::Sequence< ::rtl::OUString > SAL_CALL ModuleManager::getElementNames()
+css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames()
     throw(css::uno::RuntimeException)
 {
     css::uno::Reference< css::container::XNameAccess > xCFG = implts_getConfig();
     return xCFG->getElementNames();
 }
 
-sal_Bool SAL_CALL ModuleManager::hasByName(const ::rtl::OUString& sName)
+sal_Bool SAL_CALL ModuleManager::hasByName(const OUString& sName)
     throw(css::uno::RuntimeException)
 {
     css::uno::Reference< css::container::XNameAccess > xCFG = implts_getConfig();
@@ -274,7 +274,7 @@ sal_Bool SAL_CALL ModuleManager::hasElements()
     return xCFG->hasElements();
 }
 
-css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const ::rtl::OUString&)
+css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const OUString&)
     throw(css::uno::RuntimeException)
 {
     return css::uno::Reference< css::container::XEnumeration >();
@@ -284,7 +284,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea
     throw(css::uno::RuntimeException)
 {
     ::comphelper::SequenceAsHashMap                 lSearchProps (lProperties);
-    css::uno::Sequence< ::rtl::OUString >           lModules     = getElementNames();
+    css::uno::Sequence< OUString >           lModules     = getElementNames();
     sal_Int32                                       c            = lModules.getLength();
     sal_Int32                                       i            = 0;
     ::comphelper::SequenceAsVector< css::uno::Any > lResult      ;
@@ -293,7 +293,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea
     {
         try
         {
-            const ::rtl::OUString&                sModule      = lModules[i];
+            const OUString&                sModule      = lModules[i];
                   ::comphelper::SequenceAsHashMap lModuleProps = getByName(sModule);
 
             if (lModuleProps.match(lSearchProps))
@@ -325,7 +325,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
     {
         xCfg = ::comphelper::ConfigurationHelper::openConfig(
                     comphelper::getComponentContext(xSMGR),
-                    rtl::OUString(CFGPATH_FACTORIES),
+                    OUString(CFGPATH_FACTORIES),
                     ::comphelper::ConfigurationHelper::E_READONLY);
     }
     catch(const css::uno::RuntimeException&)
@@ -344,7 +344,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
     // <- SAFE ----------------------------------
 }
 
-::rtl::OUString ModuleManager::implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent)
+OUString ModuleManager::implts_identify(const css::uno::Reference< css::uno::XInterface >& xComponent)
 {
     // Search for an optional (!) interface XModule first.
     // Its used to overrule an existing service name. Used e.g. by our database form designer
@@ -357,10 +357,10 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
     // comparing service names with configured entries ...
     css::uno::Reference< css::lang::XServiceInfo > xInfo(xComponent, css::uno::UNO_QUERY);
     if (!xInfo.is())
-        return ::rtl::OUString();
+        return OUString();
 
-    const css::uno::Sequence< ::rtl::OUString > lKnownModules = getElementNames();
-    const ::rtl::OUString*                      pKnownModules = lKnownModules.getConstArray();
+    const css::uno::Sequence< OUString > lKnownModules = getElementNames();
+    const OUString*                      pKnownModules = lKnownModules.getConstArray();
           sal_Int32                             c             = lKnownModules.getLength();
           sal_Int32                             i             = 0;
 
@@ -370,7 +370,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf
             return pKnownModules[i];
     }
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 } // namespace framework
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index df938341f5c8..98ab2c0e705f 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -63,8 +63,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
-using ::rtl::OUString;
-using ::rtl::OString;
 
 namespace framework{
 
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 87ad8b5b87a3..2592bcc94445 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -286,14 +286,14 @@ void TabWindowService::impl_initializePropInfo()
 
     impl_addPropertyInfo(
         css::beans::Property(
-            rtl::OUString("Window"),
+            OUString("Window"),
             TABWINDOWSERVICE_PROPHANDLE_WINDOW,
             ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL),
             css::beans::PropertyAttribute::TRANSIENT));
 }
 
 //*****************************************************************************************************************
-void SAL_CALL TabWindowService::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
+void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sProperty*/,
                                                               sal_Int32        /*nHandle  */,
                                                         const css::uno::Any&   /*aValue   */)
 
@@ -301,7 +301,7 @@ void SAL_CALL TabWindowService::impl_setPropertyValue(const ::rtl::OUString& /*s
 }
 
 //*****************************************************************************************************************
-css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const ::rtl::OUString& /*sProperty*/,
+css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& /*sProperty*/,
                                                                        sal_Int32        nHandle      )
 {
     /* There is no need to lock any mutex here. Because we share the
@@ -404,7 +404,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID)
        )
     {
         throw css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString("Tab index out of bounds."),
+                OUString("Tab index out of bounds."),
                 css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
     }
 }
@@ -418,7 +418,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID
     TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID);
     if (pIt == m_lTabPageInfos.end ())
         throw css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString("Tab index out of bounds."),
+                OUString("Tab index out of bounds."),
                 css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
     return pIt;
 }
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 6c0e37ca0525..ec25e42ffe73 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -50,9 +50,9 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex
 }
 
 // ::com::sun::star::util::XStringAbbreviation:
-::rtl::OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const ::rtl::OUString & aString) throw (css::uno::RuntimeException)
+OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException)
 {
-    ::rtl::OUString aResult( aString );
+    OUString aResult( aString );
     if ( xStringWidth.is() )
     {
         // Use INetURLObject to abbreviate URLs
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 99b2af7fe7e9..13cdf557ee97 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -83,7 +83,7 @@ namespace
             // Don't add last segment as it is the name!
             --nCount;
 
-            rtl::OUStringBuffer aPath;
+            OUStringBuffer aPath;
             for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
             {
                 aPath.append( sal_Unicode( '/' ));
@@ -111,8 +111,8 @@ namespace
         if ( _bUseIntern )
             _rURL.Complete   = _rURL.Complete.intern();
 
-        _rParser.SetMark    ( ::rtl::OUString() );
-        _rParser.SetParam( ::rtl::OUString() );
+        _rParser.SetMark    ( OUString() );
+        _rParser.SetParam( OUString() );
 
         _rURL.Main       = _rParser.GetMainURL( INetURLObject::NO_DECODE           );
     }
@@ -130,7 +130,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti
     }
     // Try to extract the protocol
     sal_Int32 nURLIndex = aURL.Complete.indexOf( sal_Unicode( ':' ));
-    ::rtl::OUString aProtocol;
+    OUString aProtocol;
     if ( nURLIndex > 1 )
     {
         aProtocol = aURL.Complete.copy( 0, nURLIndex+1 );
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti
 //  XURLTransformer
 //*****************************************************************************************************************
 sal_Bool SAL_CALL URLTransformer::parseSmart(           URL&        aURL            ,
-                                                const   ::rtl::OUString&    sSmartProtocol  ) throw( RuntimeException )
+                                                const   OUString&    sSmartProtocol  ) throw( RuntimeException )
 {
     // Safe impossible cases.
     if  (( &aURL                            ==  NULL    ) ||
@@ -202,7 +202,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart(           URL&        aURL
         {
             // Try to extract the protocol
             sal_Int32 nIndex = aURL.Complete.indexOf( sal_Unicode( ':' ));
-            ::rtl::OUString aProtocol;
+            OUString aProtocol;
             if ( nIndex > 1 )
             {
                 aProtocol = aURL.Complete.copy( 0, nIndex+1 );
@@ -240,7 +240,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
 
     if ( INetURLObject::CompareProtocolScheme( aURL.Protocol ) != INET_PROT_NOT_VALID )
     {
-        ::rtl::OUStringBuffer aCompletePath( aURL.Path );
+        OUStringBuffer aCompletePath( aURL.Path );
 
         // Concat the name if it is provided, just support a final slash
         if ( !aURL.Name.isEmpty() )
@@ -279,7 +279,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
     else if ( !aURL.Protocol.isEmpty() )
     {
         // Minimal support for unknown protocols
-        ::rtl::OUStringBuffer aBuffer( aURL.Protocol );
+        OUStringBuffer aBuffer( aURL.Protocol );
         aBuffer.append( aURL.Path );
         aURL.Complete   = aBuffer.makeStringAndClear();
         aURL.Main       = aURL.Complete;
@@ -292,7 +292,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
 //*****************************************************************************************************************
 //  XURLTransformer
 //*****************************************************************************************************************
-::rtl::OUString SAL_CALL URLTransformer::getPresentation(   const   URL&        aURL            ,
+OUString SAL_CALL URLTransformer::getPresentation(   const   URL&        aURL            ,
                                                             sal_Bool    bWithPassword   ) throw( RuntimeException )
 {
     // Safe impossible cases.
@@ -301,7 +301,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
             (( bWithPassword            !=  sal_True    )   &&
              ( bWithPassword            !=  sal_False   )       ) )
     {
-        return ::rtl::OUString();
+        return OUString();
     }
 
     // Check given URL
@@ -312,18 +312,18 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
         if ( !bWithPassword && !aTestURL.Password.isEmpty() )
         {
             // Exchange password text with other placeholder string
-            aTestURL.Password = ::rtl::OUString("<******>");
+            aTestURL.Password = OUString("<******>");
             assemble( aTestURL );
         }
 
         // Convert internal URLs to "praesentation"-URLs!
-        rtl::OUString sPraesentationURL;
+        OUString sPraesentationURL;
         INetURLObject::translateToExternal( aTestURL.Complete, sPraesentationURL, INetURLObject::DECODE_UNAMBIGUOUS );
 
         return sPraesentationURL;
     }
     else
-        return ::rtl::OUString();
+        return OUString();
 }
 
 //_________________________________________________________________________________________________________________