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

15 files changed, 91 insertions, 91 deletions

diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 4e7d2c4e2e5a..dbaf0fdafc51 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -63,7 +63,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
             keys -> commands
         */
         typedef ::boost::unordered_map< css::awt::KeyEvent ,
-                                 ::rtl::OUString    ,
+                                 OUString    ,
                                  KeyEventHashCode   ,
                                  KeyEventEqualsFunc > TKey2Commands;
 
@@ -123,7 +123,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
                     sal_True if the speicfied key exists inside this container.
          */
         virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const;
-        virtual sal_Bool hasCommand(const ::rtl::OUString& sCommand) const;
+        virtual sal_Bool hasCommand(const OUString& sCommand) const;
 
         //---------------------------------------
         /** TODO document me */
@@ -140,7 +140,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
                     describe the command.
           */
         virtual void setKeyCommandPair(const css::awt::KeyEvent& aKey    ,
-                                       const ::rtl::OUString&    sCommand);
+                                       const OUString&    sCommand);
 
         //---------------------------------------
         /** @short  returns the list of keys, which are registered
@@ -152,16 +152,16 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
             @return [TKeyList]
                     the list of registered keys. Can be empty!
           */
-        virtual TKeyList getKeysByCommand(const ::rtl::OUString& sCommand) const;
+        virtual TKeyList getKeysByCommand(const OUString& sCommand) const;
 
         //---------------------------------------
         /** TODO */
-        virtual ::rtl::OUString getCommandByKey(const css::awt::KeyEvent& aKey) const;
+        virtual OUString getCommandByKey(const css::awt::KeyEvent& aKey) const;
 
         //---------------------------------------
         /** TODO */
         virtual void removeKey(const css::awt::KeyEvent& aKey);
-        virtual void removeCommand(const ::rtl::OUString& sCommand);
+        virtual void removeCommand(const OUString& sCommand);
 };
 
 } // namespace framework
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index a918a4627700..2d71deb8d92e 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -124,12 +124,12 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
         virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
             throw(css::uno::RuntimeException);
 
-        virtual ::rtl::OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
+        virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
             throw(css::container::NoSuchElementException,
             css::uno::RuntimeException            );
 
         virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
-            const ::rtl::OUString&    sCommand )
+            const OUString&    sCommand )
             throw(css::lang::IllegalArgumentException,
             css::uno::RuntimeException         );
 
@@ -137,16 +137,16 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
             throw(css::container::NoSuchElementException,
             css::uno::RuntimeException            );
 
-        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const ::rtl::OUString& sCommand)
+        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
             throw(css::lang::IllegalArgumentException   ,
             css::container::NoSuchElementException,
             css::uno::RuntimeException            );
 
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList)
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
             throw(css::lang::IllegalArgumentException   ,
             css::uno::RuntimeException            );
 
-        virtual void SAL_CALL removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand)
+        virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
             throw(css::lang::IllegalArgumentException   ,
             css::container::NoSuchElementException,
             css::uno::RuntimeException            );
@@ -196,7 +196,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
             throw(css::uno::RuntimeException);
 
         // IStorageListener
-        virtual void changesOccurred(const ::rtl::OUString& sPath);
+        virtual void changesOccurred(const OUString& sPath);
 
         //______________________________________
         // helper for derived classes
@@ -260,7 +260,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
         Depends from the parameter bWriteable!
         */
         css::uno::Reference< css::uno::XInterface > impl_ts_openSubStorage(const css::uno::Reference< css::embed::XStorage >& xRootStorage,
-            const ::rtl::OUString&                             sSubStorage ,
+            const OUString&                             sSubStorage ,
             sal_Bool                                     bOutStream  );
 
         //---------------------------------------
@@ -311,8 +311,8 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
         AcceleratorCache* m_pPrimaryWriteCache;
         AcceleratorCache* m_pSecondaryWriteCache;
 
-        ::rtl::OUString m_sGlobalOrModules;
-        ::rtl::OUString m_sModuleCFG;
+        OUString m_sGlobalOrModules;
+        OUString m_sModuleCFG;
 
         ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
 
