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

38 files changed, 412 insertions, 412 deletions

diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 7a6ef2ac439e..192400756382 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -50,63 +50,63 @@ public:
     BreakIteratorImpl();
     ~BreakIteratorImpl();
 
-    virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
         sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
         sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
-    virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
-    virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual sal_Bool SAL_CALL isBeginWord( const OUString& Text, sal_Int32 nPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual sal_Bool SAL_CALL isEndWord( const OUString& Text, sal_Int32 nPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual sal_Int16 SAL_CALL getWordType( const OUString& Text, sal_Int32 nPos,
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
         const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL beginOfScript( const OUString& Text, sal_Int32 nStartPos,
         sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfScript( const OUString& Text, sal_Int32 nStartPos,
         sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL previousScript( const OUString& Text, sal_Int32 nStartPos,
         sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL nextScript( const OUString& Text, sal_Int32 nStartPos,
         sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL previousCharBlock( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw( com::sun::star::uno::RuntimeException );
 
     static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar);
@@ -125,11 +125,11 @@ private :
     com::sun::star::uno::Reference < XBreakIterator > xBI;
     com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
 
-    sal_Bool SAL_CALL createLocaleSpecificBreakIterator( const rtl::OUString& aLocaleName )
+    sal_Bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName )
         throw( com::sun::star::uno::RuntimeException );
     com::sun::star::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const com::sun::star::lang::Locale& rLocale )
         throw( com::sun::star::uno::RuntimeException );
-    const com::sun::star::lang::Locale& SAL_CALL getLocaleByScriptType(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& Text,
+    const com::sun::star::lang::Locale& SAL_CALL getLocaleByScriptType(const com::sun::star::lang::Locale& rLocale, const OUString& Text,
         sal_Int32 nStartPos, sal_Bool forward, sal_Bool skipWhiteSpace)
         throw(com::sun::star::uno::RuntimeException);
 
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index d4189922bac5..1f1632618844 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -31,23 +31,23 @@ class BreakIterator_CJK : public BreakIterator_Unicode
 public:
     BreakIterator_CJK();
 
-    Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
             const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType)
             throw(com::sun::star::uno::RuntimeException);
-    Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
             const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType)
             throw(com::sun::star::uno::RuntimeException);
-    Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
+    Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
             const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
             throw(com::sun::star::uno::RuntimeException);
-    LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
+    LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
         const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
         throw(com::sun::star::uno::RuntimeException);
 
 protected:
     xdictionary *dict;
-    rtl::OUString hangingCharacters;
+    OUString hangingCharacters;
 };
 
 #define BREAKITERATOR_CJK( lang ) \
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index f4466b530af5..270f64b395e4 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -32,23 +32,23 @@ class BreakIterator_CTL : public BreakIterator_Unicode
 public:
     BreakIterator_CTL();
     ~BreakIterator_CTL();
-    virtual sal_Int32 SAL_CALL previousCharacters(const rtl::OUString& text, sal_Int32 start,
+    virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start,
         const lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
         sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL nextCharacters(const rtl::OUString& text, sal_Int32 start,
+    virtual sal_Int32 SAL_CALL nextCharacters(const OUString& text, sal_Int32 start,
         const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
         sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException);
-    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
         const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
         throw(com::sun::star::uno::RuntimeException);
 protected:
-    rtl::OUString cachedText; // for cell index
+    OUString cachedText; // for cell index
     sal_Int32* nextCellIndex;
     sal_Int32* previousCellIndex;
     sal_Int32 cellIndexSize;
 
-    virtual void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
 };
 
 } } } }
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index fed7ad6e7151..19dbeae87e30 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -32,7 +32,7 @@ public:
     ~BreakIterator_th();
 
 protected:
-    void SAL_CALL makeIndex(const rtl::OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
+    void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(com::sun::star::uno::RuntimeException);
 };
 
 } } } }
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index fe226d4c5b41..2b45fb091f02 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -39,36 +39,36 @@ public:
     BreakIterator_Unicode();
     ~BreakIterator_Unicode();
 
-    virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
         sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
         sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual Boundary SAL_CALL previousWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
-    virtual Boundary SAL_CALL nextWord( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException);
-    virtual Boundary SAL_CALL getWordBoundary( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException);
 
-    virtual LineBreakResults SAL_CALL getLineBreak( const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
         const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
         throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw( com::sun::star::uno::RuntimeException );
 
 protected:
@@ -77,7 +77,7 @@ protected:
 
     struct BI_Data
     {
-        rtl::OUString aICUText;
+        OUString aICUText;
         UText *ut;
         icu::BreakIterator *aBreakIterator;
         com::sun::star::lang::Locale maLocale;
@@ -98,7 +98,7 @@ protected:
     sal_Int16 aBreakType;
 
     void SAL_CALL loadICUBreakIterator(const com::sun::star::lang::Locale& rLocale,
-        sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const rtl::OUString& rText) throw(com::sun::star::uno::RuntimeException);
+        sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText) throw(com::sun::star::uno::RuntimeException);
 };
 
 } } } }
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index baf0b600c71f..cc7cafcc3068 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -54,10 +54,10 @@ public:
 
     // Methods
     virtual void SAL_CALL loadDefaultCalendar(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
     virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException);
     virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException);
@@ -72,10 +72,10 @@ public:
     virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
 
     // Methods in XExtendedCalendar
-    virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
 
     // XCalendar3
     virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException);
@@ -85,15 +85,15 @@ public:
     virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException);
 
 private:
     struct lookupTableItem {
-    lookupTableItem(const rtl::OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 >& _xCalendar) :
+    lookupTableItem(const OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 >& _xCalendar) :
         uniqueID(_uniqueID), xCalendar(_xCalendar) {}
-    rtl::OUString uniqueID;
+    OUString uniqueID;
     com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 > xCalendar;
     };
     std::vector<lookupTableItem*> lookupTable;
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index 929f759b2a6b..691af7f9fca9 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -56,7 +56,7 @@ public:
     ~Calendar_gregorian();
 
     // Methods in XCalendar
-    virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException);
     virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException);
@@ -64,7 +64,7 @@ public:
     virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException);
     virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException);
     virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException);
@@ -73,10 +73,10 @@ public:
     virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
 
     // Methods in XExtendedCalendar
-    virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
 
     // XCalendar3
     virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException);
@@ -86,9 +86,9 @@ public:
     virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException);
 
 protected:
     Era *eraArray;
