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

12 files changed, 213 insertions, 218 deletions

diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 1c9d839a8b7f..5249a14540a6 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -138,7 +138,7 @@ void  SvtTabAppearanceCfg::Commit()
     PutProperties(rNames, aValues);
 }
 
-void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< OUString >& )
 {
 }
 
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 7b13df8e0964..f2dbec06358c 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -43,7 +43,6 @@
 using namespace utl;
 using namespace com::sun::star;
 
-using ::rtl::OUString;
 
 namespace svtools
 {
@@ -63,32 +62,32 @@ class ColorConfig_Impl : public utl::ConfigItem
 {
     ColorConfigValue    m_aConfigValues[ColorConfigEntryCount];
     sal_Bool            m_bEditMode;
-    rtl::OUString       m_sIsVisible;
-    rtl::OUString       m_sLoadedScheme;
+    OUString       m_sIsVisible;
+    OUString       m_sLoadedScheme;
 
-    uno::Sequence< ::rtl::OUString> GetPropertyNames(const rtl::OUString& rScheme);
+    uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme);
 public:
     ColorConfig_Impl(sal_Bool bEditMode = sal_False);
     virtual ~ColorConfig_Impl();
 
-    void                            Load(const rtl::OUString& rScheme);
+    void                            Load(const OUString& rScheme);
     void                            CommitCurrentSchemeName();
     //changes the name of the current scheme but doesn't load it!
-    void                            SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;}
+    void                            SetCurrentSchemeName(const OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;}
     virtual void                    Commit();
-    virtual void                    Notify( const uno::Sequence<rtl::OUString>& aPropertyNames);
+    virtual void                    Notify( const uno::Sequence<OUString>& aPropertyNames);
 
     const ColorConfigValue&         GetColorConfigValue(ColorConfigEntry eValue)
                                                             {return m_aConfigValues[eValue];}
     void                            SetColorConfigValue(ColorConfigEntry eValue,
                                                             const ColorConfigValue& rValue );
 
-    const rtl::OUString&            GetLoadedScheme() const {return m_sLoadedScheme;}
+    const OUString&            GetLoadedScheme() const {return m_sLoadedScheme;}
 
-    uno::Sequence< ::rtl::OUString> GetSchemeNames();
+    uno::Sequence< OUString> GetSchemeNames();
 
-    sal_Bool                        AddScheme(const rtl::OUString& rNode);
-    sal_Bool                        RemoveScheme(const rtl::OUString& rNode);
+    sal_Bool                        AddScheme(const OUString& rNode);
+    sal_Bool                        RemoveScheme(const OUString& rNode);
     void                            SetModified(){ConfigItem::SetModified();}
     void                            ClearModified(){ConfigItem::ClearModified();}
     void                            SettingsChanged();
@@ -99,7 +98,7 @@ public:
     void ImplUpdateApplicationSettings();
 };
 
-uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme)
+uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const OUString& rScheme)
 {
     uno::Sequence<OUString> aNames(2 * ColorConfigEntryCount);
     OUString* pNames = aNames.getArray();
@@ -166,7 +165,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
     const int nCount = ColorConfigEntryCount;
     for(sal_Int32 i = 0; i < 4 * nCount; i+= 4)
     {
-        rtl::OUString sBaseName(sBase);
+        OUString sBaseName(sBase);
         sal_Int32 nPos = i / 4;
         sBaseName += OUString(cNames[nPos].cName, cNames[nPos].nLength, cNames[nPos].eEncoding);
         pNames[nIndex] += sBaseName;
@@ -189,10 +188,10 @@ ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) :
     if(!m_bEditMode)
     {
         //try to register on the root node - if possible
-        uno::Sequence < ::rtl::OUString > aNames(1);
+        uno::Sequence < OUString > aNames(1);
         EnableNotification( aNames );
     }
-    Load(::rtl::OUString());
+    Load(OUString());
 
     ImplUpdateApplicationSettings();
 
@@ -207,23 +206,23 @@ ColorConfig_Impl::~ColorConfig_Impl()
     ::Application::RemoveEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
 }
 
-void ColorConfig_Impl::Load(const rtl::OUString& rScheme)
+void ColorConfig_Impl::Load(const OUString& rScheme)
 {
-    rtl::OUString sScheme(rScheme);
+    OUString sScheme(rScheme);
     if(sScheme.isEmpty())
     {
         //detect current scheme name
-        uno::Sequence < ::rtl::OUString > aCurrent(1);
+        uno::Sequence < OUString > aCurrent(1);
         aCurrent.getArray()[0] = "CurrentColorScheme";
         uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent );
         aCurrentVal.getConstArray()[0] >>= sScheme;
     }
     m_sLoadedScheme = sScheme;
     //
-    uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sScheme);
+    uno::Sequence < OUString > aColorNames = GetPropertyNames(sScheme);
     uno::Sequence< uno::Any > aColors = GetProperties( aColorNames );
     const uno::Any* pColors = aColors.getConstArray();
-    const ::rtl::OUString* pColorNames = aColorNames.getConstArray();
+    const OUString* pColorNames = aColorNames.getConstArray();
     sal_Int32 nIndex = 0;
     for(int i = 0; i < 2 * ColorConfigEntryCount && aColors.getLength() > nIndex; i+= 2)
     {
@@ -243,16 +242,16 @@ void ColorConfig_Impl::Load(const rtl::OUString& rScheme)
 void    ColorConfig_Impl::Notify( const uno::Sequence<OUString>& )
 {
     //loading via notification always uses the default setting
-    Load(::rtl::OUString());
+    Load(OUString());
     NotifyListeners(0);
 }
 
 void ColorConfig_Impl::Commit()
 {
-    uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(m_sLoadedScheme);
+    uno::Sequence < OUString > aColorNames = GetPropertyNames(m_sLoadedScheme);
     uno::Sequence < beans::PropertyValue > aPropValues(aColorNames.getLength());
     beans::PropertyValue* pPropValues = aPropValues.getArray();
-    const ::rtl::OUString* pColorNames = aColorNames.getConstArray();
+    const OUString* pColorNames = aColorNames.getConstArray();
     sal_Int32 nIndex = 0;
     const uno::Type& rBoolType = ::getBooleanCppuType();
     for(int i = 0; i < 2 * ColorConfigEntryCount && aColorNames.getLength() > nIndex; i+= 2)
@@ -273,7 +272,7 @@ void ColorConfig_Impl::Commit()
              nIndex++;
         }
     }
-    rtl::OUString sNode("ColorSchemes");
+    OUString sNode("ColorSchemes");
     SetSetProperties(sNode, aPropValues);
 
     CommitCurrentSchemeName();