@@ -337,12 +337,12 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
         virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
             throw(css::uno::RuntimeException);
 
-        virtual ::rtl::OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
+        virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
             throw(css::container::NoSuchElementException,
             css::uno::RuntimeException            );
 
         virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
-            const ::rtl::OUString&    sCommand )
+            const OUString&    sCommand )
             throw(css::lang::IllegalArgumentException,
             css::uno::RuntimeException         );
 
@@ -350,16 +350,16 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
             throw(css::container::NoSuchElementException,
             css::uno::RuntimeException            );
 
-        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const ::rtl::OUString& sCommand)
+        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
             throw(css::lang::IllegalArgumentException   ,
             css::container::NoSuchElementException,
             css::uno::RuntimeException            );
 
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList)
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
             throw(css::lang::IllegalArgumentException   ,
             css::uno::RuntimeException            );
 
-        virtual void SAL_CALL removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand)
+        virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
             throw(css::lang::IllegalArgumentException   ,
             css::container::NoSuchElementException,
             css::uno::RuntimeException            );
@@ -440,10 +440,10 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
         void impl_ts_load(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg);
         void impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg);
 
-        void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand, const sal_Bool bPreferred);
+        void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred);
         void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred);
 
-        void reloadChanged(const ::rtl::OUString& sPrimarySecondary, const ::rtl::OUString& sGlobalModules, const ::rtl::OUString& sModule, const ::rtl::OUString& sKey);
+        void reloadChanged(const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey);
         AcceleratorCache& impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested = sal_False);
 
 };
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index d92049c752c8..1068a4c53987 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -75,7 +75,7 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
 
     private:
 
-        ::rtl::OUString m_sLocale;
+        OUString m_sLocale;
 
         /** helper to listen for configuration changes without ownership cycle problems */
         css::uno::Reference< css::util::XChangesListener > m_xCfgListener;
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index e37672497bc5..a6355067185f 100644
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
@@ -40,7 +40,7 @@ class IStorageListener
 
         //--------------------------------------
         /** @short  TODO */
-        virtual void changesOccurred(const ::rtl::OUString& sPath) = 0;
+        virtual void changesOccurred(const OUString& sPath) = 0;
 
     protected:
         ~IStorageListener() {}
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 88122013705d..4563d60bf39a 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -60,7 +60,7 @@ class KeyMapping
         //---------------------------------------
         /** @short  hash structure to map key codes to identifier. */
         typedef ::boost::unordered_map< sal_Int16                    ,
-                                 ::rtl::OUString              ,
+                                 OUString              ,
                                  ShortHashCode                ,
                                  ::std::equal_to< sal_Int16 > > Code2IdentifierHash;
 
@@ -102,7 +102,7 @@ class KeyMapping
                     if the given identifier does not describe
                     a well known key code.
          */
-        virtual sal_uInt16 mapIdentifierToCode(const ::rtl::OUString& sIdentifier)
+        virtual sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier)
             throw(css::lang::IllegalArgumentException);
 
         //----------------------------------
@@ -114,7 +114,7 @@ class KeyMapping
 
             @return The corresponding string identifier.
          */
-        virtual ::rtl::OUString mapCodeToIdentifier(sal_uInt16 nCode);
+        virtual OUString mapCodeToIdentifier(sal_uInt16 nCode);
 
     //______________________________________
     // helper
@@ -136,7 +136,7 @@ class KeyMapping
             @return [boolean]
                     sal_True if convertion was successfully.
           */
-        sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier,
+        sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier,
                                                                 sal_uInt16&      rCode      );
 };
 
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index d7080939ef30..bd7838fdc3be 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -51,8 +51,8 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
         //----------------------------------
         /** identify the application module, where this accelerator
             configuration cache should work on. */
-        ::rtl::OUString m_sModule;
-        ::rtl::OUString m_sLocale;
+        OUString m_sModule;
+        OUString m_sLocale;
 
     //______________________________________
     // interface
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 19853be14932..512ee8be89d7 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -56,13 +56,13 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 
     public:
 