@@ -104,7 +104,7 @@ protected:
     virtual void mapFromGregorian() throw(com::sun::star::uno::RuntimeException);
     void getValue() throw(com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (com::sun::star::uno::RuntimeException);
+    OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (com::sun::star::uno::RuntimeException);
 
 private:
     Calendar2 aCalendar;
@@ -136,8 +136,8 @@ class Calendar_hanja : public Calendar_gregorian
 public:
     // Constructors
     Calendar_hanja();
-    virtual void SAL_CALL loadCalendar(const rtl::OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException);
 };
 
 //  ----------------------------------------------------
@@ -170,7 +170,7 @@ public:
     Calendar_buddhist();
 
     // Methods in XExtendedCalendar
-    virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
 };
 
 } } } }
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index f31003e93430..e76bdec4254a 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.hxx
@@ -34,7 +34,7 @@ public:
     Calendar_jewish();
 
     // Methods in XExtendedCalendar
-    virtual rtl::OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException);
 
 protected:
     void mapToGregorian() throw(com::sun::star::uno::RuntimeException);
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index d515cfd2b3d3..bace88f5592e 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -38,32 +38,32 @@ public:
     cclass_Unicode(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
     ~cclass_Unicode();
 
-    virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+    virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+    virtual OUString SAL_CALL toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
+    virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos )  throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos )  throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos,
+    virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos, sal_Int32 nCount,
+    virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos,
-        const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart,
-        sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
-    virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const rtl::OUString& Text,
+    virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
+        const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
+        sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
+    virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text,
         sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
-        const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
-        const rtl::OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
+        const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
+        const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
 
 protected:
     const sal_Char *cClass;
@@ -123,8 +123,8 @@ private:
     com::sun::star::lang::Locale    aParserLocale;
     com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData;
     com::sun::star::uno::Reference < com::sun::star::i18n::XNativeNumberSupplier > xNatNumSup;
-    rtl::OUString             aStartChars;
-    rtl::OUString             aContChars;
+    OUString             aStartChars;
+    OUString             aContChars;
     UPT_FLAG_TYPE*              pTable;
     UPT_FLAG_TYPE*              pStart;
     UPT_FLAG_TYPE*              pCont;
@@ -151,26 +151,26 @@ private:
 
     /// Setup parser table. Calls initParserTable() only if needed.
     void setupParserTable( const com::sun::star::lang::Locale& rLocale, sal_Int32 startCharTokenType,
-        const rtl::OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
-        const rtl::OUString& userDefinedCharactersCont );
+        const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
+        const OUString& userDefinedCharactersCont );
 
     /// Init parser table.
     void initParserTable( const com::sun::star::lang::Locale& rLocale, sal_Int32 startCharTokenType,
-        const rtl::OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
-        const rtl::OUString& userDefinedCharactersCont );
+        const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
+        const OUString& userDefinedCharactersCont );
 
     /// Destroy parser table.
     void destroyParserTable();
 
     /// Parse a text.