@@ -282,7 +281,7 @@ void ColorConfig_Impl::Commit()
 void ColorConfig_Impl::CommitCurrentSchemeName()
 {
     //save current scheme name
-    uno::Sequence < ::rtl::OUString > aCurrent(1);
+    uno::Sequence < OUString > aCurrent(1);
     aCurrent.getArray()[0] = "CurrentColorScheme";
     uno::Sequence< uno::Any > aCurrentVal(1);
     aCurrentVal.getArray()[0] <<= m_sLoadedScheme;
@@ -298,12 +297,12 @@ void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorC
     }
 }
 
-uno::Sequence< ::rtl::OUString> ColorConfig_Impl::GetSchemeNames()
+uno::Sequence< OUString> ColorConfig_Impl::GetSchemeNames()
 {
     return GetNodeNames("ColorSchemes");
 }
 
-sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
+sal_Bool ColorConfig_Impl::AddScheme(const OUString& rScheme)
 {
     if(ConfigItem::AddNode("ColorSchemes", rScheme))
     {
@@ -314,9 +313,9 @@ sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
     return sal_False;
 }
 
-sal_Bool ColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
+sal_Bool ColorConfig_Impl::RemoveScheme(const OUString& rScheme)
 {
-    uno::Sequence< rtl::OUString > aElements(1);
+    uno::Sequence< OUString > aElements(1);
     aElements.getArray()[0] = rScheme;
     return ClearNodeElements("ColorSchemes", aElements);
 }
@@ -499,22 +498,22 @@ EditableColorConfig::~EditableColorConfig()
     delete m_pImpl;
 }
 
-uno::Sequence< ::rtl::OUString >  EditableColorConfig::GetSchemeNames() const
+uno::Sequence< OUString >  EditableColorConfig::GetSchemeNames() const
 {
     return m_pImpl->GetSchemeNames();
 }
 
-void EditableColorConfig::DeleteScheme(const ::rtl::OUString& rScheme )
+void EditableColorConfig::DeleteScheme(const OUString& rScheme )
 {
     m_pImpl->RemoveScheme(rScheme);
 }
 
-void EditableColorConfig::AddScheme(const ::rtl::OUString& rScheme )
+void EditableColorConfig::AddScheme(const OUString& rScheme )
 {
     m_pImpl->AddScheme(rScheme);
 }
 
-sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
+sal_Bool EditableColorConfig::LoadScheme(const OUString& rScheme )
 {
     if(m_bModified)
         m_pImpl->SetModified();
@@ -527,13 +526,13 @@ sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
     return sal_True;
 }
 
-const ::rtl::OUString& EditableColorConfig::GetCurrentSchemeName()const
+const OUString& EditableColorConfig::GetCurrentSchemeName()const
 {
     return m_pImpl->GetLoadedScheme();
 }
 
 // Changes the name of the current scheme but doesn't load it!
-void EditableColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme)
+void EditableColorConfig::SetCurrentSchemeName(const OUString& rScheme)
 {
     m_pImpl->SetCurrentSchemeName(rScheme);
     m_pImpl->CommitCurrentSchemeName();
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index b5a94597daad..eee51dd35c26 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -41,7 +41,6 @@
 using namespace utl;
 using namespace com::sun::star;
 
-using ::rtl::OUString;
 
 namespace svtools
 {
@@ -57,7 +56,7 @@ ExtendedColorConfig_Impl*    ExtendedColorConfig::m_pImpl = NULL;
 
 class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
 {
-    DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, TDisplayNames);
+    DECLARE_STL_USTRINGACCESS_MAP( OUString, TDisplayNames);
     DECLARE_STL_USTRINGACCESS_MAP(ExtendedColorConfigValue,TConfigValues);
     typedef ::std::vector<TConfigValues::iterator> TMapPos;
     typedef ::std::pair< TConfigValues, TMapPos > TComponentMapping;
@@ -67,32 +66,32 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
     ::std::vector<TComponents::iterator> m_aConfigValuesPos;
 
     sal_Bool            m_bEditMode;
-    rtl::OUString       m_sLoadedScheme;
+    OUString       m_sLoadedScheme;
     sal_Bool            m_bIsBroadcastEnabled;
     static sal_Bool     m_bLockBroadcast;
     static sal_Bool     m_bBroadcastWhenUnlocked;
 
-    uno::Sequence< ::rtl::OUString> GetPropertyNames(const rtl::OUString& rScheme);
-    void FillComponentColors(uno::Sequence < ::rtl::OUString >& _rComponents,const TDisplayNames& _rDisplayNames);
+    uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme);
+    void FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames);
 public:
     ExtendedColorConfig_Impl(sal_Bool bEditMode = sal_False);
     virtual ~ExtendedColorConfig_Impl();
 
-    void                            Load(const rtl::OUString& rScheme);
+    void                            Load(const OUString& rScheme);
     void                            CommitCurrentSchemeName();
     //changes the name of the current scheme but doesn't load it!
-    void                            SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;}
-    sal_Bool                        ExistsScheme(const ::rtl::OUString& _sSchemeName);
+    void                            SetCurrentSchemeName(const OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;}
+    sal_Bool                        ExistsScheme(const OUString& _sSchemeName);
     virtual void                    Commit();
-    virtual void                    Notify( const uno::Sequence<rtl::OUString>& aPropertyNames);
+    virtual void                    Notify( const uno::Sequence<OUString>& aPropertyNames);
 
     sal_Int32                       GetComponentCount() const;
-    ::rtl::OUString                 GetComponentName(sal_uInt32 _nPos) const;
-    ::rtl::OUString                 GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const;
-    sal_Int32                       GetComponentColorCount(const ::rtl::OUString& _sName) const;
-    ExtendedColorConfigValue        GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const;
+    OUString                 GetComponentName(sal_uInt32 _nPos) const;
+    OUString                 GetComponentDisplayName(const OUString& _sComponentName) const;
+    sal_Int32                       GetComponentColorCount(const OUString& _sName) const;
+    ExtendedColorConfigValue        GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const;
 
-    ExtendedColorConfigValue GetColorConfigValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)
+    ExtendedColorConfigValue GetColorConfigValue(const OUString& _sComponentName,const OUString& _sName)
     {
         TComponents::iterator aFind = m_aConfigValues.find(_sComponentName);
         if ( aFind != m_aConfigValues.end() )
@@ -102,22 +101,22 @@ public:
                 return aFind2->second;
         }
 #if OSL_DEBUG_LEVEL > 0
-        ::rtl::OStringBuffer aMessage( "Could find the required config:\n" );
+        OStringBuffer aMessage( "Could find the required config:\n" );
         aMessage.append( "component: " );
-        aMessage.append( ::rtl::OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) );
+        aMessage.append( OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) );
         aMessage.append( "\nname: " );
