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

25 files changed, 103 insertions, 103 deletions

diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index 613fca989aa4..7dd741592015 100644
--- a/svl/inc/svl/aeitem.hxx
+++ b/svl/inc/svl/aeitem.hxx
@@ -44,14 +44,14 @@ public:
                             ~SfxAllEnumItem();
 
     void                    InsertValue( sal_uInt16 nValue );
-    void                    InsertValue( sal_uInt16 nValue, const rtl::OUString &rText );
+    void                    InsertValue( sal_uInt16 nValue, const OUString &rText );
     void                    RemoveValue( sal_uInt16 nValue );
 
     sal_uInt16              GetPosByValue( sal_uInt16 nValue ) const;
 
     virtual sal_uInt16      GetValueCount() const;
     virtual sal_uInt16      GetValueByPos( sal_uInt16 nPos ) const;
-    virtual rtl::OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual OUString   GetValueTextByPos( sal_uInt16 nPos ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, sal_uInt16 nVersion) const;
     virtual sal_Bool        IsEnabled( sal_uInt16 ) const;
diff --git a/svl/inc/svl/asiancfg.hxx b/svl/inc/svl/asiancfg.hxx
index db213c8f16f7..9824a6a7a059 100644
--- a/svl/inc/svl/asiancfg.hxx
+++ b/svl/inc/svl/asiancfg.hxx
@@ -53,12 +53,12 @@ public:
     GetStartEndCharLocales() const;
 
     bool GetStartEndChars(
-        com::sun::star::lang::Locale const & locale, rtl::OUString & startChars,
-        rtl::OUString & endChars) const;
+        com::sun::star::lang::Locale const & locale, OUString & startChars,
+        OUString & endChars) const;
 
     void SetStartEndChars(
         com::sun::star::lang::Locale const & locale,
-        rtl::OUString const * startChars, rtl::OUString const * endChars);
+        OUString const * startChars, OUString const * endChars);
 
 private:
     struct Impl;
diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 470c6d6f8cc4..35024c3a6d44 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -52,7 +52,7 @@ public:
 
     virtual sal_uInt16 GetValueCount() const = 0;
 
-    virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
+    virtual OUString GetValueTextByPos(sal_uInt16 nPos) const;
 
     virtual sal_uInt16 GetValueByPos(sal_uInt16 nPos) const;
 
@@ -158,7 +158,7 @@ public:
 
     virtual sal_uInt16 GetValueCount() const;
 
-    virtual rtl::OUString GetValueTextByVal(sal_Bool bTheValue) const;
+    virtual OUString GetValueTextByVal(sal_Bool bTheValue) const;
 
     sal_Bool GetValue() const { return m_bValue; }
 
diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index d810a1b4752b..581c558b2575 100644
--- a/svl/inc/svl/cntwall.hxx
+++ b/svl/inc/svl/cntwall.hxx
@@ -31,7 +31,7 @@ class SvStream;
 class SVL_DLLPUBLIC CntWallpaperItem : public SfxPoolItem
 {
 private:
-    rtl::OUString           _aURL;
+    OUString           _aURL;
     Color                   _nColor;
     sal_uInt16              _nStyle;
 
@@ -55,11 +55,11 @@ public:
     virtual bool            PutValue  ( const com::sun::star::uno::Any& rVal,
                                          sal_uInt8 nMemberId = 0 );
 
-    void                    SetBitmapURL( const rtl::OUString& rURL ) { _aURL = rURL; }
+    void                    SetBitmapURL( const OUString& rURL ) { _aURL = rURL; }
     void                    SetColor( Color nColor ) { _nColor = nColor; }
     void                    SetStyle( sal_uInt16 nStyle ) { _nStyle = nStyle; }
 
-    const rtl::OUString&    GetBitmapURL() const { return _aURL; }
+    const OUString&    GetBitmapURL() const { return _aURL; }
     Color                   GetColor() const { return _nColor; }
     sal_uInt16              GetStyle() const { return _nStyle; }
 };
diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx
index f0c105e17200..437b59fbf127 100644
--- a/svl/inc/svl/documentlockfile.hxx
+++ b/svl/inc/svl/documentlockfile.hxx
@@ -39,14 +39,14 @@ class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > OpenStream();
 
-    void WriteEntryToStream( ::com::sun::star::uno::Sequence< ::rtl::OUString > aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream );
+    void WriteEntryToStream( ::com::sun::star::uno::Sequence< OUString > aEntry, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xStream );
 
 public:
-    DocumentLockFile( const ::rtl::OUString& aOrigURL );
+    DocumentLockFile( const OUString& aOrigURL );
     ~DocumentLockFile();
 
     sal_Bool CreateOwnLockFile();
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > GetLockData();
+    ::com::sun::star::uno::Sequence< OUString > GetLockData();
     sal_Bool OverwriteOwnLockFile();
     void RemoveFile();
 
diff --git a/svl/inc/svl/filenotation.hxx b/svl/inc/svl/filenotation.hxx
index 91686dedf16c..00c2c16ed77c 100644
--- a/svl/inc/svl/filenotation.hxx
+++ b/svl/inc/svl/filenotation.hxx
@@ -34,8 +34,8 @@ namespace svt
     class SVL_DLLPUBLIC OFileNotation
     {
     protected:
-        ::rtl::OUString     m_sSystem;
-        ::rtl::OUString     m_sFileURL;
+        OUString     m_sSystem;
+        OUString     m_sFileURL;
 
     public:
         enum NOTATION
@@ -44,15 +44,15 @@ namespace svt
             N_URL
         };
 
-        OFileNotation( const ::rtl::OUString& _rUrlOrPath );
-        OFileNotation( const ::rtl::OUString& _rUrlOrPath, NOTATION _eInputNotation );
+        OFileNotation( const OUString& _rUrlOrPath );
+        OFileNotation( const OUString& _rUrlOrPath, NOTATION _eInputNotation );
 
-        ::rtl::OUString get(NOTATION _eOutputNotation);
+        OUString get(NOTATION _eOutputNotation);
 
     private:
-        SVL_DLLPRIVATE void construct( const ::rtl::OUString& _rUrlOrPath );
-        SVL_DLLPRIVATE bool    implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath );
-        SVL_DLLPRIVATE bool    implInitWithURLNotation( const ::rtl::OUString& _rURL );
+        SVL_DLLPRIVATE void construct( const OUString& _rUrlOrPath );
+        SVL_DLLPRIVATE bool    implInitWithSystemNotation( const OUString& _rSystemPath );
+        SVL_DLLPRIVATE bool    implInitWithURLNotation( const OUString& _rURL );
     };
 
 //.........................................................................
diff --git a/svl/inc/svl/fstathelper.hxx b/svl/inc/svl/fstathelper.hxx
index ec92dee4a8d0..9e69c6ed28ec 100644
--- a/svl/inc/svl/fstathelper.hxx
+++ b/svl/inc/svl/fstathelper.hxx
@@ -39,18 +39,18 @@ namespace FStatHelper {
 
     @return     it was be able to get the date/time stamp
 */
-SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const rtl::OUString& rURL,
+SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const OUString& rURL,
                                     Date* pDate, Time* pTime );
 
 /** Return if under the URL a document exist. This is only a wrapper for the
     UCB.IsContent.
 */
-SVL_DLLPUBLIC sal_Bool IsDocument( const rtl::OUString& rURL );
+SVL_DLLPUBLIC sal_Bool IsDocument( const OUString& rURL );
 
 /** Return if under the URL a folder exist. This is only a wrapper for the
     UCB.isFolder.
 */
-SVL_DLLPUBLIC sal_Bool IsFolder( const rtl::OUString& rURL );
+SVL_DLLPUBLIC sal_Bool IsFolder( const OUString& rURL );
 
 }
 
diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index 3a2c208b654b..48fca19aa5d6 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -256,7 +256,7 @@ public:
 
     static INetContentType GetContentType(OUString const & rTypeName);
 
-    static rtl::OUString GetContentType(INetContentType eTypeID);
+    static OUString GetContentType(INetContentType eTypeID);
 
     static OUString GetPresentation(INetContentType eTypeID,
                                     const LanguageTag& aLocale);
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index 8636c2847c7f..ab9ff84d173d 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -129,7 +129,7 @@ protected:
 public:
                                     SfxItemPool( const SfxItemPool &rPool,
                                                  sal_Bool bCloneStaticDefaults = sal_False );