-    void parseText( ParseResult& r, const rtl::OUString& rText, sal_Int32 nPos,
+    void parseText( ParseResult& r, const OUString& rText, sal_Int32 nPos,
         sal_Int32 nTokenType = 0xffffffff );
 
     /// Setup International class, new'ed only if different from existing.
     sal_Bool setupInternational( const com::sun::star::lang::Locale& rLocale );
 
     /// Implementation of getCharacterType() for one single character
-    sal_Int32 SAL_CALL getCharType( const rtl::OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
+    sal_Int32 SAL_CALL getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
 
 };
 
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 83518d64a812..c9723563c3dd 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -35,14 +35,14 @@ public:
     // Destructor
     ~ChapterCollator();
 
-    sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
-    sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException);
+    sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
+    sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
 
 private :
     // CharacterClassification Implementation
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 2c7d34bbeb47..141fcac04e93 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -39,53 +39,53 @@ public:
     CharacterClassificationImpl( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
     virtual ~CharacterClassificationImpl();
 
-    virtual rtl::OUString SAL_CALL toUpper( const rtl::OUString& Text,
+    virtual OUString SAL_CALL toUpper( const OUString& Text,
         sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL toLower( const rtl::OUString& Text,
+    virtual OUString SAL_CALL toLower( const OUString& Text,
         sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL toTitle( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos,
         sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getType( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getCharacterDirection( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getScript( const rtl::OUString& Text, sal_Int32 nPos )
+    virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getCharacterType( const rtl::OUString& text, sal_Int32 nPos,
+    virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos,
         const com::sun::star::lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getStringType( const rtl::OUString& text, sal_Int32 nPos,
+    virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos,
         sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException);
-    virtual ParseResult SAL_CALL parseAnyToken( const rtl::OUString& Text, sal_Int32 nPos,
+    virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
         const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
-        const rtl::OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
-        const rtl::OUString& userDefinedCharactersCont )
+        const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
+        const OUString& userDefinedCharactersCont )
         throw(com::sun::star::uno::RuntimeException);
     virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType,
-        const rtl::OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale,
-        sal_Int32 nStartCharFlags, const rtl::OUString& userDefinedCharactersStart,
-        sal_Int32 nContCharFlags, const rtl::OUString& userDefinedCharactersCont )
+        const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale,
+        sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
+        sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont )
         throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void)
+    virtual OUString SAL_CALL getImplementationName(void)
                 throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
         throw( com::sun::star::uno::RuntimeException );
 
 private:
     struct lookupTableItem {
-        lookupTableItem(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rName,
+        lookupTableItem(const com::sun::star::lang::Locale& rLocale, const OUString& rName,
         com::sun::star::uno::Reference < XCharacterClassification >& rxCI) :
         aLocale(rLocale), aName(rName), xCI(rxCI) {};
         com::sun::star::lang::Locale aLocale;
-        rtl::OUString aName;
+        OUString aName;
         com::sun::star::uno::Reference < XCharacterClassification > xCI;
         sal_Bool SAL_CALL equals(const com::sun::star::lang::Locale& rLocale) {
         return aLocale.Language == rLocale.Language &&
@@ -102,7 +102,7 @@ private:
     com::sun::star::uno::Reference < XCharacterClassification > SAL_CALL
     getLocaleSpecificCharacterClassification(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
     sal_Bool SAL_CALL
-    createLocaleSpecificCharacterClassification(const rtl::OUString& serviceName, const com::sun::star::lang::Locale& rLocale);
+    createLocaleSpecificCharacterClassification(const OUString& serviceName, const com::sun::star::lang::Locale& rLocale);
 
 };
 
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 52409c59796f..b6ba6398f5df 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -47,43 +47,43 @@ public:
     // Destructor
     ~CollatorImpl();
 
-    virtual sal_Int32 SAL_CALL compareSubstring(const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL compareSubstring(const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL compareString( const rtl::OUString& s1,
-        const rtl::OUString& s2) throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL compareString( const OUString& s1,
+        const OUString& s2) throw(com::sun::star::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale,  sal_Int32 collatorOptions)
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(  const rtl::OUString& impl, const lang::Locale& rLocale,
+    virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(  const OUString& impl, const lang::Locale& rLocale,
         sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString& impl, const lang::Locale& rLocale,
+    virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString& impl, const lang::Locale& rLocale,
         const com::sun::star::uno::Sequence< sal_Int32 >& collatorOptions) throw(com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale )
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const rtl::OUString& collatorAlgorithmName )
+    virtual com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName )
         throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
 
 protected:
     lang::Locale nLocale;
 private :
     struct lookupTableItem {
         lang::Locale aLocale;
-        rtl::OUString algorithm;
-        rtl::OUString service;
+        OUString algorithm;
+        OUString service;
         com::sun::star::uno::Reference < XCollator > xC;
-        lookupTableItem(const lang::Locale& rLocale, const rtl::OUString& _algorithm, const rtl::OUString& _service,
+        lookupTableItem(const lang::Locale& rLocale, const OUString& _algorithm, const OUString& _service,
         com::sun::star::uno::Reference < XCollator >& _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {}
-        sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const rtl::OUString& _algorithm) {
+        sal_Bool SAL_CALL equals(const lang::Locale& rLocale, const OUString& _algorithm) {
         return aLocale.Language == rLocale.Language &&
             aLocale.Country == rLocale.Country &&
             aLocale.Variant == rLocale.Variant &&
@@ -98,9 +98,9 @@ private :
     // lang::Locale Data
     com::sun::star::uno::Reference < XLocaleData4 > mxLocaleData;
 
-    sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const rtl::OUString& serviceName,
-        const rtl::OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException);
-    void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm)
+    sal_Bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName,
+        const OUString& rSortAlgorithm) throw(com::sun::star::uno::RuntimeException);
+    void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm)
         throw(com::sun::star::uno::RuntimeException);
 };
 
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index c3a5491d45fa..daf99068e156 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -40,30 +40,30 @@ public:
     // Destructor
     ~Collator_Unicode();
 
-    sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
+    sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
 
-    sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2)
+    sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
         throw(com::sun::star::uno::RuntimeException);
 
-    sal_Int32 SAL_CALL loadCollatorAlgorithm( const rtl::OUString& impl, const lang::Locale& rLocale,
+    sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale,
         sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException);
 
 
     // following 4 methods are implemented in collatorImpl.
     sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&,  sal_Int32)
         throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
-    void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString&, const lang::Locale&,
+    void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const lang::Locale&,
         const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&)
+    com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&)
         throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
-    com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const rtl::OUString& )
+    com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& )
         throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();}
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
 
 protected:
     const sal_Char *implementationName;
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 53f56e5158dd..94a18f8beb5c 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -39,9 +39,9 @@ class DefaultNumberingProvider : public cppu::WeakImplHelper4
     com::sun::star::lang::XServiceInfo
 >
 {
-    void GetCharStrN( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
-    void GetCharStr( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
-    void GetRomanString( sal_Int32 nValue, sal_Int16 nType, rtl::OUString& rStr ) const;
+    void GetCharStrN( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
+    void GetCharStr( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
+    void GetRomanString( sal_Int32 nValue, sal_Int16 nType, OUString& rStr ) const;
     void impl_loadTranslit();
 public:
     DefaultNumberingProvider(
@@ -60,7 +60,7 @@ public:
         throw(com::sun::star::uno::RuntimeException);
 
     //XNumberingFormatter
-    virtual rtl::OUString SAL_CALL makeNumberingString(
+    virtual OUString SAL_CALL makeNumberingString(
         const com::sun::star::uno::Sequence<
         com::sun::star::beans::PropertyValue >& aProperties,
         const com::sun::star::lang::Locale& aLocale )
@@ -70,27 +70,27 @@ public:
     //XNumberingTypeInfo
     virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes(  )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getNumberingType( const rtl::OUString& NumberingIdentifier )
+    virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier )
         throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasNumberingType( const rtl::OUString& NumberingIdentifier )
+    virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier )
         throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType )
+    virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType )
         throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void)
+    virtual OUString SAL_CALL getImplementationName(void)
                 throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
                 throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
                 throw( com::sun::star::uno::RuntimeException );
 private:
     com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
     com::sun::star::uno::Reference < com::sun::star::container::XHierarchicalNameAccess > xHierarchicalNameAccess;
     TransliterationImpl* translit;
-    rtl::OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index )
+    OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index )
         throw(com::sun::star::uno::RuntimeException);
-    sal_Bool SAL_CALL isScriptFlagEnabled(const rtl::OUString& aName )
+    sal_Bool SAL_CALL isScriptFlagEnabled(const OUString& aName )
         throw(com::sun::star::uno::RuntimeException);
 };
 } } } }
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 698e93df19ea..bda8f3f831da 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -42,60 +42,60 @@ public:
     virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList()
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList(
+    virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList(
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL loadAlgorithm(
         const com::sun::star::lang::Locale& rLocale,
-        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+        const OUString& SortAlgorithm, sal_Int32 collatorOptions )
         throw (com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL usePhoneticEntry(
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry,
+    virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry,
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+    virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
+        const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
-        const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
-        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+    virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
+        const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
+        const OUString& IndexEntry2, const OUString& PhoneticEntry2,
         const com::sun::star::lang::Locale& rLocale2 )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& IndexEntry,
-        const com::sun::star::lang::Locale& rLocale, const rtl::OUString& SortAlgorithm )
+    virtual OUString SAL_CALL getIndexCharacter( const OUString& IndexEntry,
+        const com::sun::star::lang::Locale& rLocale, const OUString& SortAlgorithm )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
+    virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw( com::sun::star::uno::RuntimeException );
 
 private:
-    rtl::OUString aServiceName;
+    OUString aServiceName;
     com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES;
     com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext;
-    sal_Bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const rtl::OUString& name) throw( com::sun::star::uno::RuntimeException );
+    sal_Bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( com::sun::star::uno::RuntimeException );
     com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > SAL_CALL getLocaleSpecificIndexEntrySupplier(
-        const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm) throw (com::sun::star::uno::RuntimeException);
+        const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm) throw (com::sun::star::uno::RuntimeException);
 
 protected:
     com::sun::star::lang::Locale aLocale;