-        static ::rtl::OUString PRESET_DEFAULT();
-        static ::rtl::OUString TARGET_CURRENT();
+        static OUString PRESET_DEFAULT();
+        static OUString TARGET_CURRENT();
 
-        static ::rtl::OUString RESOURCETYPE_MENUBAR();
-        static ::rtl::OUString RESOURCETYPE_TOOLBAR();
-        static ::rtl::OUString RESOURCETYPE_ACCELERATOR();
-        static ::rtl::OUString RESOURCETYPE_STATUSBAR();
+        static OUString RESOURCETYPE_MENUBAR();
+        static OUString RESOURCETYPE_TOOLBAR();
+        static OUString RESOURCETYPE_ACCELERATOR();
+        static OUString RESOURCETYPE_STATUSBAR();
 
     //-------------------------------------------
     // types
@@ -134,7 +134,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 
             @descr  e.g. menubars, toolbars, accelerators
          */
-        ::rtl::OUString m_sResourceType;
+        OUString m_sResourceType;
 
         //---------------------------------------
         /** @short  specify the application module for a module
@@ -144,7 +144,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                     "module". Further it must be a valid module identifier
                     then ...
          */
-        ::rtl::OUString m_sModule;
+        OUString m_sModule;
 
         //---------------------------------------
         /** @short  provides access to the:
@@ -209,9 +209,9 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 
         //---------------------------------------
         /** @short  knows the relative path from the root. */
-        ::rtl::OUString m_sRelPathShare;
-        ::rtl::OUString m_sRelPathNoLang;
-        ::rtl::OUString m_sRelPathUser;
+        OUString m_sRelPathShare;
+        OUString m_sRelPathNoLang;
+        OUString m_sRelPathUser;
 
     //-------------------------------------------
     // native interface
@@ -322,8 +322,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                     if the specified resource couldn't be located.
          */
         void connectToResource(      EConfigType                                  eConfigType   ,
-                               const ::rtl::OUString&                             sResourceType ,
-                               const ::rtl::OUString&                             sModule       ,
+                               const OUString&                             sResourceType ,
+                               const OUString&                             sModule       ,
                                const css::uno::Reference< css::embed::XStorage >& xDocumentRoot ,
                                const LanguageTag&                                 rLanguageTag  = LanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE));
 
@@ -348,8 +348,8 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
             @throw  com::sun::star::io::IOException
                     if copying failed.
          */
-        void copyPresetToTarget(const ::rtl::OUString& sPreset,
-                                const ::rtl::OUString& sTarget);
+        void copyPresetToTarget(const OUString& sPreset,
+                                const OUString& sTarget);
 
         //---------------------------------------
         /** @short  open the specified preset as stream object
@@ -366,7 +366,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 
             @return The opened preset stream ... or NULL if the preset does not exists.
          */
-        css::uno::Reference< css::io::XStream > openPreset(const ::rtl::OUString& sPreset,
+        css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset,
                                                            sal_Bool bUseNoLangGlobal = sal_False);
 
         //---------------------------------------
@@ -388,7 +388,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
             @return The opened target stream ... or NULL if the target does not exists
                     or couldnt be created as new one.
          */
-        css::uno::Reference< css::io::XStream > openTarget(const ::rtl::OUString& sTarget         ,
+        css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget         ,
                                                                  sal_Bool         bCreateIfMissing);
 
         //---------------------------------------
@@ -427,7 +427,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 
             @return An opened storage in case method was successfully - null otherwise.
          */
-        css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const ::rtl::OUString& sPath ,
+        css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const OUString& sPath ,
                                                                                       sal_Int32        eMode ,
                                                                                       sal_Bool         bShare);
 
@@ -454,7 +454,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
             @return An iterator, which points directly into lLocalizedValue list.
                     As a negative result the special iterator lLocalizedValues.end() will be returned.
          */