-        aMessage.append( ::rtl::OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) );
+        aMessage.append( OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) );
         OSL_FAIL( aMessage.makeStringAndClear().getStr() );
 #endif
         return ExtendedColorConfigValue();
     }
-    void                            SetColorConfigValue(const ::rtl::OUString& _sName,
+    void                            SetColorConfigValue(const OUString& _sName,
                                                             const ExtendedColorConfigValue& rValue );
 
-    const rtl::OUString&            GetLoadedScheme() const {return m_sLoadedScheme;}
+    const OUString&            GetLoadedScheme() const {return m_sLoadedScheme;}
 
-    sal_Bool                        AddScheme(const rtl::OUString& rNode);
-    sal_Bool                        RemoveScheme(const rtl::OUString& rNode);
+    sal_Bool                        AddScheme(const OUString& rNode);
+    sal_Bool                        RemoveScheme(const OUString& rNode);
     void                            SetModified(){ConfigItem::SetModified();}
     void                            ClearModified(){ConfigItem::ClearModified();}
     void                            SettingsChanged();
@@ -133,12 +132,12 @@ public:
     DECL_LINK( DataChangedEventListener, VclWindowEvent* );
 };
 
-uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme)
+uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const OUString& rScheme)
 {
     uno::Sequence< OUString> aNames(GetNodeNames(rScheme));
-    ::rtl::OUString* pIter = aNames.getArray();
-    ::rtl::OUString* pEnd    = pIter + aNames.getLength();
-    ::rtl::OUString sSep("/");
+    OUString* pIter = aNames.getArray();
+    OUString* pEnd    = pIter + aNames.getLength();
+    OUString sSep("/");
     for(;pIter != pEnd;++pIter)
     {
         *pIter = rScheme + sSep + *pIter;
@@ -151,7 +150,7 @@ sal_Int32 ExtendedColorConfig_Impl::GetComponentCount() const
     return m_aConfigValues.size();
 }
 // -----------------------------------------------------------------------------
-sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const ::rtl::OUString& _sName) const
+sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const OUString& _sName) const
 {
     sal_Int32 nSize = 0;
     TComponents::const_iterator aFind = m_aConfigValues.find(_sName);
@@ -162,7 +161,7 @@ sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const ::rtl::OUString
     return nSize;
 }
 // -----------------------------------------------------------------------------
-ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const
+ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const
 {
     TComponents::const_iterator aFind = m_aConfigValues.find(_sName);
     if ( aFind != m_aConfigValues.end() )
@@ -175,18 +174,18 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(
     return ExtendedColorConfigValue();
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const
+OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const OUString& _sComponentName) const
 {
-    ::rtl::OUString sRet;
+    OUString sRet;
     TDisplayNames::const_iterator aFind = m_aComponentDisplayNames.find(_sComponentName);
     if ( aFind != m_aComponentDisplayNames.end() )
         sRet = aFind->second;
     return sRet;
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const
+OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const
 {
-    ::rtl::OUString sRet;
+    OUString sRet;
     if ( _nPos < m_aConfigValuesPos.size() )
         sRet = m_aConfigValuesPos[_nPos]->first;
     return sRet;
@@ -195,17 +194,17 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(
 sal_Bool ExtendedColorConfig_Impl::m_bLockBroadcast = sal_False;
 sal_Bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = sal_False;
 ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(sal_Bool bEditMode) :
-    ConfigItem(rtl::OUString("Office.ExtendedColorScheme")),
+    ConfigItem(OUString("Office.ExtendedColorScheme")),
     m_bEditMode(bEditMode),
     m_bIsBroadcastEnabled(sal_True)
 {
     if(!m_bEditMode)
     {
         //try to register on the root node - if possible
-        uno::Sequence < ::rtl::OUString > aNames(1);
+        uno::Sequence < OUString > aNames(1);
         EnableNotification( aNames );
     }
-    Load(::rtl::OUString());
+    Load(OUString());
 
     // #100822#
     ::Application::AddEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) );
@@ -235,15 +234,15 @@ sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast()
     return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False;
 }
 
-void lcl_addString(uno::Sequence < ::rtl::OUString >& _rSeq,const ::rtl::OUString& _sAdd)
+void lcl_addString(uno::Sequence < OUString >& _rSeq,const OUString& _sAdd)
 {
-    ::rtl::OUString* pIter = _rSeq.getArray();
-    ::rtl::OUString* pEnd  = pIter + _rSeq.getLength();
+    OUString* pIter = _rSeq.getArray();
+    OUString* pEnd  = pIter + _rSeq.getLength();
     for(;pIter != pEnd;++pIter)
         *pIter += _sAdd;
 }
 // -----------------------------------------------------------------------------
-void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
+void ExtendedColorConfig_Impl::Load(const OUString& rScheme)
 {
     m_aComponentDisplayNames.clear();
     m_aConfigValuesPos.clear();
@@ -251,58 +250,58 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
 
     // fill display names
     TDisplayNames aDisplayNameMap;
-    ::rtl::OUString sEntryNames("EntryNames");
-    uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sEntryNames);
-    ::rtl::OUString sDisplayName("/DisplayName");
-    ::rtl::OUString* pIter = aComponentNames.getArray();
-    ::rtl::OUString* pEnd  = pIter + aComponentNames.getLength();
+    OUString sEntryNames("EntryNames");
+    uno::Sequence < OUString > aComponentNames = GetPropertyNames(sEntryNames);
+    OUString sDisplayName("/DisplayName");
+    OUString* pIter = aComponentNames.getArray();
+    OUString* pEnd  = pIter + aComponentNames.getLength();
     for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i)
     {
-        uno::Sequence < ::rtl::OUString > aComponentDisplayNames(1);
+        uno::Sequence < OUString > aComponentDisplayNames(1);
         aComponentDisplayNames[0] = *pIter;
         aComponentDisplayNames[0] += sDisplayName;
         uno::Sequence< uno::Any > aComponentDisplayNamesValue = GetProperties( aComponentDisplayNames );
-        ::rtl::OUString sComponentDisplayName;
+        OUString sComponentDisplayName;
         if ( aComponentDisplayNamesValue.getLength() && (aComponentDisplayNamesValue[0] >>= sComponentDisplayName) )
         {
             sal_Int32 nIndex = 0;
             m_aComponentDisplayNames.insert(TDisplayNames::value_type(pIter->getToken(1,'/',nIndex),sComponentDisplayName));
         }
 
-        *pIter += ::rtl::OUString("/Entries");
-        uno::Sequence < ::rtl::OUString > aDisplayNames = GetPropertyNames(*pIter);
+        *pIter += OUString("/Entries");
+        uno::Sequence < OUString > aDisplayNames = GetPropertyNames(*pIter);
         lcl_addString(aDisplayNames,sDisplayName);
 
         uno::Sequence< uno::Any > aDisplayNamesValue = GetProperties( aDisplayNames );
 
-        const ::rtl::OUString* pDispIter = aDisplayNames.getConstArray();
-        const ::rtl::OUString* pDispEnd  = pDispIter + aDisplayNames.getLength();
+        const OUString* pDispIter = aDisplayNames.getConstArray();
+        const OUString* pDispEnd  = pDispIter + aDisplayNames.getLength();
         for(sal_Int32 j = 0;pDispIter != pDispEnd;++pDispIter,++j)
         {
             sal_Int32 nIndex = 0;
             pDispIter->getToken(0,'/',nIndex);
-            ::rtl::OUString sName = pDispIter->copy(nIndex);
+            OUString sName = pDispIter->copy(nIndex);
             sName = sName.copy(0,sName.lastIndexOf(sDisplayName));
-            ::rtl::OUString sCurrentDisplayName;
+            OUString sCurrentDisplayName;
             aDisplayNamesValue[j] >>= sCurrentDisplayName;
             aDisplayNameMap.insert(TDisplayNames::value_type(sName,sCurrentDisplayName));
         }
     }
 
     // load color settings
-    rtl::OUString sScheme(rScheme);
+    OUString sScheme(rScheme);
 
     if(sScheme.isEmpty())
     {
         //detect current scheme name
-        uno::Sequence < ::rtl::OUString > aCurrent(1);
-        aCurrent.getArray()[0] = ::rtl::OUString("ExtendedColorScheme/CurrentColorScheme");
+        uno::Sequence < OUString > aCurrent(1);
+        aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme");
         uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent );
         aCurrentVal.getConstArray()[0] >>= sScheme;
     } // if(!sScheme.getLength())
 
     m_sLoadedScheme = sScheme;