-    rtl::OUString aSortAlgorithm;
+    OUString aSortAlgorithm;
 };
 
 } } } }
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index d15ae9703655..687698e45af3 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -34,19 +34,19 @@ public:
     IndexEntrySupplier_asian( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
     ~IndexEntrySupplier_asian();
 
-    rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,
-            const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm )
+    OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
+            const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm )
             throw (com::sun::star::uno::RuntimeException);
-    rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& rIndexEntry,
-            const rtl::OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale)
+    OUString SAL_CALL getIndexKey( const OUString& rIndexEntry,
+            const OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale)
             throw (com::sun::star::uno::RuntimeException);
     sal_Int16 SAL_CALL compareIndexEntry(
-            const rtl::OUString& rIndexEntry1, const rtl::OUString& rPhoneticEntry1,
+            const OUString& rIndexEntry1, const OUString& rPhoneticEntry1,
             const com::sun::star::lang::Locale& rLocale1,
-            const rtl::OUString& rIndexEntry2, const rtl::OUString& rPhoneticEntry2,
+            const OUString& rIndexEntry2, const OUString& rPhoneticEntry2,
             const com::sun::star::lang::Locale& rLocale2 )
             throw (com::sun::star::uno::RuntimeException);
-    rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& rIndexEntry,
+    OUString SAL_CALL getPhoneticCandidate( const OUString& rIndexEntry,
             const com::sun::star::lang::Locale& rLocale )
             throw (com::sun::star::uno::RuntimeException);
 #ifndef DISABLE_DYNLOADING
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index 65277c2b5220..c006ad64dc7d 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -44,7 +44,7 @@ public:
     virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList()
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getAlgorithmList(
+    virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList(
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
@@ -52,50 +52,50 @@ public:
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getPhoneticCandidate( const rtl::OUString& IndexEntry,
+    virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry,
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL loadAlgorithm(
         const com::sun::star::lang::Locale& rLocale,
-        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+        const OUString& SortAlgorithm, sal_Int32 collatorOptions )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+    virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
+        const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
-        const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
-        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+    virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
+        const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
+        const OUString& IndexEntry2, const OUString& PhoneticEntry2,
         const com::sun::star::lang::Locale& rLocale2 )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,
-        const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm )
+    virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
+        const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
+    virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
         const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw( com::sun::star::uno::RuntimeException );
 
 protected:
     const sal_Char *implementationName;
     sal_Bool usePhonetic;
     CollatorImpl *collator;
-    const rtl::OUString& SAL_CALL getEntry( const rtl::OUString& IndexEntry,
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+    const OUString& SAL_CALL getEntry( const OUString& IndexEntry,
+        const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
     com::sun::star::lang::Locale aLocale;
-    rtl::OUString aAlgorithm;
+    OUString aAlgorithm;
 };
 
 } } } }
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index 757a849af46a..37fffddc3831 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -35,21 +35,21 @@ public:
 
     virtual sal_Bool SAL_CALL loadAlgorithm(
         const com::sun::star::lang::Locale& rLocale,
-        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions )
+        const OUString& SortAlgorithm, sal_Int32 collatorOptions )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry,
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
+    virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
+        const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,
-        const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
-        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,
+    virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
+        const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,
+        const OUString& IndexEntry2, const OUString& PhoneticEntry2,
         const com::sun::star::lang::Locale& rLocale2 )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,
-        const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm )
+    virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
+        const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm )
         throw (com::sun::star::uno::RuntimeException);
 
 private:
@@ -58,8 +58,8 @@ private:
 
 struct IndexKey {
     sal_Unicode key;
-    rtl::OUString mkey;
-    rtl::OUString desc;
+    OUString mkey;
+    OUString desc;
 };
 
 class IndexTable
@@ -84,11 +84,11 @@ public:
     Index(const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext);
     ~Index();
 
-    void init(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm) throw (com::sun::star::uno::RuntimeException);
+    void init(const com::sun::star::lang::Locale& rLocale, const OUString& algorithm) throw (com::sun::star::uno::RuntimeException);
 
-    void makeIndexKeys(const com::sun::star::lang::Locale &rLocale, const rtl::OUString &algorithm) throw (com::sun::star::uno::RuntimeException);
-    sal_Int16 getIndexWeight(const rtl::OUString& rIndexEntry);
-    rtl::OUString getIndexDescription(const rtl::OUString& rIndexEntry);
+    void makeIndexKeys(const com::sun::star::lang::Locale &rLocale, const OUString &algorithm) throw (com::sun::star::uno::RuntimeException);
+    sal_Int16 getIndexWeight(const OUString& rIndexEntry);
+    OUString getIndexDescription(const OUString& rIndexEntry);
 
     IndexTable tables[MAX_TABLES];
     sal_Int16 table_count;
@@ -96,7 +96,7 @@ public:
     sal_Int16 key_count;
     sal_Int16 mkeys[MAX_KEYS];
     sal_Int16 mkey_count;
-    rtl::OUString skipping_chars;
+    OUString skipping_chars;
     CollatorImpl *collator;
     sal_Int16 compare(sal_Unicode c1, sal_Unicode c2);
 };
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 33c8f7378390..85204c805f8f 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -33,15 +33,15 @@ public:
     IndexEntrySupplier_ja_phonetic( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext ) : IndexEntrySupplier_Common(rxContext) {
         implementationName = "com.sun.star.i18n.IndexEntrySupplier_ja_phonetic";
     };
-    virtual rtl::OUString SAL_CALL getIndexCharacter( const rtl::OUString& rIndexEntry,\
-        const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rSortAlgorithm ) \
+    virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,\
+        const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) \
         throw (com::sun::star::uno::RuntimeException);\
-    virtual rtl::OUString SAL_CALL getIndexKey( const rtl::OUString& IndexEntry, \
-        const rtl::OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )\
+    virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, \
+        const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )\
         throw (com::sun::star::uno::RuntimeException);\
-    virtual sal_Int16 SAL_CALL compareIndexEntry( const rtl::OUString& IndexEntry1,\
-        const rtl::OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,\
-        const rtl::OUString& IndexEntry2, const ::rtl::OUString& PhoneticEntry2,\
+    virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,\
+        const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,\
+        const OUString& IndexEntry2, const OUString& PhoneticEntry2,\
         const com::sun::star::lang::Locale& rLocale2 )\
         throw (com::sun::star::uno::RuntimeException);\
 };
@@ -54,7 +54,7 @@ public:\
     };\
     virtual sal_Bool SAL_CALL loadAlgorithm(\
         const com::sun::star::lang::Locale& rLocale,\
-        const rtl::OUString& SortAlgorithm, sal_Int32 collatorOptions ) \
+        const OUString& SortAlgorithm, sal_Int32 collatorOptions ) \
         throw (com::sun::star::uno::RuntimeException);\
 };
 
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 780ffe8d402f..925b7d1daabd 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -43,17 +43,17 @@ public:
     InputSequenceCheckerImpl();
     ~InputSequenceCheckerImpl();
 