-        ::std::vector< ::rtl::OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< ::rtl::OUString >& lLocalizedValues,
+        ::std::vector< OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< OUString >& lLocalizedValues,
                                                                                                OUString&             rLanguageTag         ,
                                                                                                sal_Bool                          bAllowFallbacks );
 
@@ -486,7 +486,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 
             @return An opened storage in case method was successfully - null otherwise.
          */
-        css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(::rtl::OUString&      sPath         ,
+        css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(OUString&      sPath         ,
                                                                                          sal_Int32             eMode         ,
                                                                                          sal_Bool              bShare        ,
                                                                                          OUString&             rLanguageTag  ,
@@ -501,7 +501,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
             @return [vector< string >]
                     a list of folder names.
          */
-        ::std::vector< ::rtl::OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder);
+        ::std::vector< OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder);
 };
 
 } // namespace framework
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index bfde625885c2..1c51cdf786aa 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -60,10 +60,10 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         };
 
         /** @short  TODO */
-        typedef ::boost::unordered_map< ::rtl::OUString                    ,
+        typedef ::boost::unordered_map< OUString                    ,
                                  TStorageInfo                       ,
-                                 ::rtl::OUStringHash                ,
-                                 ::std::equal_to< ::rtl::OUString > > TPath2StorageInfo;
+                                 OUStringHash                ,
+                                 ::std::equal_to< OUString > > TPath2StorageInfo;
 
     //-------------------------------------------
     // member
@@ -108,45 +108,45 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         /** @short  TODO
                     open or get!
          */
-        virtual css::uno::Reference< css::embed::XStorage > openPath(const ::rtl::OUString& sPath    ,
+        virtual css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath    ,
                                                                            sal_Int32        nOpenMode);
 
         //---------------------------------------
         /** @short  TODO
          */
-        virtual StorageHolder::TStorageList getAllPathStorages(const ::rtl::OUString& sPath);
+        virtual StorageHolder::TStorageList getAllPathStorages(const OUString& sPath);
 
         //---------------------------------------
         /** @short  TODO
          */
-        virtual void commitPath(const ::rtl::OUString& sPath);
+        virtual void commitPath(const OUString& sPath);
 
         //---------------------------------------
         /** @short  TODO
          */
-        virtual void closePath(const ::rtl::OUString& sPath);
+        virtual void closePath(const OUString& sPath);
 
         //---------------------------------------
         /** @short  TODO
          */
-        virtual void notifyPath(const ::rtl::OUString& sPath);
+        virtual void notifyPath(const OUString& sPath);
 
         //---------------------------------------
         /** @short  TODO
          */
         virtual void addStorageListener(      IStorageListener* pListener,
-                                        const ::rtl::OUString&  sPath    );
+                                        const OUString&  sPath    );
 
         //---------------------------------------
         /** @short  TODO
          */
         virtual void removeStorageListener(      IStorageListener* pListener,
-                                           const ::rtl::OUString&  sPath    );
+                                           const OUString&  sPath    );
 
         //---------------------------------------
         /** @short  TODO
          */
-        virtual ::rtl::OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage);
+        virtual OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage);
 
         //---------------------------------------
         /** @short  TODO
@@ -156,7 +156,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         //---------------------------------------
         /** @short  TODO
          */
-        virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const ::rtl::OUString& sChildPath);
+        virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath);
 
         //---------------------------------------
         /** @short  TODO
@@ -188,12 +188,12 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
                     again.
          */
         static css::uno::Reference< css::embed::XStorage > openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage  ,
-                                                                                      const ::rtl::OUString&                             sSubStorage   ,
+                                                                                      const OUString&                             sSubStorage   ,
                                                                                             sal_Int32                                    eOpenMode     ,
                                                                                             sal_Bool                                     bAllowFallback);
 
         static css::uno::Reference< css::io::XStream > openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage  ,
-                                                                                 const ::rtl::OUString&                             sSubStream    ,
+                                                                                 const OUString&                             sSubStream    ,
                                                                                        sal_Int32                                    eOpenMode     ,
                                                                                        sal_Bool                                     bAllowFallback);
 