-                                    SfxItemPool( const rtl::OUString &rName,
+                                    SfxItemPool( const OUString &rName,
                                                  sal_uInt16 nStart, sal_uInt16 nEnd,
                                                  const SfxItemInfo *pItemInfos,
                                                  SfxPoolItem **pDefaults = 0,
@@ -158,7 +158,7 @@ public:
                                         const IntlWrapper * pIntlWrapper
                                          = 0 ) const;
     virtual SfxItemPool*            Clone() const;
-    const rtl::OUString&            GetName() const;
+    const OUString&            GetName() const;
 
     virtual const SfxPoolItem&      Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 );
     virtual void                    Remove( const SfxPoolItem& );
diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx
index 055948bad54e..c1b7ed68b400 100644
--- a/svl/inc/svl/itemprop.hxx
+++ b/svl/inc/svl/itemprop.hxx
@@ -72,7 +72,7 @@ struct SfxItemPropertySimpleEntry
 };
 struct SfxItemPropertyNamedEntry : public SfxItemPropertySimpleEntry
 {
-    ::rtl::OUString sName;
+    OUString sName;
     SfxItemPropertyNamedEntry( const String& rName, const SfxItemPropertySimpleEntry& rSimpleEntry) :
         SfxItemPropertySimpleEntry( rSimpleEntry ),
         sName( rName ){}
@@ -88,11 +88,11 @@ public:
     SfxItemPropertyMap( const SfxItemPropertyMap& rSource );
     ~SfxItemPropertyMap();
 
-    const SfxItemPropertySimpleEntry*  getByName( const ::rtl::OUString &rName ) const;
+    const SfxItemPropertySimpleEntry*  getByName( const OUString &rName ) const;
     com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const;
-    com::sun::star::beans::Property getPropertyByName( const ::rtl::OUString rName ) const
+    com::sun::star::beans::Property getPropertyByName( const OUString rName ) const
         throw( ::com::sun::star::beans::UnknownPropertyException );
-    sal_Bool hasPropertyByName( const ::rtl::OUString& rName ) const;
+    sal_Bool hasPropertyByName( const OUString& rName ) const;
 
     void mergeProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rPropSeq );
     PropertyEntryVector_t getPropertyEntries() const;
@@ -116,13 +116,13 @@ public:
                                           const SfxItemSet& rSet,
                                           com::sun::star::uno::Any& rAny) const
                                           throw(::com::sun::star::uno::RuntimeException);
-    void getPropertyValue( const ::rtl::OUString &rName,
+    void getPropertyValue( const OUString &rName,
                                             const SfxItemSet& rSet,
                                             com::sun::star::uno::Any& rAny) const
                                             throw(::com::sun::star::uno::RuntimeException,
                                                     ::com::sun::star::beans::UnknownPropertyException);
     com::sun::star::uno::Any
-        getPropertyValue( const ::rtl::OUString &rName,
+        getPropertyValue( const OUString &rName,
                                             const SfxItemSet& rSet ) const
                                             throw(::com::sun::star::uno::RuntimeException,
                                                     ::com::sun::star::beans::UnknownPropertyException);
@@ -131,7 +131,7 @@ public:
                                           SfxItemSet& rSet ) const
                                           throw(::com::sun::star::uno::RuntimeException,
                                                   com::sun::star::lang::IllegalArgumentException);
-    void                    setPropertyValue( const ::rtl::OUString& rPropertyName,
+    void                    setPropertyValue( const OUString& rPropertyName,
                                             const com::sun::star::uno::Any& aVal,
                                             SfxItemSet& rSet ) const
                                             throw(::com::sun::star::uno::RuntimeException,
@@ -139,7 +139,7 @@ public:
                                                     ::com::sun::star::beans::UnknownPropertyException);
 
     com::sun::star::beans::PropertyState
-        getPropertyState(const ::rtl::OUString& rName, const SfxItemSet& rSet)const
+        getPropertyState(const OUString& rName, const SfxItemSet& rSet)const
                                     throw(com::sun::star::beans::UnknownPropertyException);
     com::sun::star::beans::PropertyState
         getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const
@@ -166,12 +166,12 @@ public:
             throw(::com::sun::star::uno::RuntimeException);
 
     virtual ::com::sun::star::beans::Property SAL_CALL
-        getPropertyByName( const ::rtl::OUString& aName )
+        getPropertyByName( const OUString& aName )
             throw(::com::sun::star::beans::UnknownPropertyException,
                     ::com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL
-        hasPropertyByName( const ::rtl::OUString& Name )
+        hasPropertyByName( const OUString& Name )
             throw(::com::sun::star::uno::RuntimeException);
 
 };
@@ -190,11 +190,11 @@ public:
             throw(::com::sun::star::uno::RuntimeException);
 
     virtual ::com::sun::star::beans::Property SAL_CALL
-        getPropertyByName( const ::rtl::OUString& aName )
+        getPropertyByName( const OUString& aName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL
-        hasPropertyByName( const ::rtl::OUString& Name )
+        hasPropertyByName( const OUString& Name )
             throw(::com::sun::star::uno::RuntimeException);
 };
 
diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index 6bb0b5ed693a..ef8fb1b4ae5d 100644
--- a/svl/inc/svl/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.hxx
@@ -96,14 +96,14 @@ public:
 class SVL_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem
 {
 private:
-    ::rtl::OUString m_sWin16SystemLocale;
+    OUString m_sWin16SystemLocale;
 
 public:
     SvtSystemLanguageOptions();
     ~SvtSystemLanguageOptions();
 
     virtual void    Commit();
-    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
+    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames );
 
     LanguageType GetWin16SystemLanguage();
 };
diff --git a/svl/inc/svl/lngmisc.hxx b/svl/inc/svl/lngmisc.hxx
index 72b5aab2b04a..c1b4a0160277 100644
--- a/svl/inc/svl/lngmisc.hxx
+++ b/svl/inc/svl/lngmisc.hxx
@@ -43,12 +43,12 @@ namespace linguistic
         return cChar < static_cast<sal_Unicode>(' ');
     }
 