-    virtual sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw( com::sun::star::uno::RuntimeException );
 
 protected:
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index 6ede14da2cad..c91a3f4750ee 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -35,10 +35,10 @@ public:
     InputSequenceChecker_hi();
     ~InputSequenceChecker_hi();
 
-    sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos,
+    sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
 
-    sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos,
+    sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
 };
 
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index 679dd4fae269..a9e72b12c76d 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -32,10 +32,10 @@ public:
     InputSequenceChecker_th();
     ~InputSequenceChecker_th();
 
-    sal_Bool SAL_CALL checkInputSequence(const rtl::OUString& Text, sal_Int32 nStartPos,
+    sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
 
-    sal_Int32 SAL_CALL correctInputSequence(rtl::OUString& Text, sal_Int32 nStartPos,
+    sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
         sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException);
 };
 
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 350646ad8d83..dbab5ca6d32e 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -83,36 +83,36 @@ public:
     virtual com::sun::star::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getCollatorRuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getTransliterations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getCollatorRuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getTransliterations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getBreakIteratorRules( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
     virtual com::sun::star::uno::Sequence< com::sun::star::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
 
     // XLocaleData4
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
 
     // following methods are used by indexentry service
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getDefaultIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getIndexKeysByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getIndexModuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getDefaultIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getIndexKeysByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getIndexModuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasPhonetic( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPhonetic( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException );
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
 
 private :
     friend sal_Bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2);
@@ -120,13 +120,13 @@ private :
     ::std::auto_ptr< LocaleDataLookupTableItem > cachedItem;
 
     oslGenericFunction SAL_CALL getFunctionSymbol( const com::sun::star::lang::Locale& rLocale, const sal_Char* pFunction ) throw( com::sun::star::uno::RuntimeException );
-    oslGenericFunction SAL_CALL getFunctionSymbolByName( const rtl::OUString& localeName, const sal_Char* pFunction );
+    oslGenericFunction SAL_CALL getFunctionSymbolByName( const OUString& localeName, const sal_Char* pFunction );
     sal_Unicode ** SAL_CALL getIndexArray(const com::sun::star::lang::Locale& rLocale, sal_Int16& indexCount);
-    sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rAlgorithm);
+    sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm);
     com::sun::star::i18n::Calendar2 ref_cal;
-    rtl::OUString ref_name;
+    OUString ref_name;
     com::sun::star::uno::Sequence< com::sun::star::i18n::CalendarItem2 > &
-        getCalendarItemByName(const rtl::OUString& name,
+        getCalendarItemByName(const OUString& name,
         const com::sun::star::lang::Locale& rLocale,
         const com::sun::star::uno::Sequence< com::sun::star::i18n::Calendar2 >& calendarsSeq,
         sal_Int16 item) throw( com::sun::star::uno::RuntimeException );
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index 510b10395f5a..58c7ec4ed85a 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -40,7 +40,7 @@ public:
         NativeNumberSupplier(sal_Bool _useOffset = sal_False) : useOffset(_useOffset) {}
 
         // Methods
-        virtual ::rtl::OUString SAL_CALL getNativeNumberString( const ::rtl::OUString& aNumberString,
+        virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
                 const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
                 throw (::com::sun::star::uno::RuntimeException);
 
@@ -57,15 +57,15 @@ public:
                 throw (::com::sun::star::uno::RuntimeException);
 
         //XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName()
+        virtual OUString SAL_CALL getImplementationName()
                 throw( com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
                 throw( com::sun::star::uno::RuntimeException );
-        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+        virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
                 throw( com::sun::star::uno::RuntimeException );
 
         // following methods are not for XNativeNumberSupplier, they are for calling from transliterations
-        ::rtl::OUString SAL_CALL getNativeNumberString( const ::rtl::OUString& aNumberString,
+        OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
                 const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode,
                 com::sun::star::uno::Sequence< sal_Int32 >& offset  )
                 throw (::com::sun::star::uno::RuntimeException);
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index f89cbfeecbcd..5d6011f896c3 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -46,11 +46,11 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void)
+    virtual OUString SAL_CALL getImplementationName(void)
                 throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
                 throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
                 throw( ::com::sun::star::uno::RuntimeException );
 
 private:
@@ -62,10 +62,10 @@ private:
 
     void setupLocale( const ::com::sun::star::lang::Locale& rLocale );
     void getFormats( const ::com::sun::star::lang::Locale& rLocale );
-    ::rtl::OUString mapElementTypeShortToString(sal_Int16 formatType);
-    sal_Int16 mapElementTypeStringToShort(const ::rtl::OUString& formatType);
-    ::rtl::OUString mapElementUsageShortToString(sal_Int16 formatUsage);
-    sal_Int16 mapElementUsageStringToShort(const ::rtl::OUString& formatUsage);
+    OUString mapElementTypeShortToString(sal_Int16 formatType);
+    sal_Int16 mapElementTypeStringToShort(const OUString& formatType);
+    OUString mapElementUsageShortToString(sal_Int16 formatUsage);
+    sal_Int16 mapElementUsageStringToShort(const OUString& formatUsage);
     void createLocaleDataObject();
 };
 
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index fb746be4bd6f..17d4bc566aee 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -36,12 +36,12 @@ class OrdinalSuffix : public cppu::WeakImplHelper2
         virtual ~OrdinalSuffix();
 
         // XOrdinalSuffix
-        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) throw(com::sun::star::uno::RuntimeException);
+        virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) throw(com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(com::sun::star::uno::RuntimeException);
-        virtual com::sun::star::uno::Sequence < rtl::OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException);
+        virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException);
 
 };
 } } } }
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index e31c97dd7ec0..a6a3cf275a1b 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -41,17 +41,17 @@ public:
 #endif
         ~TextToPronounce_zh();
 
-        rtl::OUString SAL_CALL
-        folding(const rtl::OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 > & offset)
+        OUString SAL_CALL
+        folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 > & offset)
         throw (com::sun::star::uno::RuntimeException);
 
         sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException);
 
         sal_Bool SAL_CALL
-        equals( const rtl::OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const rtl::OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2)
+        equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2)
         throw (com::sun::star::uno::RuntimeException);
 
-        rtl::OUString SAL_CALL
+        OUString SAL_CALL
         transliterateChar2String( sal_Unicode inChar)
         throw(com::sun::star::uno::RuntimeException);
 
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 7e8535d6392c..c4c789729c48 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -44,21 +44,21 @@ public:
         ~TextConversion();
         // Methods
         virtual com::sun::star::i18n::TextConversionResult SAL_CALL