-    ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/");
+    OUString sBase("ExtendedColorScheme/ColorSchemes/");
     sBase += sScheme;
 
     sal_Bool bFound = ExistsScheme(sScheme);
@@ -313,14 +312,14 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
     }
 
     if ( m_sLoadedScheme.isEmpty() )
-        m_sLoadedScheme = ::rtl::OUString("default");
+        m_sLoadedScheme = OUString("default");
 
     if ( sScheme != "default" )
     {
-        ::rtl::OUString sDefault("default");
+        OUString sDefault("default");
         if ( ExistsScheme(sDefault) )
         {
-            ::rtl::OUString sBaseDefault("ExtendedColorScheme/ColorSchemes/default");
+            OUString sBaseDefault("ExtendedColorScheme/ColorSchemes/default");
             aComponentNames = GetPropertyNames(sBaseDefault);
             FillComponentColors(aComponentNames,aDisplayNameMap);
         }
@@ -332,24 +331,24 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
     }
 }
 // -----------------------------------------------------------------------------
-void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUString >& _rComponents,const TDisplayNames& _rDisplayNames)
+void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames)
 {
-    const ::rtl::OUString sColorEntries("/Entries");
-    ::rtl::OUString* pIter = _rComponents.getArray();
-    ::rtl::OUString* pEnd  = pIter + _rComponents.getLength();
+    const OUString sColorEntries("/Entries");
+    OUString* pIter = _rComponents.getArray();
+    OUString* pEnd  = pIter + _rComponents.getLength();
     for(;pIter != pEnd;++pIter)
     {
-        ::rtl::OUString sComponentName = pIter->copy(pIter->lastIndexOf('/')+1);
+        OUString sComponentName = pIter->copy(pIter->lastIndexOf('/')+1);
         if ( m_aConfigValues.find(sComponentName) == m_aConfigValues.end() )
         {
-            ::rtl::OUString sEntry = *pIter;
+            OUString sEntry = *pIter;
             sEntry += sColorEntries;
 
-            uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sEntry);
-            uno::Sequence < ::rtl::OUString > aDefaultColorNames = aColorNames;
+            uno::Sequence < OUString > aColorNames = GetPropertyNames(sEntry);
+            uno::Sequence < OUString > aDefaultColorNames = aColorNames;
 
-            const ::rtl::OUString sColor("/Color");
-            const ::rtl::OUString sDefaultColor("/DefaultColor");
+            const OUString sColor("/Color");
+            const OUString sDefaultColor("/DefaultColor");
             lcl_addString(aColorNames,sColor);
             lcl_addString(aDefaultColorNames,sDefaultColor);
             uno::Sequence< uno::Any > aColors = GetProperties( aColorNames );
@@ -359,8 +358,8 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri
             bool bDefaultColorFound = aDefaultColors.getLength() != 0;
             const uno::Any* pDefaultColors = aDefaultColors.getConstArray();
 
-            ::rtl::OUString* pColorIter = aColorNames.getArray();
-            ::rtl::OUString* pColorEnd  = pColorIter + aColorNames.getLength();
+            OUString* pColorIter = aColorNames.getArray();
+            OUString* pColorEnd  = pColorIter + aColorNames.getLength();
 
             m_aConfigValuesPos.push_back(m_aConfigValues.insert(TComponents::value_type(sComponentName,TComponentMapping(TConfigValues(),TMapPos()))).first);
             TConfigValues& aConfigValues = (*m_aConfigValuesPos.rbegin())->second.first;
@@ -371,8 +370,8 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri
                 {
                     sal_Int32 nIndex = 0;
                     pColorIter->getToken(2,'/',nIndex);
-                    ::rtl::OUString sName(pColorIter->copy(nIndex)),sDisplayName;
-                    ::rtl::OUString sTemp = sName.copy(0,sName.lastIndexOf(sColor));
+                    OUString sName(pColorIter->copy(nIndex)),sDisplayName;
+                    OUString sTemp = sName.copy(0,sName.lastIndexOf(sColor));
 
                     TDisplayNames::const_iterator aFind = _rDisplayNames.find(sTemp);
                     nIndex = 0;
@@ -400,7 +399,7 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri
 void    ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rPropertyNames*/)
 {
     //loading via notification always uses the default setting
-    Load(::rtl::OUString());
+    Load(OUString());
 
     SolarMutexGuard aVclGuard;
 
@@ -416,22 +415,22 @@ void ExtendedColorConfig_Impl::Commit()
 {
     if ( m_sLoadedScheme.isEmpty() )
         return;
-    const ::rtl::OUString sColorEntries("Entries");
-    const ::rtl::OUString sColor("/Color");
-    ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/");
-    const ::rtl::OUString s_sSep("/");
+    const OUString sColorEntries("Entries");
+    const OUString sColor("/Color");
+    OUString sBase("ExtendedColorScheme/ColorSchemes/");
+    const OUString s_sSep("/");
     sBase += m_sLoadedScheme;
 
     TComponents::iterator aIter = m_aConfigValues.begin();
     TComponents::iterator aEnd = m_aConfigValues.end();
     for( ;aIter != aEnd;++aIter )
     {
-        ::rtl::OUString sEntry = aIter->first;
+        OUString sEntry = aIter->first;
         sEntry += sColorEntries;
 
         if ( ConfigItem::AddNode(sBase, aIter->first) )
         {
-            rtl::OUString sNode = sBase;
+            OUString sNode = sBase;
             sNode += s_sSep;
             sNode += aIter->first;
             //ConfigItem::AddNode(sNode, sColorEntries);
@@ -450,7 +449,7 @@ void ExtendedColorConfig_Impl::Commit()
                 pPropValues->Value <<= aConIter->second.getColor();
                 // the default color will never be changed
             }
-            ::rtl::OUString s("ExtendedColorScheme/ColorSchemes");
+            OUString s("ExtendedColorScheme/ColorSchemes");
             SetSetProperties(s, aPropValues);
         }
     }
@@ -461,27 +460,27 @@ void ExtendedColorConfig_Impl::Commit()
 void ExtendedColorConfig_Impl::CommitCurrentSchemeName()
 {
     //save current scheme name
-    uno::Sequence < ::rtl::OUString > aCurrent(1);
-    aCurrent.getArray()[0] = rtl::OUString("ExtendedColorScheme/CurrentColorScheme");
+    uno::Sequence < OUString > aCurrent(1);
+    aCurrent.getArray()[0] = OUString("ExtendedColorScheme/CurrentColorScheme");
     uno::Sequence< uno::Any > aCurrentVal(1);
     aCurrentVal.getArray()[0] <<= m_sLoadedScheme;
     PutProperties(aCurrent, aCurrentVal);
 }
 // -----------------------------------------------------------------------------
-sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeName)
+sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const OUString& _sSchemeName)
 {
-    ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes");
+    OUString sBase("ExtendedColorScheme/ColorSchemes");
 
-    uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase);
-    sBase += ::rtl::OUString("/") + _sSchemeName;
-    const ::rtl::OUString* pCompIter = aComponentNames.getConstArray();
-    const ::rtl::OUString* pCompEnd  = pCompIter + aComponentNames.getLength();
+    uno::Sequence < OUString > aComponentNames = GetPropertyNames(sBase);
+    sBase += OUString("/") + _sSchemeName;
+    const OUString* pCompIter = aComponentNames.getConstArray();
+    const OUString* pCompEnd  = pCompIter + aComponentNames.getLength();
     for(;pCompIter != pCompEnd && *pCompIter != sBase;++pCompIter)
         ;
     return pCompIter != pCompEnd;
 }
 