-    SVL_DLLPRIVATE sal_Int32 GetNumControlChars( const rtl::OUString &rTxt );
+    SVL_DLLPRIVATE sal_Int32 GetNumControlChars( const OUString &rTxt );
 
-    SVL_DLLPUBLIC bool RemoveHyphens(rtl::OUString &rTxt);
-    SVL_DLLPUBLIC bool RemoveControlChars(rtl::OUString &rTxt);
-    SVL_DLLPUBLIC bool ReplaceControlChars(rtl::OUString &rTxt);
-    SVL_DLLPUBLIC ::rtl::OUString GetThesaurusReplaceText(const ::rtl::OUString &rText);
+    SVL_DLLPUBLIC bool RemoveHyphens(OUString &rTxt);
+    SVL_DLLPUBLIC bool RemoveControlChars(OUString &rTxt);
+    SVL_DLLPUBLIC bool ReplaceControlChars(OUString &rTxt);
+    SVL_DLLPUBLIC OUString GetThesaurusReplaceText(const OUString &rText);
 } // namespace linguistic
 
 #endif
diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx
index bcf0d58088dd..b9f62cd78504 100644
--- a/svl/inc/svl/lockfilecommon.hxx
+++ b/svl/inc/svl/lockfilecommon.hxx
@@ -45,21 +45,21 @@ class SVL_DLLPUBLIC LockFileCommon
 {
 protected:
     ::osl::Mutex m_aMutex;
-    ::rtl::OUString m_aURL;
+    OUString m_aURL;
 
     INetURLObject ResolveLinks( const INetURLObject& aDocURL );
 
 public:
-    LockFileCommon( const ::rtl::OUString& aOrigURL, const ::rtl::OUString& aPrefix );
+    LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix );
     ~LockFileCommon();
 
-    static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer );
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
-    static ::rtl::OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
-    static ::rtl::OUString EscapeCharacters( const ::rtl::OUString& aSource );
-    static ::rtl::OUString GetOOOUserName();
-    static ::rtl::OUString GetCurrentLocalTime();
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > GenerateOwnEntry();
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > ParseList( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer );
+    static ::com::sun::star::uno::Sequence< OUString > ParseEntry( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
+    static OUString ParseName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& o_nCurPos );
+    static OUString EscapeCharacters( const OUString& aSource );
+    static OUString GetOOOUserName();
+    static OUString GetCurrentLocalTime();
+    static ::com::sun::star::uno::Sequence< OUString > GenerateOwnEntry();
 };
 
 }
diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index 8433ddb664a5..9d73f6a3ded3 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -60,25 +60,25 @@ class SjJSbxObject;
 
 class SVL_DLLPUBLIC SvxMacro
 {
-    ::rtl::OUString aMacName;
-    ::rtl::OUString aLibName;
+    OUString aMacName;
+    OUString aLibName;
     // Fuer JavaScript muss ein Function-Objekt gehalten werden
     SjJSbxObjectBase* pFunctionObject;
     ScriptType eType;
 
 public:
 
-    SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLanguage);
+    SvxMacro( const OUString &rMacName, const OUString &rLanguage);
 