-        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions )
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException ) = 0;
-        virtual rtl::OUString SAL_CALL
-        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        virtual OUString SAL_CALL
+        getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions )
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException ) = 0;
-        virtual rtl::OUString SAL_CALL
-        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        virtual OUString SAL_CALL
+        getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
             throw(  com::sun::star::uno::RuntimeException,
@@ -72,13 +72,13 @@ public:
                     com::sun::star::lang::NoSupportException ) = 0;
 
     //XServiceInfo
-    rtl::OUString SAL_CALL
+    OUString SAL_CALL
         getImplementationName()
             throw( com::sun::star::uno::RuntimeException );
     sal_Bool SAL_CALL
-        supportsService(const rtl::OUString& ServiceName)
+        supportsService(const OUString& ServiceName)
             throw( com::sun::star::uno::RuntimeException );
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
             throw( com::sun::star::uno::RuntimeException );
 protected :
@@ -106,21 +106,21 @@ public:
 
         // Methods
         com::sun::star::i18n::TextConversionResult SAL_CALL
-        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions )
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        OUString SAL_CALL
+        getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions )
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        OUString SAL_CALL
+        getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
             throw(  com::sun::star::uno::RuntimeException,
@@ -141,8 +141,8 @@ private :
         com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL;
         sal_Int32 maxLeftLength;
         sal_Int32 maxRightLength;
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-            getCharConversions(const rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja);
+        com::sun::star::uno::Sequence< OUString > SAL_CALL
+            getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toHanja);
 };
 
 //  ----------------------------------------------------
@@ -162,21 +162,21 @@ public:
 
         // Methods
         com::sun::star::i18n::TextConversionResult SAL_CALL
-        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions )
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        OUString SAL_CALL
+        getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions )
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        OUString SAL_CALL
+        getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
             throw(  com::sun::star::uno::RuntimeException,
@@ -192,7 +192,7 @@ public:
 private :
         // user defined dictionary list
         com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL;
-        rtl::OUString SAL_CALL getWordConversion(const ::rtl::OUString& aText,
+        OUString SAL_CALL getWordConversion(const OUString& aText,
             sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions, com::sun::star::uno::Sequence <sal_Int32>& offset);
         rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, sal_Bool toSChinese, sal_Int32 nConversionOptions);
         com::sun::star::lang::Locale aLocale;
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index a7fd9233c880..4d83cf23228b 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -41,21 +41,21 @@ public:
 
         // Methods
         com::sun::star::i18n::TextConversionResult SAL_CALL
-        getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions )
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversion( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        OUString SAL_CALL
+        getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions )
             throw(  com::sun::star::uno::RuntimeException,
                     com::sun::star::lang::IllegalArgumentException,
                     com::sun::star::lang::NoSupportException );
-        rtl::OUString SAL_CALL
-        getConversionWithOffset( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
+        OUString SAL_CALL
+        getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType,
             sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset )
             throw(  com::sun::star::uno::RuntimeException,
@@ -69,13 +69,13 @@ public:
                     com::sun::star::lang::NoSupportException );
 
     //XServiceInfo
-    rtl::OUString SAL_CALL
+    OUString SAL_CALL
         getImplementationName()
             throw( com::sun::star::uno::RuntimeException );
     sal_Bool SAL_CALL
-        supportsService(const rtl::OUString& ServiceName)
+        supportsService(const OUString& ServiceName)
             throw( com::sun::star::uno::RuntimeException );
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
             throw( com::sun::star::uno::RuntimeException );
 private :
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index fd12616507d1..1e41c5066a67 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -49,54 +49,54 @@ public:
     ~TransliterationImpl();
 
     // Methods