@@ -204,12 +204,12 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
             //-----------------------------------
             /** @short  TODO
              */
-            static ::rtl::OUString impl_st_normPath(const ::rtl::OUString& sPath);
+            static OUString impl_st_normPath(const OUString& sPath);
 
             //-----------------------------------
             /** @short  TODO
              */
-            static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath);
+            static OUStringList impl_st_parsePath(const OUString& sPath);
 };
 
 } // namespace framework
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 20c003916efe..c4f866577ccc 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -51,7 +51,7 @@ class LoadDispatcher : private ThreadHelpBase
         css::uno::WeakReference< css::frame::XFrame > m_xOwnerFrame;
 
         /** @short  TODO document me */
-        ::rtl::OUString m_sTarget;
+        OUString m_sTarget;
 
         /** @short  TODO document me */
         sal_Int32 m_nSearchFlags;
@@ -85,7 +85,7 @@ class LoadDispatcher : private ThreadHelpBase
          */
         LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR       ,
                        const css::uno::Reference< css::frame::XFrame >&              xOwnerFrame ,
-                       const ::rtl::OUString                                         sTargetName ,
+                       const OUString                                         sTargetName ,
                              sal_Int32                                               nSearchFlags);
 
         //_______________________________________
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 4d561cb8ee5b..9624e9c99fa0 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -117,7 +117,7 @@ class WindowCommandDispatch : private ThreadHelpBase
             @param  sCommand
                     the command for dispatch
          */
-        void impl_dispatchCommand(const ::rtl::OUString& sCommand);
+        void impl_dispatchCommand(const OUString& sCommand);
 
 }; // class MACDispatch
 
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index c76877f2d09a..a1065ce6945d 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -135,7 +135,7 @@ private:
     /** @short  contains the name of the target, in which the specified resource
                 of this instance must be loaded.
      */
-    ::rtl::OUString m_sTarget;
+    OUString m_sTarget;
 
     /** @short  if m_sTarget is not a special one, this flags regulate searching
                 of a suitable one.
@@ -218,8 +218,8 @@ public:
 
     static css::uno::Reference< css::lang::XComponent > loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >&    xLoader,
                                                                              const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR  ,
-                                                                             const ::rtl::OUString&                                        sURL   ,
-                                                                             const ::rtl::OUString&                                        sTarget,
+                                                                             const OUString&                                        sURL   ,
+                                                                             const OUString&                                        sTarget,
                                                                                    sal_Int32                                               nFlags ,
                                                                              const css::uno::Sequence< css::beans::PropertyValue >&        lArgs  )
         throw(css::lang::IllegalArgumentException,
@@ -275,10 +275,10 @@ public:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime cant be used any longer.
      */