-    SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLibName,
+    SvxMacro( const OUString &rMacName, const OUString &rLibName,
                 ScriptType eType); //  = STARBASIC entfernt
 
-    SvxMacro( SjJSbxObjectBase* _pFunctionObject, const ::rtl::OUString &rSource );
+    SvxMacro( SjJSbxObjectBase* _pFunctionObject, const OUString &rSource );
     ~SvxMacro();    // noetig fuer pFunctionObject
 
-    const ::rtl::OUString &GetLibName() const        { return aLibName; }
-    const ::rtl::OUString &GetMacName() const        { return aMacName; }
-    ::rtl::OUString GetLanguage()const;
+    const OUString &GetLibName() const        { return aLibName; }
+    const OUString &GetMacName() const        { return aMacName; }
+    OUString GetLanguage()const;
 
     ScriptType GetScriptType() const        { return eType; }
 
@@ -93,12 +93,12 @@ public:
     SvxMacro& operator=( const SvxMacro& rBase );
 };
 
-inline SvxMacro::SvxMacro( const ::rtl::OUString &rMacName, const ::rtl::OUString &rLibName,
+inline SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLibName,
                             ScriptType eTyp )
     : aMacName( rMacName ), aLibName( rLibName ), pFunctionObject(NULL), eType( eTyp )
 {}
 
-inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const ::rtl::OUString &rSource )
+inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const OUString &rSource )
     : aMacName( rSource ), pFunctionObject( _pFunctionObject ), eType( JAVASCRIPT )
 {}
 
diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index 5597f8ff10d6..e4cead159c8b 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -40,17 +40,17 @@ class SvCommand
     aus: Kommando = Argument.
 */
 {
-    ::rtl::OUString aCommand;
-    ::rtl::OUString aArgument;
+    OUString aCommand;
+    OUString aArgument;
 public:
                     SvCommand() {}
-    SvCommand( const ::rtl::OUString & rCommand, const ::rtl::OUString & rArg )
+    SvCommand( const OUString & rCommand, const OUString & rArg )
                     {
                         aCommand = rCommand;
                         aArgument = rArg;
                     }
-    const ::rtl::OUString & GetCommand() const { return aCommand; }
-    const ::rtl::OUString & GetArgument() const { return aArgument; }
+    const OUString & GetCommand() const { return aCommand; }
+    const OUString & GetArgument() const { return aArgument; }
 };
 
 typedef ::std::vector< SvCommand > SvCommandList_impl;
@@ -68,8 +68,8 @@ private:
     SvCommandList_impl  aCommandList;
 
 public:
-    SvCommand&      Append( const ::rtl::OUString & rCommand, const ::rtl::OUString & rArg );
-    bool        AppendCommands( const ::rtl::OUString & rCmd, sal_Int32 * pEaten );
+    SvCommand&      Append( const OUString & rCommand, const OUString & rArg );
+    bool        AppendCommands( const OUString & rCmd, sal_Int32 * pEaten );
 
     bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
     void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index 4e50e1ceb270..2feea5f5ddbd 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -234,7 +234,7 @@ public:
 
         @return  True if the string was successfuly read and reconstructed.
      */
-    static rtl::OUString readByteString(SvStream & rStream);
+    static OUString readByteString(SvStream & rStream);
 
     /** Write a byte string representation of a Unicode string into a stream.
 
@@ -244,7 +244,7 @@ public:
         @param rString  Some Unicode string.
      */
     static void writeByteString(SvStream & rStream,
-                                const rtl::OUString& rString);
+                                const OUString& rString);
 
     /** Read in a Unicode string from either a streamed Unicode or byte string
         representation.
@@ -257,7 +257,7 @@ public:
 
         @return          On success, returns the reconstructed Unicode string.
      */
-    static rtl::OUString readUnicodeString(SvStream & rStream, bool bUnicode);
+    static OUString readUnicodeString(SvStream & rStream, bool bUnicode);
 
     /** Write a Unicode string representation of a Unicode string into a
         stream.
@@ -267,7 +267,7 @@ public:
         @param rString  Some Unicode string.
      */
     static void writeUnicodeString(SvStream & rStream,
-                                   const rtl::OUString& rString);
+                                   const OUString& rString);
 
 private:
     SfxPoolItem&             operator=( const SfxPoolItem& );    // n.i.!!
diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx
index 8ac3abacd969..d2c842d98ebb 100644
--- a/svl/inc/svl/sharecontrolfile.hxx
+++ b/svl/inc/svl/sharecontrolfile.hxx
@@ -47,7 +47,7 @@ class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable;
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate;
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > m_aUsersData;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > m_aUsersData;
 
     void OpenStream();
     void Close();
@@ -59,14 +59,14 @@ class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon
 public:
 
     // The constructor will throw exception in case the stream can not be opened
-    ShareControlFile( const ::rtl::OUString& aOrigURL );
+    ShareControlFile( const OUString& aOrigURL );
     ~ShareControlFile();
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > GetUsersData();
-    void SetUsersDataAndStore( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aUserNames );
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > InsertOwnEntry();
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > GetUsersData();
+    void SetUsersDataAndStore( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aUserNames );
+    ::com::sun::star::uno::Sequence< OUString > InsertOwnEntry();
     bool HasOwnEntry();
-    void RemoveEntry( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aOptionalSpecification = ::com::sun::star::uno::Sequence< ::rtl::OUString >() );
+    void RemoveEntry( const ::com::sun::star::uno::Sequence< OUString >& aOptionalSpecification = ::com::sun::star::uno::Sequence< OUString >() );
     void RemoveFile();
 };
 
diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index a374377bfef0..90c873119b80 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -50,8 +50,8 @@ public:
     virtual void            SetString( const XubString& );
     virtual XubString       GetString();
 
-    void                    SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList );
-    void                    GetStringList( com::sun::star::uno::Sequence< rtl::OUString >& rList ) const;
+    void                    SetStringList( const com::sun::star::uno::Sequence< OUString >& rList );
+    void                    GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const;
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 739b985278cb..5d4413ea8cab 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -92,7 +92,7 @@ public:
                                     OUString &rText, const IntlWrapper * = 0 ) const;
 
     // ConfigItem
-    virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
+    virtual void            Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames );
     virtual void            Commit();
 
             sal_uInt16      GetCommand() const { return nCommand; }
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index e1c1b554ee36..664ca5cb1ec2 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -110,10 +110,10 @@ public:
 
     /** returns the display name of this style, it is used at the user interface.
         If the display name is empty, this method returns the internal name. */
-    virtual rtl::OUString GetDisplayName() const;
+    virtual OUString GetDisplayName() const;
 
     // sets the display name of this style
-    virtual void SetDisplayName( const rtl::OUString& );
+    virtual void SetDisplayName( const OUString& );
 
     virtual const UniString& GetParent() const;
     virtual bool SetParent( const UniString& );
@@ -169,7 +169,7 @@ public:
     virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx);
     virtual SfxStyleSheetBase* First();
     virtual SfxStyleSheetBase* Next();
-    virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr);
+    virtual SfxStyleSheetBase* Find(const OUString& rStr);
     virtual ~SfxStyleSheetIterator();
 
 protected:
@@ -284,7 +284,7 @@ public:
 
 protected:
     SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2
-        : SfxStyleSheetBase(rtl::OUString("dummy"),
+        : SfxStyleSheetBase(OUString("dummy"),
             NULL, SFX_STYLE_FAMILY_ALL, 0)
     {
         assert(false);
diff --git a/svl/inc/svl/stylepool.hxx b/svl/inc/svl/stylepool.hxx
index 172b152fd116..deaed2591a83 100644
--- a/svl/inc/svl/stylepool.hxx
+++ b/svl/inc/svl/stylepool.hxx
@@ -73,7 +73,7 @@ public:
 
     virtual ~StylePool();
 
-    static ::rtl::OUString nameOf( SfxItemSet_Pointer_t pSet );
+    static OUString nameOf( SfxItemSet_Pointer_t pSet );
 };
 
 class SVL_DLLPUBLIC IStylePoolIteratorAccess
@@ -83,7 +83,7 @@ public:
         If there is no more SfxItemSet, the delivered share_pointer is empty.
     */
     virtual StylePool::SfxItemSet_Pointer_t getNext() = 0;
-    virtual ::rtl::OUString getName() = 0;
+    virtual OUString getName() = 0;
     virtual ~IStylePoolIteratorAccess() {};
 };
 #endif
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index 785c1f4183da..c8a08beffbb9 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -108,7 +108,7 @@ public:
     virtual        ~DdeTransaction();
 
     bool            IsBusy() { return bBusy; }