-    virtual rtl::OUString SAL_CALL getName(  ) throw(com::sun::star::uno::RuntimeException) ;
+    virtual OUString SAL_CALL getName(  ) throw(com::sun::star::uno::RuntimeException) ;
     virtual sal_Int16 SAL_CALL getType(  ) throw(com::sun::star::uno::RuntimeException) ;
 
     virtual void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException) ;
     virtual void SAL_CALL loadModuleNew( const com::sun::star::uno::Sequence< TransliterationModulesNew >& modName,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ;
-    virtual void SAL_CALL loadModuleByImplName( const rtl::OUString& implName,
+    virtual void SAL_CALL loadModuleByImplName( const OUString& implName,
         const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist,
+    virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist,
         const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableModules(
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableModules(
         const com::sun::star::lang::Locale& rLocale, sal_Int16 sType )
         throw(com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+    virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
         com::sun::star::uno::Sequence< sal_Int32 >& offset  ) throw(com::sun::star::uno::RuntimeException) ;
 
-    virtual rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+    virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
         com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException);
 
     // Methods in XExtendedTransliteration
-    virtual rtl::OUString SAL_CALL transliterateString2String( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
+    virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
         throw(com::sun::star::uno::RuntimeException) ;
-    virtual rtl::OUString SAL_CALL transliterateChar2String( sal_Unicode inChar )
+    virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar )
         throw(com::sun::star::uno::RuntimeException) ;
     virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar )
         throw(com::sun::star::i18n::MultipleCharsOutputException,
                 com::sun::star::uno::RuntimeException) ;
 
-    virtual sal_Bool SAL_CALL equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1,
-        sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+    virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1,
+        sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1,
-        const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ;
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1,
+        const OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ;
 
-    virtual sal_Int32 SAL_CALL compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL compareString( const rtl::OUString& s1, const rtl::OUString& s2)
+    virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
         throw(com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
         throw( com::sun::star::uno::RuntimeException );
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
         throw( com::sun::star::uno::RuntimeException );
 
 private:
@@ -108,18 +108,18 @@ private:
     com::sun::star::uno::Reference< XLocaleData4 > mxLocaledata;
     com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedTransliteration > caseignore;
 
-    virtual sal_Bool SAL_CALL loadModuleByName( const rtl::OUString& implName,
+    virtual sal_Bool SAL_CALL loadModuleByName( const OUString& implName,
         com::sun::star::uno::Reference<com::sun::star::i18n::XExtendedTransliteration> & body, const com::sun::star::lang::Locale& rLocale)
         throw(com::sun::star::uno::RuntimeException);
 
     void clear();
 
-    void loadBody( ::rtl::OUString &implName,
+    void loadBody( OUString &implName,
         ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration >& body )
         throw (::com::sun::star::uno::RuntimeException);
 
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getRange(
-        const com::sun::star::uno::Sequence< rtl::OUString > &inStrs,
+    com::sun::star::uno::Sequence< OUString > SAL_CALL getRange(
+        const com::sun::star::uno::Sequence< OUString > &inStrs,
         sal_Int32 length, const sal_Int16 _nCascade)
         throw(com::sun::star::uno::RuntimeException);
 };
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index f76ac928c79f..26f92523c8d5 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -36,27 +36,27 @@ namespace com { namespace sun { namespace star { namespace i18n {
 class transliteration_Ignore : public transliteration_commonclass
 {
 public:
-        virtual rtl::OUString SAL_CALL
-        folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
+        virtual OUString SAL_CALL
+        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
         throw(com::sun::star::uno::RuntimeException);
 
         // This method is shared.
         sal_Bool SAL_CALL
-        equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-            const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+        equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+            const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(com::sun::star::uno::RuntimeException);
 
         // This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used.
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
+        com::sun::star::uno::Sequence< OUString > SAL_CALL
+        transliterateRange( const OUString& str1, const OUString& str2 )
         throw(com::sun::star::uno::RuntimeException);
 
 
         // Methods which are shared.
         sal_Int16 SAL_CALL getType(  ) throw(com::sun::star::uno::RuntimeException);
 
-        rtl::OUString SAL_CALL
-        transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  )
+        OUString SAL_CALL
+        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  )
         throw(com::sun::star::uno::RuntimeException);
 
         virtual sal_Unicode SAL_CALL
@@ -64,8 +64,8 @@ public:
         throw(com::sun::star::uno::RuntimeException,
             com::sun::star::i18n::MultipleCharsOutputException);
 
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2, XTransliteration& t1, XTransliteration& t2 )
+        com::sun::star::uno::Sequence< OUString > SAL_CALL
+        transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 )
         throw(com::sun::star::uno::RuntimeException);
 
 protected:
@@ -125,7 +125,7 @@ public:\
             transliterationName = "ignore"#name;\
             implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
         };\
-        rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
+        OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
                 com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); \
 };
 
@@ -153,11 +153,11 @@ public:\
             transliterationName = "ignore"#name;\
             implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
         };\
-        rtl::OUString SAL_CALL folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
+        OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
                 com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); \
         using transliteration_Ignore::transliterateRange;\
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1, \
-                const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException); \
+        com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \
+                const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); \
         sal_Unicode SAL_CALL \
         transliterateChar2Char( sal_Unicode inChar) \
         throw(com::sun::star::uno::RuntimeException,\
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index 2658d0a05dec..585e6014c4b7 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.hxx
@@ -25,8 +25,8 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 class transliteration_Numeric : public transliteration_commonclass {
 public:
-        virtual ::rtl::OUString SAL_CALL
-        transliterate( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
+        virtual OUString SAL_CALL
+        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
         throw(::com::sun::star::uno::RuntimeException);
 
         virtual sal_Unicode SAL_CALL
@@ -37,16 +37,16 @@ public:
         // Methods which are shared.
         virtual sal_Int16 SAL_CALL getType(  ) throw(::com::sun::star::uno::RuntimeException);
 
-        virtual ::rtl::OUString SAL_CALL
-        folding( const ::rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
+        virtual OUString SAL_CALL
+        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset )
         throw(::com::sun::star::uno::RuntimeException);
 
         virtual sal_Bool SAL_CALL
-        equals( const ::rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const ::rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+        equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(::com::sun::star::uno::RuntimeException);
 
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-        transliterateRange( const ::rtl::OUString& str1, const ::rtl::OUString& str2 )
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
+        transliterateRange( const OUString& str1, const OUString& str2 )
         throw(::com::sun::star::uno::RuntimeException);
 protected:
         sal_Int16 nNativeNumberMode;
@@ -54,8 +54,8 @@ protected:
         sal_Unicode* table;
         sal_Bool recycleSymbol;
 private:
-        rtl::OUString SAL_CALL
-        transliterateBullet( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+        OUString SAL_CALL
+        transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
         com::sun::star::uno::Sequence< sal_Int32 >& offset )
         throw(com::sun::star::uno::RuntimeException);
 };
diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index 838fe92219f3..36504c37f699 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.hxx
@@ -29,8 +29,8 @@ typedef sal_Unicode (*TransFunc)(const sal_Unicode);
 class transliteration_OneToOne : public transliteration_commonclass
 {
 public:
-        rtl::OUString SAL_CALL
-        transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  )
+        OUString SAL_CALL
+        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  )
         throw(com::sun::star::uno::RuntimeException);
 
         sal_Unicode SAL_CALL
@@ -41,17 +41,17 @@ public:
         // Methods which are shared.
         sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException);
 
-        rtl::OUString SAL_CALL
-        folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
+        OUString SAL_CALL
+        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
         throw(com::sun::star::uno::RuntimeException);
 
         sal_Bool SAL_CALL
-        equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-            const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+        equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+            const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(com::sun::star::uno::RuntimeException);
 
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
+        com::sun::star::uno::Sequence< OUString > SAL_CALL
+        transliterateRange( const OUString& str1, const OUString& str2 )
         throw(com::sun::star::uno::RuntimeException);
 
 protected:
@@ -64,8 +64,8 @@ class name : public transliteration_OneToOne \
 { \
 public: \
     name (); \
-    rtl::OUString SAL_CALL \
-    transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) \
+    OUString SAL_CALL \
+    transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) \
     throw(com::sun::star::uno::RuntimeException); \
     sal_Unicode SAL_CALL \
     transliterateChar2Char( sal_Unicode inChar) \
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index cddc9ed2acb7..9fb480038aab 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -32,10 +32,10 @@ public:
     // Methods which are shared.
     sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException);
 
-    rtl::OUString SAL_CALL transliterate(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+    OUString SAL_CALL transliterate(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
         com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException);
 
-        rtl::OUString SAL_CALL
+        OUString SAL_CALL
         transliterateChar2String( sal_Unicode inChar)
         throw(com::sun::star::uno::RuntimeException);
 
@@ -44,16 +44,16 @@ public:
         throw(com::sun::star::uno::RuntimeException,
         com::sun::star::i18n::MultipleCharsOutputException);
 
-    rtl::OUString SAL_CALL folding(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
+    OUString SAL_CALL folding(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
         com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException);
 
     sal_Bool SAL_CALL equals(
-        const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-        const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+        const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+        const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(com::sun::star::uno::RuntimeException);
 
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange( const rtl::OUString& str1,
-        const rtl::OUString& str2 ) throw(com::sun::star::uno::RuntimeException);
+    com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1,
+        const OUString& str2 ) throw(com::sun::star::uno::RuntimeException);
 
 protected:
     sal_uInt8 nMappingType;
@@ -95,7 +95,7 @@ class Transliteration_titlecase : public Transliteration_body
 public:
     Transliteration_titlecase();
 
-    virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  ) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  ) throw(com::sun::star::uno::RuntimeException);
 };
 
 class Transliteration_sentencecase : public Transliteration_body