-void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue )
+void ExtendedColorConfig_Impl::SetColorConfigValue(const OUString& _sName, const ExtendedColorConfigValue& rValue )
 {
     TComponents::iterator aFind = m_aConfigValues.find(_sName);
     if ( aFind != m_aConfigValues.end() )
@@ -493,9 +492,9 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName
     }
 }
 
-sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
+sal_Bool ExtendedColorConfig_Impl::AddScheme(const OUString& rScheme)
 {
-    if(ConfigItem::AddNode(rtl::OUString("ExtendedColorScheme/ColorSchemes"), rScheme))
+    if(ConfigItem::AddNode(OUString("ExtendedColorScheme/ColorSchemes"), rScheme))
     {
         m_sLoadedScheme = rScheme;
         Commit();
@@ -504,11 +503,11 @@ sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
     return sal_False;
 }
 
-sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
+sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const OUString& rScheme)
 {
-    uno::Sequence< rtl::OUString > aElements(1);
+    uno::Sequence< OUString > aElements(1);
     aElements.getArray()[0] = rScheme;
-    return ClearNodeElements(rtl::OUString("ExtendedColorScheme/ColorSchemes"), aElements);
+    return ClearNodeElements(OUString("ExtendedColorScheme/ColorSchemes"), aElements);
 }
 
 void ExtendedColorConfig_Impl::SettingsChanged()
@@ -580,7 +579,7 @@ ExtendedColorConfig::~ExtendedColorConfig()
     }
 }
 
-ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const
+ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const OUString& _sComponentName,const OUString& _sName)const
 {
     return m_pImpl->GetColorConfigValue(_sComponentName,_sName);
 }
@@ -590,22 +589,22 @@ sal_Int32 ExtendedColorConfig::GetComponentCount() const
     return m_pImpl->GetComponentCount();
 }
 // -----------------------------------------------------------------------------
-sal_Int32 ExtendedColorConfig::GetComponentColorCount(const ::rtl::OUString& _sName) const
+sal_Int32 ExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const
 {
     return m_pImpl->GetComponentColorCount(_sName);
 }
 // -----------------------------------------------------------------------------
-ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const
+ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const
 {
     return m_pImpl->GetComponentColorConfigValue(_sName,_nPos);
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString ExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const
+OUString ExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const
 {
     return m_pImpl->GetComponentName(_nPos);
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString ExtendedColorConfig::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const
+OUString ExtendedColorConfig::GetComponentDisplayName(const OUString& _sComponentName) const
 {
     return m_pImpl->GetComponentDisplayName(_sComponentName);
 }
@@ -634,17 +633,17 @@ EditableExtendedColorConfig::~EditableExtendedColorConfig()
     delete m_pImpl;
 }
 
-void EditableExtendedColorConfig::DeleteScheme(const ::rtl::OUString& rScheme )
+void EditableExtendedColorConfig::DeleteScheme(const OUString& rScheme )
 {
     m_pImpl->RemoveScheme(rScheme);
 }
 
-void EditableExtendedColorConfig::AddScheme(const ::rtl::OUString& rScheme )
+void EditableExtendedColorConfig::AddScheme(const OUString& rScheme )
 {
     m_pImpl->AddScheme(rScheme);
 }
 
-sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
+sal_Bool EditableExtendedColorConfig::LoadScheme(const OUString& rScheme )
 {
     if(m_bModified)
         m_pImpl->SetModified();
@@ -658,14 +657,14 @@ sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme
 }
 
 // Changes the name of the current scheme but doesn't load it!
-void EditableExtendedColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme)
+void EditableExtendedColorConfig::SetCurrentSchemeName(const OUString& rScheme)
 {
     m_pImpl->SetCurrentSchemeName(rScheme);
     m_pImpl->CommitCurrentSchemeName();
 }
 
 void EditableExtendedColorConfig::SetColorValue(
-    const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue)
+    const OUString& _sName, const ExtendedColorConfigValue& rValue)
 {
     m_pImpl->SetColorConfigValue(_sName, rValue);
     m_pImpl->ClearModified();
@@ -701,17 +700,17 @@ sal_Int32 EditableExtendedColorConfig::GetComponentCount() const
     return m_pImpl->GetComponentCount();
 }
 // -----------------------------------------------------------------------------