-    const rtl::OUString GetName() const;
+    const OUString GetName() const;
 
     void            Execute();
 
@@ -258,7 +258,7 @@ public:
                     DdeItem( const DdeItem& );
                     virtual ~DdeItem();
 
-    const rtl::OUString GetName() const;
+    const OUString GetName() const;
     short           GetLinks();
     void            NotifyClient();
 };
@@ -294,7 +294,7 @@ public:
     virtual sal_Bool    Put( const DdeData* );
     virtual sal_Bool    Execute( const String* );
         // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden
-    virtual sal_Bool MakeItem( const rtl::OUString& rItem );
+    virtual sal_Bool MakeItem( const OUString& rItem );
 
         // es wird ein Warm-/Hot-Link eingerichtet. Return-Wert
         // besagt ob es geklappt hat
@@ -308,7 +308,7 @@ private:
 
 private:
     DdeString*      pName;
-    rtl::OUString   aItem;
+    OUString   aItem;
     std::vector<DdeItem*> aItems;
     Link            aConnectLink;
     Link            aDisconnectLink;
@@ -317,10 +317,10 @@ private:
     Link            aExecLink;
 
 public:
-                    DdeTopic( SAL_UNUSED_PARAMETER const rtl::OUString& );
+                    DdeTopic( SAL_UNUSED_PARAMETER const OUString& );
     virtual        ~DdeTopic();
 
-    const rtl::OUString GetName() const;
+    const OUString GetName() const;
     long            GetConvId();
 
     void            SetConnectHdl( const Link& rLink ) { aConnectLink = rLink; }
@@ -340,7 +340,7 @@ public:
     void            InsertItem( DdeItem* );     // fuer eigene Ableitungen!
     DdeItem*        AddItem( const DdeItem& );  // werden kopiert !
     void            RemoveItem( const DdeItem& );
-    const rtl::OUString&   GetCurItem() { return aItem;  }
+    const OUString&   GetCurItem() { return aItem;  }
     const std::vector<DdeItem*>& GetItems() const  { return aItems; }
 
 private:
@@ -360,7 +360,7 @@ public:
     virtual sal_Bool    IsBusy();
     virtual String  GetHelp();
         // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden
-    virtual sal_Bool    MakeTopic( const rtl::OUString& rItem );
+    virtual sal_Bool    MakeTopic( const OUString& rItem );
 
 protected:
     virtual String  Topics();
@@ -385,7 +385,7 @@ public:
                     DdeService( SAL_UNUSED_PARAMETER const String& );
     virtual        ~DdeService();
 
-    const rtl::OUString GetName() const;
+    const OUString GetName() const;
     short           GetError()              { return nStatus; }
 
     static DdeServices& GetServices();
diff --git a/svl/inc/svl/urihelper.hxx b/svl/inc/svl/urihelper.hxx
index c00d5331472a..321d9cd2ae0b 100644
--- a/svl/inc/svl/urihelper.hxx
+++ b/svl/inc/svl/urihelper.hxx
@@ -92,7 +92,7 @@ SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference
 normalizedMakeRelative(
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
     const & context,
-    rtl::OUString const & baseUriReference, rtl::OUString const & uriReference);
+    OUString const & baseUriReference, OUString const & uriReference);
 
 /**
    A variant of normalizedMakeRelative with a simplified interface.
diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx
index a5ad679f8665..adb72d0578e7 100644
--- a/svl/inc/svl/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
@@ -75,7 +75,7 @@ public:
 
     virtual sal_uInt16 GetValueCount() const;
 
-    virtual rtl::OUString GetValueTextByVal(sal_Bool bTheValue) const;
+    virtual OUString GetValueTextByVal(sal_Bool bTheValue) const;
 
     sal_Bool GetValue() const { return m_nValue.bVisible; }
 
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index dd8e9ff60f50..20cc4d110c24 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -683,7 +683,7 @@ private:
         {
             return ImpGetNatNumString( rNum, nVal, nMinDigits );
         }
-        return rtl::OUString::valueOf(nVal);
+        return OUString::valueOf(nVal);
     }
 
     // transliterate according to NativeNumber