@@ -103,7 +103,7 @@ class Transliteration_sentencecase : public Transliteration_body
 public:
     Transliteration_sentencecase();
 
-    virtual rtl::OUString SAL_CALL transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  ) throw(com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  ) throw(com::sun::star::uno::RuntimeException);
 };
 #endif
 
diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index 56b243648ed8..bac9c614bf1e 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.hxx
@@ -35,31 +35,31 @@ public:
     void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale )
     throw(com::sun::star::uno::RuntimeException);
 
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL transliterateRange(
-        const rtl::OUString& str1, const rtl::OUString& str2 )
+    com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange(
+        const OUString& str1, const OUString& str2 )
     throw(com::sun::star::uno::RuntimeException);
 
     sal_Bool SAL_CALL equals(
-        const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-        const rtl::OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
+        const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+        const OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
     throw(com::sun::star::uno::RuntimeException);
 
     sal_Int32 SAL_CALL compareSubstring(
-        const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2)
+        const OUString& s1, sal_Int32 off1, sal_Int32 len1,
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2)
     throw(com::sun::star::uno::RuntimeException);
 
     sal_Int32 SAL_CALL compareString(
-        const rtl::OUString& s1,
-        const rtl::OUString& s2)
+        const OUString& s1,
+        const OUString& s2)
     throw(com::sun::star::uno::RuntimeException);
 
 protected:
     TransliterationModules moduleLoaded;
 private:
     sal_Int32 SAL_CALL compare(
-        const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-        const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
+        const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
+        const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
     throw(com::sun::star::uno::RuntimeException);
 };
 
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index 058973aa07f7..6e909eaad4f5 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -42,35 +42,35 @@ public:
         throw(com::sun::star::uno::RuntimeException);
 
         void SAL_CALL
-        loadModuleByImplName( const rtl::OUString& implName, const com::sun::star::lang::Locale& rLocale )
+        loadModuleByImplName( const OUString& implName, const com::sun::star::lang::Locale& rLocale )
         throw(com::sun::star::uno::RuntimeException);
 
         void SAL_CALL
-        loadModulesByImplNames(const com::sun::star::uno::Sequence< rtl::OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale)
+        loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale)
         throw(com::sun::star::uno::RuntimeException);
 
-        com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+        com::sun::star::uno::Sequence< OUString > SAL_CALL
         getAvailableModules( const com::sun::star::lang::Locale& rLocale, sal_Int16 sType )
         throw(com::sun::star::uno::RuntimeException);
 
         // Methods which should be implemented in each transliteration module.
-        virtual rtl::OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException);
 
         virtual sal_Int16 SAL_CALL getType(  ) throw(com::sun::star::uno::RuntimeException) = 0;
 
-        virtual rtl::OUString SAL_CALL
-        transliterate( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  )
+        virtual OUString SAL_CALL
+        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset  )
         throw(com::sun::star::uno::RuntimeException) = 0;
 
-        virtual rtl::OUString SAL_CALL
-        folding( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
+        virtual OUString SAL_CALL
+        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset)
         throw(com::sun::star::uno::RuntimeException) = 0;
 
         // Methods in XExtendedTransliteration
-        virtual rtl::OUString SAL_CALL
-        transliterateString2String( const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
+        virtual OUString SAL_CALL
+        transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
         throw(com::sun::star::uno::RuntimeException);
-        virtual rtl::OUString SAL_CALL
+        virtual OUString SAL_CALL
         transliterateChar2String( sal_Unicode inChar)
         throw(com::sun::star::uno::RuntimeException);
         virtual sal_Unicode SAL_CALL
@@ -79,27 +79,27 @@ public:
                 com::sun::star::uno::RuntimeException) = 0;
 
         virtual sal_Bool SAL_CALL
-        equals( const rtl::OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const rtl::OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
+        equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
         throw(com::sun::star::uno::RuntimeException) = 0;
 
-        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
-        transliterateRange( const rtl::OUString& str1, const rtl::OUString& str2 )
+        virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+        transliterateRange( const OUString& str1, const OUString& str2 )
         throw(com::sun::star::uno::RuntimeException) = 0;
 
         virtual sal_Int32 SAL_CALL
-        compareSubstring( const rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1, const rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2)
+        compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2)
         throw(com::sun::star::uno::RuntimeException);
 
         virtual sal_Int32 SAL_CALL
-        compareString( const rtl::OUString& s1, const rtl::OUString& s2)
+        compareString( const OUString& s1, const OUString& s2)
         throw(com::sun::star::uno::RuntimeException);
 
         //XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName()
+        virtual OUString SAL_CALL getImplementationName()
             throw( com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
             throw( com::sun::star::uno::RuntimeException );
-        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+        virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
             throw( com::sun::star::uno::RuntimeException );
 protected:
         com::sun::star::lang::Locale   aLocale;
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index 8823a5ed3799..60fe370b8fde 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.hxx
@@ -35,20 +35,20 @@ class UnoScriptTypeDetector : public cppu::WeakImplHelper2
 {
 public:
     // Methods
-    virtual sal_Int32 SAL_CALL beginOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL endOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Int16 SAL_CALL getCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException);
 
 
     //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void)
+    virtual OUString SAL_CALL getImplementationName(void)
                 throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
                 throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
                 throw( ::com::sun::star::uno::RuntimeException );
 };
 
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 12cc9088a957..847cb097a3f1 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -57,15 +57,15 @@ private:
 public:
     xdictionary(const sal_Char *lang);
     ~xdictionary();
-    Boundary nextWord( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
-    Boundary previousWord( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
-    Boundary getWordBoundary( const rtl::OUString& rText, sal_Int32 nPos, sal_Int16 wordType, sal_Bool bDirection );
+    Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
+    Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType);
+    Boundary getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, sal_Bool bDirection );
     void setJapaneseWordBreak();
 
 private:
     WordBreakCache cache[CACHE_MAX];
 
-    sal_Bool        seekSegment(const rtl::OUString& rText, sal_Int32 pos, Boundary& boundary);
+    sal_Bool        seekSegment(const OUString& rText, sal_Int32 pos, Boundary& boundary);
     WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary);
     sal_Bool        exists(const sal_uInt32 u);
     sal_Int32       getLongestMatch(const sal_Unicode *text, sal_Int32 len);