-sal_Int32 EditableExtendedColorConfig::GetComponentColorCount(const ::rtl::OUString& _sName) const
+sal_Int32 EditableExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const
 {
     return m_pImpl->GetComponentColorCount(_sName);
 }
 // -----------------------------------------------------------------------------
-ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const
+ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const
 {
     return m_pImpl->GetComponentColorConfigValue(_sName,_nPos);
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString EditableExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const
+OUString EditableExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const
 {
     return m_pImpl->GetComponentName(_nPos);
 }
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 03debe3783d3..b3ccb4fb725f 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
-using ::rtl::OUString;
 
 const sal_Char cReplacement[] = "Replacement";
 const sal_Char cFontPairs[] = "FontPairs";
@@ -50,7 +49,7 @@ struct SvtFontSubstConfig_Impl
 };
 
 SvtFontSubstConfig::SvtFontSubstConfig() :
-    ConfigItem(rtl::OUString("Office.Common/Font/Substitution")),
+    ConfigItem(OUString("Office.Common/Font/Substitution")),
     bIsEnabled(sal_False),
     pImpl(new SvtFontSubstConfig_Impl)
 {
@@ -69,13 +68,13 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
     Sequence<OUString> aPropNames(aNodeNames.getLength() * 4);
     OUString* pNames = aPropNames.getArray();
     sal_Int32 nName = 0;
-    sPropPrefix += rtl::OUString("/");
+    sPropPrefix += OUString("/");
     sal_Int32 nNode;
     for(nNode = 0; nNode < aNodeNames.getLength(); nNode++)
     {
         OUString sStart(sPropPrefix);
         sStart += pNodeNames[nNode];
-        sStart += rtl::OUString("/");
+        sStart += OUString("/");
         pNames[nName] = sStart;     pNames[nName++] += cReplaceFont;
         pNames[nName] = sStart;     pNames[nName++] += cSubstituteFont;
         pNames[nName] = sStart;     pNames[nName++] += cAlways;
@@ -100,7 +99,7 @@ SvtFontSubstConfig::~SvtFontSubstConfig()
     delete pImpl;
 }
 
-void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< OUString >& )
 {
 }
 
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index f5a9d053eaa7..6380e9534a28 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -35,7 +35,6 @@ using namespace utl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star;
 
-using ::rtl::OUString;
 
 static SvtHelpOptions_Impl* pOptions = NULL;
 static sal_Int32           nRefCount = 0;
@@ -70,8 +69,8 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
 public:
                     SvtHelpOptions_Impl();
 
-    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
-    void            Load( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aPropertyNames);
+    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames );
+    void            Load( const ::com::sun::star::uno::Sequence< OUString>& aPropertyNames);
     virtual void    Commit();
 
     void            SetExtendedHelp( sal_Bool b )           { bExtendedHelp= b; SetModified(); }
@@ -102,7 +101,7 @@ protected:
     void    implLoadURLCounters();
     void    implSaveURLCounters();
     // to be called with aIgnoreCounterSafety locked
-    void    implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter );
+    void    implGetURLCounters( Sequence< OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter );
 };
 
 Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
@@ -162,8 +161,8 @@ SvtHelpOptions_Impl::SvtHelpOptions_Impl()
 }
 
 // -----------------------------------------------------------------------
-static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
-                const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames)
+static int lcl_MapPropertyName( const OUString rCompare,
+                const uno::Sequence< OUString>& aInternalPropertyNames)
 {
     for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp)
     {
@@ -173,9 +172,9 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
     return -1;
 }
 
-void  SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rPropertyNames)
+void  SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames)
 {
-    const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames());
+    const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames());
     Sequence< Any > aValues = GetProperties( rPropertyNames );
     const Any* pValues = aValues.getConstArray();
     DBG_ASSERT( aValues.getLength() == rPropertyNames.getLength(), "GetProperties failed" );