-    void initializeLoading(const ::rtl::OUString&                                           sURL            ,
+    void initializeLoading(const OUString&                                           sURL            ,
                                    const css::uno::Sequence< css::beans::PropertyValue >&           lMediaDescriptor,
                                    const css::uno::Reference< css::frame::XFrame >&                 xBaseFrame      ,
-                                   const ::rtl::OUString&                                           sTarget         ,
+                                   const OUString&                                           sTarget         ,
                                          sal_Int32                                                  nSearchFlags    ,
                                          EFeature                                                   eFeature        = E_NO_FEATURE         ,
                                          EContentType                                               eContentType    = E_UNSUPPORTED_CONTENT);
@@ -364,7 +364,7 @@ public:
 
         @return     A suitable enum value, which classify the specified content.
      */
-    static EContentType classifyContent(const ::rtl::OUString&                                 sURL            ,
+    static EContentType classifyContent(const OUString&                                 sURL            ,
                                         const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor);
 
     /** TODO document me ... */
@@ -431,7 +431,7 @@ private:
 
         @attention  Internaly we update the member m_lMediaDescriptor!
      */
-    ::rtl::OUString impl_askUserForTypeAndFilterIfAllowed()
+    OUString impl_askUserForTypeAndFilterIfAllowed()
         throw(LoadEnvException, css::uno::RuntimeException);
 
     /** @short  tries to use ContentHandler objects for loading.
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index 9bd67738cd04..868944587147 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -100,7 +100,7 @@ class LoadEnvException
 
         /** @short  contains a suitable message, which describes the reason for this
                     exception. */
-        ::rtl::OString m_sMessage;
+        OString m_sMessage;
 
         /** @short  An ID, which make this exception unique among others. */
         sal_Int32 m_nID;
@@ -158,7 +158,7 @@ class LoadEnvException
          */
         ~LoadEnvException()
         {
-            m_sMessage = ::rtl::OString();
+            m_sMessage = OString();
             m_nID      = 0;
             m_bHandled = false;
             m_exOriginal.clear();
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index 539100abceef..4adea994479a 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -75,7 +75,7 @@ class TargetHelper
             @return It returns <TRUE/> if <var>sCheckTarget</var> represent
                     the expected <var>eSpecialTarget</var> value; <FALSE/> otherwise.
          */
-        static sal_Bool matchSpecialTarget(const ::rtl::OUString& sCheckTarget  ,
+        static sal_Bool matchSpecialTarget(const OUString& sCheckTarget  ,
                                                  ESpecialTarget   eSpecialTarget);
 
         //___________________________________________
@@ -99,7 +99,7 @@ class TargetHelper
             @param  sName
                     the new frame name, which sould be checked.
          */
-        static sal_Bool isValidNameForFrame(const ::rtl::OUString& sName);
+        static sal_Bool isValidNameForFrame(const OUString& sName);
 };
 
 } // namespace framework
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index 01d97c1d5456..1e684825f30f 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -89,8 +89,8 @@ class ConfigurationHelper
                     see enum EOpenMode for further informations.
          */
         static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >&     rxContext,
-                                                                      const ::rtl::OUString&                                        sPackage  ,
-                                                                      const ::rtl::OUString&                                        sRelPath  ,
+                                                                      const OUString&                                        sPackage  ,
+                                                                      const OUString&                                        sRelPath  ,
                                                                             sal_Int32                                               nOpenFlags)
         {
             css::uno::Reference< css::uno::XInterface > xCFG;
@@ -100,7 +100,7 @@ class ConfigurationHelper
                 css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider =
                     css::configuration::theDefaultProvider::get( rxContext );
 
-                ::rtl::OUStringBuffer sPath(1024);
+                OUStringBuffer sPath(1024);
                 sPath.append(sPackage      );
                 sPath.append(static_cast<sal_Unicode>('/'));
                 sPath.append(sRelPath      );
@@ -115,13 +115,13 @@ class ConfigurationHelper
                 css::uno::Sequence< css::uno::Any > lParams(c);
                 css::beans::PropertyValue           aParam;
 
-                aParam.Name    = ::rtl::OUString("nodepath");
+                aParam.Name    = OUString("nodepath");
                 aParam.Value <<= sPath.makeStringAndClear();
                 lParams[0]   <<= aParam;
 
                 if (bAllLocales)
                 {
-                    aParam.Name    = ::rtl::OUString("*");
+                    aParam.Name    = OUString("*");
                     aParam.Value <<= sal_True;
                     lParams[1]   <<= aParam;
                 }
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 0510b86495ea..9a4399215ae8 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -44,12 +44,12 @@ class WindowHelper
     public:
 
 //-----------------------------------------------
-static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
+static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
 {
     if (!xWindow.is())
-        return ::rtl::OUString();
+        return OUString();
 
-    rtl::OString sWindowState;
+    OString sWindowState;
     // SOLAR SAFE -> ----------------------------
     {
         SolarMutexGuard aSolarGuard;
@@ -65,12 +65,12 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind
     }
     // <- SOLAR SAFE ----------------------------
 
-    return rtl::OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8);
+    return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8);
 }
 
 //-----------------------------------------------
 static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow     ,
-                           const ::rtl::OUString&                          sWindowState)
+                           const OUString&                          sWindowState)
 {
     if (
         (!xWindow.is()            ) ||