@@ -189,7 +188,7 @@ void  SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
             if ( pValues[nProp].hasValue() )
             {
                 sal_Bool bTmp = sal_Bool();
-                ::rtl::OUString aTmpStr;
+                OUString aTmpStr;
                 sal_Int32 nTmpInt = 0;
                 if ( pValues[nProp] >>= bTmp )
                 {
@@ -260,29 +259,29 @@ void  SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
 
 // -----------------------------------------------------------------------
 
-void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters )
+void SvtHelpOptions_Impl::implGetURLCounters( Sequence< OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters )
 {
     // the ignore counters for the help agent URLs
-    const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" );
-    const ::rtl::OUString sPathSeparator( "/" );
-    const ::rtl::OUString sURLLocalPath( "/Name" );
-    const ::rtl::OUString sCounterLocalPath( "/Counter" );
+    const OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" );
+    const OUString sPathSeparator( "/" );
+    const OUString sURLLocalPath( "/Name" );
+    const OUString sCounterLocalPath( "/Counter" );
 
     // get the names of all the nodes containing ignore counters
     // collect the node names we have to ask
     // first get the node names of all children of HelpAgent/IgnoreList
     _rNodeNames = GetNodeNames(sIgnoreListNodePath);
-    const ::rtl::OUString* pIgnoredURLsNodes = _rNodeNames.getConstArray();
-    const ::rtl::OUString* pIgnoredURLsNodesEnd = pIgnoredURLsNodes + _rNodeNames.getLength();
+    const OUString* pIgnoredURLsNodes = _rNodeNames.getConstArray();
+    const OUString* pIgnoredURLsNodesEnd = pIgnoredURLsNodes + _rNodeNames.getLength();
 
     // then assemble the two lists (of node paths) for the URLs and the counters
-    Sequence< ::rtl::OUString > aIgnoredURLs(_rNodeNames.getLength());
-    Sequence< ::rtl::OUString > aIgnoredURLsCounter(_rNodeNames.getLength());
-    ::rtl::OUString* pIgnoredURLs = aIgnoredURLs.getArray();
-    ::rtl::OUString* pIgnoredURLsCounter = aIgnoredURLsCounter.getArray();
+    Sequence< OUString > aIgnoredURLs(_rNodeNames.getLength());
+    Sequence< OUString > aIgnoredURLsCounter(_rNodeNames.getLength());
+    OUString* pIgnoredURLs = aIgnoredURLs.getArray();
+    OUString* pIgnoredURLsCounter = aIgnoredURLsCounter.getArray();
     for (;pIgnoredURLsNodes != pIgnoredURLsNodesEnd; ++pIgnoredURLsNodes, ++pIgnoredURLs, ++pIgnoredURLsCounter)
     {
-        ::rtl::OUString sLocalURLAccess = sIgnoreListNodePath;
+        OUString sLocalURLAccess = sIgnoreListNodePath;
         sLocalURLAccess += sPathSeparator;
         sLocalURLAccess += *pIgnoredURLsNodes;
 
@@ -323,36 +322,36 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
 {
     ::osl::MutexGuard aGuard(aIgnoreCounterSafety);
 
-    const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" );
-    const ::rtl::OUString sPathSeparator( "/" );
-    const ::rtl::OUString sURLLocalPath( "/Name" );
-    const ::rtl::OUString sCounterLocalPath( "/Counter" );
+    const OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" );
+    const OUString sPathSeparator( "/" );
+    const OUString sURLLocalPath( "/Name" );
+    const OUString sCounterLocalPath( "/Counter" );
 
     // get the current URL/counter pairs (as they're persistent at the moment)
-    Sequence< ::rtl::OUString > aNodeNames;
+    Sequence< OUString > aNodeNames;
     Sequence< Any >             aURLs;
     Sequence< Any >             aCounters;
 
     implGetURLCounters(aNodeNames, aURLs, aCounters);
     sal_Int32 nKnownURLs = aURLs.getLength();
 
-    const ::rtl::OUString* pNodeNames   = aNodeNames.getConstArray();
+    const OUString* pNodeNames   = aNodeNames.getConstArray();
     const Any* pURLs                    = aURLs.getConstArray();
     const Any* pCounters                = aCounters.getConstArray();
 
     // check which of them must be deleted/modified
-    Sequence< ::rtl::OUString >     aDeleteFromConfig(nKnownURLs);  // names of nodes to be deleted
-    ::rtl::OUString*                pDeleteFromConfig = aDeleteFromConfig.getArray();
-    ::std::set< ::rtl::OUString >   aAlreadyPresent;    // URLs currently persistent
+    Sequence< OUString >     aDeleteFromConfig(nKnownURLs);  // names of nodes to be deleted
+    OUString*                pDeleteFromConfig = aDeleteFromConfig.getArray();
+    ::std::set< OUString >   aAlreadyPresent;    // URLs currently persistent
 
     // for modifying already existent nodes
-    Sequence< ::rtl::OUString > aNewCounterNodePaths(nKnownURLs);
+    Sequence< OUString > aNewCounterNodePaths(nKnownURLs);
     Sequence< Any >             aNewCounterValues(nKnownURLs);
-    ::rtl::OUString*            pNewCounterNodePaths = aNewCounterNodePaths.getArray();
+    OUString*            pNewCounterNodePaths = aNewCounterNodePaths.getArray();
     Any*                        pNewCounterValues = aNewCounterValues.getArray();
 
     // temporaries needed inside the loop
-    ::rtl::OUString sCurrentURL, sCurrentURLNodeName;
+    OUString sCurrentURL, sCurrentURLNodeName;
 
     for (sal_Int32 i=0; i<nKnownURLs; ++i, ++pNodeNames, ++pURLs, ++pCounters)
     {
@@ -407,10 +406,10 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
     }
 
     // and for the new ones ...
-    ::rtl::OUString sNewNodeName;
-    Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2);
+    OUString sNewNodeName;
+    Sequence< OUString > aNewCounterDataNodeNames(2);
     Sequence< Any >             aNewCounterDataValues(2);
-    const ::rtl::OUString sNodeNameBase( "URL" );
+    const OUString sNodeNameBase( "URL" );
     for (   ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin();
             aCollectNew != aURLIgnoreCounters.end();
             ++aCollectNew
@@ -451,7 +450,7 @@ void SvtHelpOptions_Impl::implLoadURLCounters()
 {
     ::osl::MutexGuard aGuard(aIgnoreCounterSafety);
 
-    Sequence< ::rtl::OUString > aNodeNames;
+    Sequence< OUString > aNodeNames;
     Sequence< Any >             aURLs;
     Sequence< Any >             aCounters;
 
@@ -461,7 +460,7 @@ void SvtHelpOptions_Impl::implLoadURLCounters()
     const Any* pURLs = aURLs.getConstArray();
     const Any* pCounters = aCounters.getConstArray();
 
-    ::rtl::OUString sCurrentURL;
+    OUString sCurrentURL;
     sal_Int32 nCurrentCounter;
     for (sal_Int32 i=0; i<nKnownURLs; ++i, ++pURLs, ++pCounters)
     {
@@ -504,14 +503,14 @@ void SvtHelpOptions_Impl::Commit()
                 break;
 
             case LOCALE:
-                pValues[nProp] <<= ::rtl::OUString(aLocale);
+                pValues[nProp] <<= OUString(aLocale);
                 break;
 
             case SYSTEM:
-                pValues[nProp] <<= ::rtl::OUString(aSystem);
+                pValues[nProp] <<= OUString(aSystem);
                 break;
             case STYLESHEET :
-                pValues[nProp] <<= ::rtl::OUString(sHelpStyleSheet);
+                pValues[nProp] <<= OUString(sHelpStyleSheet);
             break;
 
         }
@@ -524,7 +523,7 @@ void SvtHelpOptions_Impl::Commit()
 
 // -----------------------------------------------------------------------
 
-void SvtHelpOptions_Impl::Notify( const Sequence<rtl::OUString>& aPropertyNames )
+void SvtHelpOptions_Impl::Notify( const Sequence<OUString>& aPropertyNames )
 {
     Load( aPropertyNames );
 }
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 7cfcddf3706f..f3f2e7d03158 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -41,7 +41,6 @@
 using namespace utl;
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 struct HtmlOptions_Impl
 {
@@ -249,7 +248,7 @@ void SvxHtmlOptions::CallListeners()
 }
 
 
-void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< OUString >& )
 {
     Load( GetPropertyNames() );
     CallListeners();
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index beb5e478c585..856125f4a8d2 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -61,8 +61,8 @@ ItemHolder2::ItemHolder2()
         if(bMessage)
         {
             bMessage = sal_False;
-            ::rtl::OString sMsg("CreateInstance with arguments exception: ");
-            sMsg += ::rtl::OString(rEx.Message.getStr(),
+            OString sMsg("CreateInstance with arguments exception: ");
+            sMsg += OString(rEx.Message.getStr(),
                         rEx.Message.getLength(),
                         RTL_TEXTENCODING_ASCII_US);
             OSL_FAIL(sMsg.getStr());
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 6b03eb937ad5..2191a9d020cd 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -181,13 +181,13 @@ class SvtMiscOptions_Impl : public ConfigItem
         { return m_bIsSymbolsSizeRO; }
 
         sal_Int16 GetSymbolsStyle() const;
-        ::rtl::OUString GetSymbolsStyleName() const;
+        OUString GetSymbolsStyleName() const;
         sal_Int16 GetCurrentSymbolsStyle() const;
 
         inline void SetSymbolsStyle( sal_Int16 nSet )
-        { ImplSetSymbolsStyle( true, nSet, ::rtl::OUString() ); }
+        { ImplSetSymbolsStyle( true, nSet, OUString() ); }
 
-        inline void SetSymbolsStyleName( ::rtl::OUString &rName )
+        inline void SetSymbolsStyleName( OUString &rName )
         { ImplSetSymbolsStyle( false, 0, rName ); }
 
         inline sal_Bool IsGetSymbolsStyleReadOnly()
@@ -247,7 +247,7 @@ class SvtMiscOptions_Impl : public ConfigItem
         static Sequence< OUString > GetPropertyNames();
 
     protected:
-        void ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const ::rtl::OUString &rName );
+        void ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const OUString &rName );
 };
 
 //*****************************************************************************************************************
@@ -356,7 +356,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
 
             case PROPERTYHANDLE_SYMBOLSTYLE :
             {
-                ::rtl::OUString aSymbolsStyle;
+                OUString aSymbolsStyle;
                 if( seqValues[nProperty] >>= aSymbolsStyle )
                     SetSymbolsStyleName( aSymbolsStyle );
                 else
@@ -411,8 +411,8 @@ SvtMiscOptions_Impl::~SvtMiscOptions_Impl()
     }
 }
 
-static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
-                const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames)
+static int lcl_MapPropertyName( const OUString rCompare,
+                const uno::Sequence< OUString>& aInternalPropertyNames)
 {
     for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp)
     {
@@ -424,7 +424,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
 
 void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
 {
-    const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames());
+    const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames());
     Sequence< Any > seqValues = GetProperties( rPropertyNames  );
 
     // Safe impossible cases.
@@ -483,7 +483,7 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
                                                         }
                                                     break;
             case PROPERTYHANDLE_SYMBOLSTYLE         :   {
-                                                            ::rtl::OUString aSymbolsStyle;
+                                                            OUString aSymbolsStyle;
                                                             if( seqValues[nProperty] >>= aSymbolsStyle )
                                                                 SetSymbolsStyleName( aSymbolsStyle );
                                                             else
@@ -550,7 +550,7 @@ sal_Int16 SvtMiscOptions_Impl::GetSymbolsStyle() const
     return (sal_Int16)Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
 }
 
-::rtl::OUString SvtMiscOptions_Impl::GetSymbolsStyleName() const
+OUString SvtMiscOptions_Impl::GetSymbolsStyleName() const
 {
     return Application::GetSettings().GetStyleSettings().GetSymbolsStyleName();
 }
@@ -560,7 +560,7 @@ sal_Int16 SvtMiscOptions_Impl::GetCurrentSymbolsStyle() const
     return (sal_Int16)Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyle();
 }
 
-void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const ::rtl::OUString &rName )
+void SvtMiscOptions_Impl::ImplSetSymbolsStyle( bool bValue, sal_Int16 nSet, const OUString &rName )
 {
     if ( ( bValue && ( nSet != GetSymbolsStyle() ) ) ||
          ( !bValue && ( rName != GetSymbolsStyleName() ) ) )
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 415c501121fa..9af953964bdb 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -174,7 +174,7 @@ public:
 //---------------------------------------------------------------------------------------------------------
 
     virtual void Commit();
-    virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+    virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
 
 //---------------------------------------------------------------------------------------------------------
 //  public interface
@@ -684,7 +684,7 @@ void SvtOptionsDrawinglayer_Impl::Commit()
     PutProperties( aSeqNames, aSeqValues );
 }
 
-void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<OUString>& )
 {
 }
 
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 3dfbd2998a13..ffae299aafc9 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -105,9 +105,9 @@ public:
 //-------------------------------------------------------------------------------------------------------------
 
 private:
-    void impl_setValue (const ::rtl::OUString& sProp,
+    void impl_setValue (const OUString& sProp,
                               ::sal_Bool       bNew );
-    void impl_setValue (const ::rtl::OUString& sProp,
+    void impl_setValue (const OUString& sProp,
                               ::sal_Int16      nNew );
 
 //-------------------------------------------------------------------------------------------------------------
@@ -135,7 +135,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
             using comphelper::string::getTokenCount;
             using comphelper::string::getToken;
             sal_Int32 nTokenCount = getTokenCount(rConfigRoot, '/');
-            rtl::OUString sTok = getToken(rConfigRoot, nTokenCount - 1, '/');
+            OUString sTok = getToken(rConfigRoot, nTokenCount - 1, '/');
             m_xCfg->getByName(sTok) >>= m_xNode;
         }
     }
@@ -447,7 +447,7 @@ SvtPrintOptions_Impl::~SvtPrintOptions_Impl()
     m_xCfg.clear();
 }
 
-void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
+void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
                                                 ::sal_Bool       bNew )
 {
     try
@@ -475,7 +475,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
     }
 }
 
-void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
+void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
                                                 ::sal_Int16      nNew )
 {
     try
diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index 5906a03cd4fd..cf0208ea0ac7 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -183,8 +183,8 @@ SvtSlideSorterBarOptions_Impl::~SvtSlideSorterBarOptions_Impl()
     Commit();
 }
 
-static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
-                const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames)
+static int lcl_MapPropertyName( const OUString rCompare,
+                const uno::Sequence< OUString>& aInternalPropertyNames)
 {
     for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp)
     {
@@ -196,7 +196,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
 
 void SvtSlideSorterBarOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
 {
-    const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames());
+    const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames());
     Sequence< Any > seqValues = GetProperties( rPropertyNames  );
 
     // Safe impossible cases.
diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx
index 8f92b94a323b..2e62765b49d1 100644
--- a/svtools/source/config/toolpanelopt.cxx
+++ b/svtools/source/config/toolpanelopt.cxx
@@ -181,8 +181,8 @@ SvtToolPanelOptions_Impl::~SvtToolPanelOptions_Impl()
     Commit();
 }
 
-static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
-                const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames)
+static int lcl_MapPropertyName( const OUString rCompare,
+                const uno::Sequence< OUString>& aInternalPropertyNames)
 {
     for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp)
     {
@@ -194,7 +194,7 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
 
 void SvtToolPanelOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
 {
-    const uno::Sequence< ::rtl::OUString> aInternalPropertyNames( GetPropertyNames());
+    const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames());
     Sequence< Any > seqValues = GetProperties( rPropertyNames  );
 
     // Safe impossible cases.