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

41 files changed, 141 insertions, 174 deletions

diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 2bf2a03e3de3..72da09f87629 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -35,8 +35,6 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
@@ -228,7 +226,7 @@ sal_Bool WordBreakCache::equals(const sal_Unicode* str, Boundary& boundary) {
  * @param pos : Position of the given character.
  * @return true if CJK.
  */
-sal_Bool xdictionary::seekSegment(const rtl::OUString &rText, sal_Int32 pos,
+sal_Bool xdictionary::seekSegment(const OUString &rText, sal_Int32 pos,
     Boundary& segBoundary)
 {
     sal_Int32 indexUtf16;
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index 81a191b72e57..1d0e2b4e9575 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -24,7 +24,6 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index e01abaf0cf64..fa26966c0f24 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -120,7 +120,6 @@ static void debug_i18n_cal_dump( const ::icu::Calendar & r )
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
 
 
 namespace com { namespace sun { namespace star { namespace i18n {
@@ -1173,7 +1172,7 @@ Calendar_gregorian::getImplementationName(void) throw( RuntimeException )
 }
 
 sal_Bool SAL_CALL
-Calendar_gregorian::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException )
+Calendar_gregorian::supportsService(const OUString& rServiceName) throw( RuntimeException )
 {
         return !rServiceName.compareToAscii(cCalendar);
 }
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index 237047cbb2d3..634c414efd2e 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -25,7 +25,6 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index d3ab35100bcf..65f8f9cc047c 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -24,8 +24,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
@@ -210,7 +208,7 @@ CharacterClassificationImpl::getImplementationName(void)
 }
 
 sal_Bool SAL_CALL
-CharacterClassificationImpl::supportsService(const rtl::OUString& rServiceName)
+CharacterClassificationImpl::supportsService(const OUString& rServiceName)
                 throw( RuntimeException )
 {
     return !rServiceName.compareToAscii(cClass);
diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index aeaa34ad1891..14857d6df5f3 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -25,62 +25,62 @@
 //      ----------------------------------------------------;
 
 sal_Int16 SAL_CALL
-UnoScriptTypeDetector::getScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException)
 {
     return ScriptTypeDetector::getScriptDirection(Text, nPos, defaultScriptDirection);
 }
 
 // return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range.
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::beginOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException)
 {
     return ScriptTypeDetector::beginOfScriptDirection(Text, nPos, direction);
 }
 
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::endOfScriptDirection( const ::rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException)
 {
     return ScriptTypeDetector::endOfScriptDirection(Text, nPos, direction);
 }
 
 sal_Int16 SAL_CALL
-UnoScriptTypeDetector::getCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
 {
     return ScriptTypeDetector::getCTLScriptType(Text, nPos);
 }
 
 // Begin of Script Type is inclusive.
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::beginOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
 {
     return ScriptTypeDetector::beginOfCTLScriptType(Text, nPos);
 }
 
 // End of the Script Type is exclusive, the return value pointing to the begin of next script type
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::endOfCTLScriptType( const ::rtl::OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
+UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException)
 {
     return ScriptTypeDetector::endOfCTLScriptType(Text, nPos);
 }
 
 const sal_Char sDetector[] = "draft.com.sun.star.i18n.UnoScriptTypeDetector";
 
-rtl::OUString SAL_CALL
+OUString SAL_CALL
 UnoScriptTypeDetector::getImplementationName() throw( ::com::sun::star::uno::RuntimeException )
 {
-    return rtl::OUString(sDetector);
+    return OUString(sDetector);
 }
 
 sal_Bool SAL_CALL
-UnoScriptTypeDetector::supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException )
+UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException )
 {
     return ServiceName != sDetector;
 }
 
-::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
 UnoScriptTypeDetector::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException )
 {
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);
+    ::com::sun::star::uno::Sequence< OUString > aRet(1);
     aRet[0] = sDetector;
     return aRet;
 }
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index 23c936df4a12..a4630fa363b7 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -83,7 +83,7 @@ ChapterCollator::getImplementationName() throw( RuntimeException )
 }
 
 sal_Bool SAL_CALL
-ChapterCollator::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException )
+ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException )
 {
     return !rServiceName.compareToAscii(cChapCollator);
 }
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 35cfd3c91c7b..2a184523155f 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -28,8 +28,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 2ba089a43418..4e7990828dae 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -244,7 +244,7 @@ Collator_Unicode::getImplementationName() throw( RuntimeException )
 }
 
 sal_Bool SAL_CALL
-Collator_Unicode::supportsService(const rtl::OUString& rServiceName) throw( RuntimeException )
+Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException )
 {
     return !rServiceName.compareToAscii(implementationName);
 }
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 61573a964996..4e962c8edccd 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1049,7 +1049,7 @@ OUString DefaultNumberingProvider::getImplementationName(void)
     return OUString::createFromAscii(cDefaultNumberingProvider);
 }
 
-sal_Bool DefaultNumberingProvider::supportsService(const rtl::OUString& rServiceName)
+sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName)
                 throw( RuntimeException )
 {
     return rServiceName.equalsAscii(cDefaultNumberingProvider);
diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index a03fde10c4c3..9c7cd94c8cc4 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
@@ -20,7 +20,6 @@
 
 #include <inputsequencechecker_hi.hxx>
 
-using ::rtl::OUString;
 
 namespace com {
 namespace sun {
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index e0ea3a9ebd67..488145573cac 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
@@ -21,7 +21,6 @@
 #include <inputsequencechecker_th.hxx>
 #include <wtt.h>
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 9ec83baaab5e..fc211343fe41 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -33,7 +33,7 @@
 // NOTE: MUST match the Locale versionDTD attribute defined in data/locale.dtd
 #define LOCALE_VERSION_DTD "2.0.3"
 
-typedef ::std::set< ::rtl::OUString > NameSet;
+typedef ::std::set< OUString > NameSet;
 typedef ::std::set< sal_Int16 > ValueSet;
 
 namespace cssi = ::com::sun::star::i18n;
@@ -59,7 +59,7 @@ int LocaleNode::getError() const
 
 void LocaleNode::print () const {
     printf ("<");
-    ::rtl::OUString str (aName);
+    OUString str (aName);
     for(sal_Int32 i = 0; i < str.getLength(); i++)
         printf( "%c", str[i]);
     printf (">\n");
@@ -224,7 +224,7 @@ void print_node( const LocaleNode* p, int depth=0 )
 
 void LocaleNode :: generateCode (const OFileWriter &of) const
 {
-    ::rtl::OUString aDTD = getAttr().getValueByName("versionDTD");
+    OUString aDTD = getAttr().getValueByName("versionDTD");
     if ( aDTD != LOCALE_VERSION_DTD )
     {
         ++nError;
@@ -236,7 +236,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
 }
 
 
-::rtl::OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
+OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
         const char* pParameterName, const LocaleNode* pNode,
         sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
 {
@@ -272,7 +272,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
 }
 
 
-::rtl::OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
+OUString LocaleNode::writeParameterCheckLen( const OFileWriter &of,
         const char* pNodeName, const char* pParameterName,
         sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
 {
@@ -296,7 +296,7 @@ void LocaleNode::incError( const char* pStr ) const
     fprintf( stderr, "Error: %s\n", pStr);
 }
 
-void LocaleNode::incError( const ::rtl::OUString& rStr ) const
+void LocaleNode::incError( const OUString& rStr ) const
 {
     incError( OSTR( rStr));
 }
@@ -321,13 +321,13 @@ void LocaleNode::incErrorInt( const char* pStr, int nVal ) const
     fprintf( stderr, prepareErrorFormat( pStr, ": %d"), nVal);
 }
 
-void LocaleNode::incErrorStr( const char* pStr, const ::rtl::OUString& rVal ) const
+void LocaleNode::incErrorStr( const char* pStr, const OUString& rVal ) const
 {
     ++nError;
     fprintf( stderr, prepareErrorFormat( pStr, ": %s"), OSTR( rVal));
 }
 
-void LocaleNode::incErrorStrStr( const char* pStr, const ::rtl::OUString& rVal1, const ::rtl::OUString& rVal2 ) const
+void LocaleNode::incErrorStrStr( const char* pStr, const OUString& rVal1, const OUString& rVal2 ) const
 {
     ++nError;
     fprintf( stderr, prepareErrorFormat( pStr, ": %s %s"), OSTR( rVal1), OSTR( rVal2));
@@ -361,7 +361,7 @@ void LCInfoNode::generateCode (const OFileWriter &of) const
                 "Variants are not supported by application.");
     }
     else
-        of.writeParameter("Variant", ::rtl::OUString());
+        of.writeParameter("Variant", OUString());
     of.writeAsciiString("\nstatic const sal_Unicode* LCInfoArray[] = {\n");
     of.writeAsciiString("\tlangID,\n");
     of.writeAsciiString("\tlangDefaultName,\n");
@@ -379,12 +379,12 @@ static OUString aDecSep;
 void LCCTYPENode::generateCode (const OFileWriter &of) const
 {
     const LocaleNode * sepNode = 0;
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
         of.writeRefFunction("getLocaleItem_", useLocale);
         return;
     }
-    ::rtl::OUString str =   getAttr().getValueByName("unoid");
+    OUString str =   getAttr().getValueByName("unoid");
     of.writeAsciiString("\n\n");
     of.writeParameter("LC_CTYPE_Unoid", str);;
 
@@ -627,7 +627,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
         }
     }
 
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty())
     {
         switch (mnSection)
@@ -876,7 +876,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
         if (n)
             of.writeParameter("FormatDefaultName", n->getValue(), formatCount);
         else
-            of.writeParameter("FormatDefaultName", ::rtl::OUString(), formatCount);
+            of.writeParameter("FormatDefaultName", OUString(), formatCount);
 
     }
 
@@ -1265,7 +1265,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
 
 void LCCollationNode::generateCode (const OFileWriter &of) const
 {
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
         of.writeRefFunction("getCollatorImplementation_", useLocale);
         of.writeRefFunction("getCollationOptions_", useLocale);
@@ -1279,7 +1279,7 @@ void LCCollationNode::generateCode (const OFileWriter &of) const
         LocaleNode * currNode = getChildAt (j);
         if( currNode->getName().compareToAscii("Collator") == 0 )
         {
-            ::rtl::OUString str;
+            OUString str;
             str = currNode->getAttr().getValueByName("unoid");
             of.writeParameter("CollatorID", str, j);
             str = currNode->getValue();
@@ -1338,7 +1338,7 @@ void LCCollationNode::generateCode (const OFileWriter &of) const
 
 void LCSearchNode::generateCode (const OFileWriter &of) const
 {
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
         of.writeRefFunction("getSearchOptions_", useLocale);
         return;
@@ -1376,7 +1376,7 @@ void LCSearchNode::generateCode (const OFileWriter &of) const
 
 void LCIndexNode::generateCode (const OFileWriter &of) const
 {
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
         of.writeRefFunction("getIndexAlgorithm_", useLocale);
         of.writeRefFunction("getUnicodeScripts_", useLocale);
@@ -1391,7 +1391,7 @@ void LCIndexNode::generateCode (const OFileWriter &of) const
         LocaleNode * currNode = getChildAt (i);
         if( currNode->getName().compareToAscii("IndexKey") == 0 )
         {
-            ::rtl::OUString str;
+            OUString str;
             str = currNode->getAttr().getValueByName("unoid");
             of.writeParameter("IndexID", str, nbOfIndexs);
             str = currNode->getAttr().getValueByName("module");
@@ -1536,13 +1536,13 @@ static void lcl_writeAbbrFullNarrArrays( const OFileWriter & of, sal_Int16 nCoun
 
 void LCCalendarNode::generateCode (const OFileWriter &of) const
 {
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
         of.writeRefFunction("getAllCalendars_", useLocale);
         return;
     }
     sal_Int16 nbOfCalendars = sal::static_int_cast<sal_Int16>( getNumberOfChildren() );
-    ::rtl::OUString str;
+    OUString str;
     sal_Int16 * nbOfDays = new sal_Int16[nbOfCalendars];
     sal_Int16 * nbOfMonths = new sal_Int16[nbOfCalendars];
     sal_Int16 * nbOfGenitiveMonths = new sal_Int16[nbOfCalendars];
@@ -1568,7 +1568,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         // Generate Days of Week
         const sal_Char *elementTag;
         LocaleNode * daysNode = NULL;
-        ::rtl::OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
+        OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
         if (!ref_name.isEmpty() && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
@@ -1851,13 +1851,13 @@ bool isIso4217( const OUString& rStr )
 
 void LCCurrencyNode :: generateCode (const OFileWriter &of) const
 {
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
         of.writeRefFunction("getAllCurrencies_", useLocale);
         return;
     }
     sal_Int16 nbOfCurrencies = 0;
-    ::rtl::OUString str;
+    OUString str;
     sal_Int16 i;
 
     bool bTheDefault= false;
@@ -1952,13 +1952,13 @@ void LCCurrencyNode :: generateCode (const OFileWriter &of) const
 
 void LCTransliterationNode::generateCode (const OFileWriter &of) const
 {
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
         of.writeRefFunction("getTransliterations_", useLocale);
         return;
     }
     sal_Int16 nbOfModules = 0;
-    ::rtl::OUString str;
+    OUString str;
     sal_Int16 i;
 
     for ( i = 0; i < getNumberOfChildren(); i++,nbOfModules++) {
@@ -2001,7 +2001,7 @@ static NameValuePair ReserveWord[] = {
 
 void LCMiscNode::generateCode (const OFileWriter &of) const
 {
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
     of.writeRefFunction("getForbiddenCharacters_", useLocale);
     of.writeRefFunction("getBreakIteratorRules_", useLocale);
@@ -2017,7 +2017,7 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
     bool bEnglishLocale = (strncmp( of.getLocale(), "en_", 3) == 0);
 
     sal_Int16 nbOfWords = 0;
-    ::rtl::OUString str;
+    OUString str;
     sal_Int16 i;
 
     for ( i = 0; i < sal_Int16(SAL_N_ELEMENTS(ReserveWord)); i++,nbOfWords++) {
@@ -2060,9 +2060,9 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
          of.writeParameter( "forbiddenEnd", forbidNode -> getChildAt(1)->getValue());
          of.writeParameter( "hangingChars", forbidNode -> getChildAt(2)->getValue());
     } else {
-         of.writeParameter( "forbiddenBegin", ::rtl::OUString());
-         of.writeParameter( "forbiddenEnd", ::rtl::OUString());
-         of.writeParameter( "hangingChars", ::rtl::OUString());
+         of.writeParameter( "forbiddenBegin", OUString());
+         of.writeParameter( "forbiddenEnd", OUString());
+         of.writeParameter( "hangingChars", OUString());
     }
     of.writeAsciiString("\nstatic const sal_Unicode* LCForbiddenCharactersArray[] = {\n");
     of.writeAsciiString("\tforbiddenBegin,\n");
@@ -2078,11 +2078,11 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
          of.writeParameter( "CharacterMode", breakNode -> getChildAt(3)->getValue());
          of.writeParameter( "LineMode", breakNode -> getChildAt(4)->getValue());
     } else {
-         of.writeParameter( "EditMode", ::rtl::OUString());
-         of.writeParameter( "DictionaryMode", ::rtl::OUString());
-         of.writeParameter( "WordCountMode", ::rtl::OUString());
-         of.writeParameter( "CharacterMode", ::rtl::OUString());
-         of.writeParameter( "LineMode", ::rtl::OUString());
+         of.writeParameter( "EditMode", OUString());
+         of.writeParameter( "DictionaryMode", OUString());
+         of.writeParameter( "WordCountMode", OUString());
+         of.writeParameter( "CharacterMode", OUString());
+         of.writeParameter( "LineMode", OUString());
     }
     of.writeAsciiString("\nstatic const sal_Unicode* LCBreakIteratorRulesArray[] = {\n");
     of.writeAsciiString("\tEditMode,\n");
@@ -2098,7 +2098,7 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
 void LCNumberingLevelNode::generateCode (const OFileWriter &of) const
 {
      of.writeAsciiString("// ---> ContinuousNumbering\n");
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
     of.writeRefFunction2("getContinuousNumberingLevels_", useLocale);
     return;
@@ -2168,7 +2168,7 @@ void LCNumberingLevelNode::generateCode (const OFileWriter &of) const
 void LCOutlineNumberingLevelNode::generateCode (const OFileWriter &of) const
 {
      of.writeAsciiString("// ---> OutlineNumbering\n");
-    ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
+    OUString useLocale =   getAttr().getValueByName("ref");
     if (!useLocale.isEmpty()) {
     of.writeRefFunction3("getOutlineNumberingLevels_", useLocale);
     return;
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 3acc65525358..27b0027d5622 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -47,26 +47,26 @@ public:
 
 OFileWriter(const char *pcFile, const char *locale );
 virtual ~OFileWriter();
-    virtual void  writeStringCharacters(const ::rtl::OUString& str) const;
+    virtual void  writeStringCharacters(const OUString& str) const;
     virtual void  writeAsciiString(const char *str)const ;
     virtual void  writeInt(sal_Int16 nb) const;
     virtual void  writeFunction(const char *func, const char *count, const char *array) const;
-    virtual void  writeRefFunction(const char *func, const ::rtl::OUString& useLocale) const;
+    virtual void  writeRefFunction(const char *func, const OUString& useLocale) const;
     virtual void  writeFunction(const char *func, const char *count, const char *array, const char *from, const char *to) const;
-    virtual void  writeRefFunction(const char *func, const ::rtl::OUString& useLocale, const char *to) const;
+    virtual void  writeRefFunction(const char *func, const OUString& useLocale, const char *to) const;
     virtual void  writeFunction2(const char *func, const char *style, const char* attr, const char *array) const;
-    virtual void  writeRefFunction2(const char *func, const ::rtl::OUString& useLocale) const;
+    virtual void  writeRefFunction2(const char *func, const OUString& useLocale) const;
     virtual void  writeFunction3(const char *func, const char *style, const char* levels, const char* attr, const char *array) const;
-    virtual void  writeRefFunction3(const char *func, const ::rtl::OUString& useLocale) const;
+    virtual void  writeRefFunction3(const char *func, const OUString& useLocale) const;
     virtual void  writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 count, sal_Int16 val) const;
-    virtual bool  writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str, sal_Int16 count) const;
-    virtual bool  writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str) const;
-    virtual void  writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const;
-    virtual void  writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count) const;
-    virtual void  writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
-    virtual void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, const sal_Int16 count) const;
-    virtual void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const;
-    virtual void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
+    virtual bool  writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const;
+    virtual bool  writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str) const;
+    virtual void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const;
+    virtual void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const;
+    virtual void  writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
+    virtual void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const;
+    virtual void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars) const;
+    virtual void  writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const;
     virtual void  flush(void) const ;
     virtual void  closeOutput(void) const;
     /// Return the locale string, something like en_US or de_DE
@@ -132,14 +132,14 @@ public:
     // ++nError with output to stderr
     void incError( const char* pStr ) const;
     // ++nError with output to stderr
-    void incError( const ::rtl::OUString& rStr ) const;
+    void incError( const OUString& rStr ) const;
     // ++nError with output to stderr, pStr should contain "%d", otherwise appended
     void incErrorInt( const char* pStr, int nVal ) const;
     // ++nError with output to stderr, pStr should contain "%s", otherwise appended
-    void incErrorStr( const char* pStr, const ::rtl::OUString& rVal ) const;
+    void incErrorStr( const char* pStr, const OUString& rVal ) const;
     // ++nError with output to stderr, pStr should contain "%s %s", otherwise
     // appended
-    void incErrorStrStr( const char* pStr, const ::rtl::OUString& rVal1, const ::rtl::OUString& rVal2 ) const;
+    void incErrorStrStr( const char* pStr, const OUString& rVal1, const OUString& rVal2 ) const;
     // used by incError...(), returns a pointer to a static buffer,
     // pDefaultConversion is appended if pFormat doesn't contain a %
     // specification and should be something like ": %d" or ": %s" or similar.
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index 8ea5c70478a0..7a9505a51c92 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -49,7 +49,7 @@ void OFileWriter::writeAsciiString(const char* str) const
     fprintf(m_f, "%s", str);
 }
 
-void OFileWriter::writeStringCharacters(const ::rtl::OUString& str) const
+void OFileWriter::writeStringCharacters(const OUString& str) const
 {
     for(int i = 0; i < str.getLength(); i++)
         fprintf(m_f, "0x%x, ", str[i]);
@@ -62,7 +62,7 @@ void OFileWriter::writeFunction(const char *func, const char *count, const char
     fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array);
 }
 
-void OFileWriter::writeRefFunction(const char *func, const ::rtl::OUString& useLocale) const
+void OFileWriter::writeRefFunction(const char *func, const OUString& useLocale) const
 {
     OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) );
     const char* locale = aRefLocale.getStr();
@@ -80,7 +80,7 @@ void OFileWriter::writeFunction(const char *func, const char *count, const char
     fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array);
 }
 
-void OFileWriter::writeRefFunction(const char *func, const ::rtl::OUString& useLocale, const char *to) const
+void OFileWriter::writeRefFunction(const char *func, const OUString& useLocale, const char *to) const
 {
     OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) );
     const char* locale = aRefLocale.getStr();
@@ -99,7 +99,7 @@ void OFileWriter::writeFunction2(const char *func, const char *style, const char
     fprintf(m_f, "\treturn %s;\n}\n", array);
 }
 
-void OFileWriter::writeRefFunction2(const char *func, const ::rtl::OUString& useLocale) const
+void OFileWriter::writeRefFunction2(const char *func, const OUString& useLocale) const
 {
     OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) );
     const char* locale = aRefLocale.getStr();
@@ -117,7 +117,7 @@ void OFileWriter::writeFunction3(const char *func, const char *style, const char
     fprintf(m_f, "\treturn %s;\n}\n", array);
 }
 
-void OFileWriter::writeRefFunction3(const char *func, const ::rtl::OUString& useLocale) const
+void OFileWriter::writeRefFunction3(const char *func, const OUString& useLocale) const
 {
     OString aRefLocale( OUStringToOString(useLocale, RTL_TEXTENCODING_ASCII_US) );
     const char* locale = aRefLocale.getStr();
@@ -131,56 +131,56 @@ void OFileWriter::writeIntParameter(const sal_Char* pAsciiStr, const sal_Int16 c
     fprintf(m_f, "static const sal_Unicode %s%d[] = {%d};\n", pAsciiStr, count, val);
 }
 
-bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str, sal_Int16 count) const
+bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str, sal_Int16 count) const
 {
     bool bBool = (str == "true" ? 1 : 0);
     fprintf(m_f,"static const sal_Unicode default%s%d[] = {%d};\n", pAsciiStr, count, bBool);
     return bBool;
 }
 
-bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& str) const
+bool OFileWriter::writeDefaultParameter(const sal_Char* pAsciiStr, const OUString& str) const
 {
     bool bBool = (str == "true" ? 1 : 0);
     fprintf(m_f,"static const sal_Unicode default%s[] = {%d};\n", pAsciiStr, bBool);
     return bBool;
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const
+void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars) const
 {
     fprintf(m_f, "static const sal_Unicode %s[] = {", pAsciiStr);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count) const
+void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count) const
 {
     fprintf(m_f, "static const sal_Unicode %s%d[] = {", pAsciiStr, count);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
+void OFileWriter::writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
 {
     fprintf(m_f, "static const sal_Unicode %s%d%d[] = {", pAsciiStr, count0, count1);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, const sal_Int16 count) const
+void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const
 {
     fprintf(m_f, "static const sal_Unicode %s%s%d[] = {", pTagStr, pAsciiStr, count);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars) const
+void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars) const
 {
     fprintf(m_f, "static const sal_Unicode %s%s[] = {", pTagStr, pAsciiStr);
     writeStringCharacters(aChars);
     fprintf(m_f, "0x0};\n");
 }
 
-void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const ::rtl::OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
+void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const
 {
     fprintf(m_f, "static const sal_Unicode %s%s%d%d[] = {", pTagStr, pAsciiStr, count0, count1);
     writeStringCharacters(aChars);
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 66b51747bd1f..7960f5061a69 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -31,8 +31,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 static const sal_Char clocaledata[] = "com.sun.star.i18n.LocaleData";
 
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 8de5a8cefc78..e73c0c31a600 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -162,7 +162,7 @@ sal_Bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 be
 OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
         Sequence< sal_Int32 >& offset, sal_Bool useOffset, Number* number ) throw(RuntimeException)
 {
-        rtl::OUString aRet;
+        OUString aRet;
 
         sal_Int32 strLen = inStr.getLength() - startPos;
         sal_Unicode *numberChar = NumberChar[number->number];
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx
index 99958212a86e..ea0ec9416d26 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.cxx
@@ -45,8 +45,8 @@ NumberFormatCodeMapper::~NumberFormatCodeMapper()
 NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException)
 {
 
-    ::rtl::OUString elementType = mapElementTypeShortToString(formatType);
-    ::rtl::OUString elementUsage = mapElementUsageShortToString(formatUsage);
+    OUString elementType = mapElementTypeShortToString(formatType);
+    OUString elementUsage = mapElementUsageShortToString(formatUsage);
 
     getFormats( rLocale );
 
@@ -175,24 +175,24 @@ void NumberFormatCodeMapper::getFormats( const ::com::sun::star::lang::Locale& r
 }
 
 
-::rtl::OUString
+OUString
 NumberFormatCodeMapper::mapElementTypeShortToString(sal_Int16 formatType)
 {
 
     switch ( formatType )
     {
         case com::sun::star::i18n::KNumberFormatType::SHORT :
-            return ::rtl::OUString(  "short"  );
+            return OUString(  "short"  );
         case com::sun::star::i18n::KNumberFormatType::MEDIUM :
-            return ::rtl::OUString(  "medium"  );
+            return OUString(  "medium"  );
         case com::sun::star::i18n::KNumberFormatType::LONG :
-            return ::rtl::OUString(  "long"  );
+            return OUString(  "long"  );
     }
-    return ::rtl::OUString();
+    return OUString();
 }
 
 sal_Int16
-NumberFormatCodeMapper::mapElementTypeStringToShort(const ::rtl::OUString& formatType)
+NumberFormatCodeMapper::mapElementTypeStringToShort(const OUString& formatType)
 {
     if ( formatType == "short" )
         return com::sun::star::i18n::KNumberFormatType::SHORT;
@@ -204,34 +204,34 @@ NumberFormatCodeMapper::mapElementTypeStringToShort(const ::rtl::OUString& forma
     return com::sun::star::i18n::KNumberFormatType::SHORT;
 }
 
-::rtl::OUString
+OUString
 NumberFormatCodeMapper::mapElementUsageShortToString(sal_Int16 formatUsage)
 {
     switch ( formatUsage )
     {
         case com::sun::star::i18n::KNumberFormatUsage::DATE :
-            return ::rtl::OUString(  "DATE"  );
+            return OUString(  "DATE"  );
         case com::sun::star::i18n::KNumberFormatUsage::TIME :
-            return ::rtl::OUString(  "TIME"  );
+            return OUString(  "TIME"  );
         case com::sun::star::i18n::KNumberFormatUsage::DATE_TIME :
-            return ::rtl::OUString(  "DATE_TIME"  );
+            return OUString(  "DATE_TIME"  );
         case com::sun::star::i18n::KNumberFormatUsage::FIXED_NUMBER :
-            return ::rtl::OUString(  "FIXED_NUMBER"  );
+            return OUString(  "FIXED_NUMBER"  );
         case com::sun::star::i18n::KNumberFormatUsage::FRACTION_NUMBER :
-            return ::rtl::OUString(  "FRACTION_NUMBER"  );
+            return OUString(  "FRACTION_NUMBER"  );
         case com::sun::star::i18n::KNumberFormatUsage::PERCENT_NUMBER :
-            return ::rtl::OUString(  "PERCENT_NUMBER"  );
+            return OUString(  "PERCENT_NUMBER"  );
         case com::sun::star::i18n::KNumberFormatUsage::CURRENCY :
-            return ::rtl::OUString(  "CURRENCY"  );
+            return OUString(  "CURRENCY"  );
         case com::sun::star::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER :
-            return ::rtl::OUString(  "SCIENTIFIC_NUMBER"  );
+            return OUString(  "SCIENTIFIC_NUMBER"  );
     }
-    return ::rtl::OUString();
+    return OUString();
 }
 
 
 sal_Int16
-NumberFormatCodeMapper::mapElementUsageStringToShort(const ::rtl::OUString& formatUsage)
+NumberFormatCodeMapper::mapElementUsageStringToShort(const OUString& formatUsage)
 {
     if ( formatUsage == "DATE" )
         return com::sun::star::i18n::KNumberFormatUsage::DATE;
@@ -263,27 +263,27 @@ NumberFormatCodeMapper::createLocaleDataObject() {
     mxLocaleData.set( com::sun::star::i18n::LocaleData::create(mxContext) );
 }
 
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
 NumberFormatCodeMapper::getImplementationName(void)
                 throw( ::com::sun::star::uno::RuntimeException )
 {
-    return ::rtl::OUString("com.sun.star.i18n.NumberFormatCodeMapper");
+    return OUString("com.sun.star.i18n.NumberFormatCodeMapper");
 }
 
 const sal_Char cNumFormat[] = "com.sun.star.i18n.NumberFormatMapper";
 
 sal_Bool SAL_CALL
-NumberFormatCodeMapper::supportsService(const rtl::OUString& rServiceName)
+NumberFormatCodeMapper::supportsService(const OUString& rServiceName)
                 throw( ::com::sun::star::uno::RuntimeException )
 {
     return !rServiceName.compareToAscii(cNumFormat);
 }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
 NumberFormatCodeMapper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
 {
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString::createFromAscii(cNumFormat);
+    ::com::sun::star::uno::Sequence< OUString > aRet(1);
+    aRet[0] = OUString::createFromAscii(cNumFormat);
     return aRet;
 }
 
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 9eca3a099e0b..45306cfe52c9 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -25,7 +25,7 @@
 #include <unicode/rbnf.h>
 #include <unicode/normlzr.h>
 
-#define CSTR( ouStr ) rtl::OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 ).getStr( )
+#define CSTR( ouStr ) OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 ).getStr( )
 
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::uno;
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index d585895d28f9..b9c19b082bc5 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -578,12 +578,12 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18npool_component_getFactory( const sal_Cha
     {
         if( 0 == rtl_str_compare( sImplementationName, pArr->pImplementationNm ) )
         {
-            uno::Sequence< ::rtl::OUString > aServiceNames(1);
+            uno::Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                ::rtl::OUString::createFromAscii( pArr->pServiceNm );
+                OUString::createFromAscii( pArr->pServiceNm );
             xFactory = ::cppu::createSingleFactory(
                     pServiceManager,
-                    ::rtl::OUString::createFromAscii( pArr->pImplementationNm ),
+                    OUString::createFromAscii( pArr->pImplementationNm ),
                     *pArr->pFn, aServiceNames );
             break;
         }
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 8bd86a586682..cebda5090a93 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -46,8 +46,8 @@ class TextSearch: public cppu::WeakImplHelper2
     ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext > m_xContext;
 
     ::com::sun::star::util::SearchOptions aSrchPara;
-    ::rtl::OUString sSrchStr;
-    ::rtl::OUString sSrchStr2;
+    OUString sSrchStr;
+    OUString sSrchStr2;
 
     mutable com::sun::star::uno::Reference<
         com::sun::star::i18n::XCharacterClassification > xCharClass;
@@ -59,7 +59,7 @@ class TextSearch: public cppu::WeakImplHelper2
 
     // define a function pointer for the different search nethods
     typedef ::com::sun::star::util::SearchResult
-        (SAL_CALL TextSearch:: *FnSrch)( const ::rtl::OUString& searchStr,
+        (SAL_CALL TextSearch:: *FnSrch)( const OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos );
 
     FnSrch fnForward;
@@ -76,22 +76,22 @@ class TextSearch: public cppu::WeakImplHelper2
     void MakeBackwardTab2();
     sal_Int32 GetDiff( const sal_Unicode ) const;
     ::com::sun::star::util::SearchResult SAL_CALL
-        NSrchFrwrd( const ::rtl::OUString& searchStr,
+        NSrchFrwrd( const OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos )
                             throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::util::SearchResult SAL_CALL
-        NSrchBkwrd( const ::rtl::OUString& searchStr,
+        NSrchBkwrd( const OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos )
                             throw(::com::sun::star::uno::RuntimeException);
 
     // Members and methods for the regular expression search
     RegexMatcher* pRegexMatcher;
     ::com::sun::star::util::SearchResult SAL_CALL
-        RESrchFrwrd( const ::rtl::OUString& searchStr,
+        RESrchFrwrd( const OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos )
                             throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::util::SearchResult SAL_CALL
-        RESrchBkwrd( const ::rtl::OUString& searchStr,
+        RESrchBkwrd( const OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos )
                             throw(::com::sun::star::uno::RuntimeException);
     void RESrchPrepare( const ::com::sun::star::util::SearchOptions&);
@@ -101,18 +101,18 @@ class TextSearch: public cppu::WeakImplHelper2
     WLevDistance* pWLD;
     com::sun::star::uno::Reference < com::sun::star::i18n::XBreakIterator > xBreak;
     ::com::sun::star::util::SearchResult SAL_CALL
-        ApproxSrchFrwrd( const ::rtl::OUString& searchStr,
+        ApproxSrchFrwrd( const OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos )
                             throw(::com::sun::star::uno::RuntimeException);
     ::com::sun::star::util::SearchResult SAL_CALL
-        ApproxSrchBkwrd( const ::rtl::OUString& searchStr,
+        ApproxSrchBkwrd( const OUString& searchStr,
                                 sal_Int32 startPos, sal_Int32 endPos )
                             throw(::com::sun::star::uno::RuntimeException);
 
-    bool IsDelimiter( const ::rtl::OUString& rStr, sal_Int32 nPos ) const;
+    bool IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const;
 
     sal_Bool checkCTLStart, checkCTLEnd;
-    sal_Bool SAL_CALL isCellStart(const ::rtl::OUString& searchStr, sal_Int32 nPos)
+    sal_Bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos)
                             throw(::com::sun::star::uno::RuntimeException);
 
 public:
@@ -126,20 +126,20 @@ public:
         setOptions( const ::com::sun::star::util::SearchOptions& options )
                             throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::util::SearchResult SAL_CALL
-        searchForward( const ::rtl::OUString& searchStr,
+        searchForward( const OUString& searchStr,
                         sal_Int32 startPos, sal_Int32 endPos )
                             throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::util::SearchResult SAL_CALL
-        searchBackward( const ::rtl::OUString& searchStr,
+        searchBackward( const OUString& searchStr,
                         sal_Int32 startPos, sal_Int32 endPos )
                             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/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 77f03c6cf935..4c650b4eefc9 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -23,7 +23,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index c03517718421..2c3a0c9a8cca 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -24,7 +24,6 @@
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index d9fe16ccce20..617ff29f0dad 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -32,8 +32,6 @@ using namespace com::sun::star::i18n;
 using namespace com::sun::star::linguistic2;
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 94c1cd85e1af..1cbd3b3934e8 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::i18n;
 using namespace com::sun::star::linguistic2;
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
index a991c6f80e25..22036446535f 100644
--- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
+++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
@@ -30,7 +30,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
index a7b028c152b7..911164ae3e43 100644
--- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx
+++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
@@ -30,7 +30,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
index 07d56e2648e1..c0e07f3c3ec6 100644
--- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
@@ -27,7 +27,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
index 57c1b1c676f8..098a6a072fd5 100644
--- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
@@ -27,7 +27,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx
index 9eb07bd3a420..e525f5dcca35 100644
--- a/i18npool/source/transliteration/ignoreKana.cxx
+++ b/i18npool/source/transliteration/ignoreKana.cxx
@@ -30,7 +30,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
index 977f471e4e74..88ea9a89f10f 100644
--- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
@@ -26,7 +26,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
index 66f45c5bbee6..67ad5043fda3 100644
--- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
@@ -26,7 +26,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
index 9891febfe712..76cb444aead5 100644
--- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
@@ -30,7 +30,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx
index 1d40692880cc..aa4e87b5d5c3 100644
--- a/i18npool/source/transliteration/ignoreWidth.cxx
+++ b/i18npool/source/transliteration/ignoreWidth.cxx
@@ -29,7 +29,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index f4e22111f1f6..7d1898e703e0 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -28,8 +28,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index af5ca8f0bdbf..918461b5dad9 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -41,7 +41,6 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
@@ -576,7 +575,7 @@ namespace
     /** structure to cache the last transliteration body used. */
     struct TransBody
     {
-        ::rtl::OUString Name;
+        OUString Name;
         ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedTransliteration > Body;
     };
     class theTransBodyMutex : public rtl::Static<osl::Mutex, theTransBodyMutex> {};
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx
index 0300ea48f8b0..a1de147f4e42 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.cxx
@@ -23,7 +23,6 @@
 #include <transliteration_Ignore.hxx>
 
 using namespace com::sun::star::uno;
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx
index 329f2d565a4b..4ef2cfbc249a 100644
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
+++ b/i18npool/source/transliteration/transliteration_Numeric.cxx
@@ -25,7 +25,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx
index f62a7fbc4f29..eb2dc0efaf18 100644
--- a/i18npool/source/transliteration/transliteration_OneToOne.cxx
+++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx
@@ -24,7 +24,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx
index 8a63e1bebe88..1eb07f7ba577 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -262,7 +262,7 @@ Transliteration_titlecase::Transliteration_titlecase()
     implementationName = "com.sun.star.i18n.Transliteration.Transliteration_titlecase";
 }
 
-static rtl::OUString transliterate_titlecase_Impl(
+static OUString transliterate_titlecase_Impl(
     const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
     const Locale &rLocale,
     Sequence< sal_Int32 >& offset )
@@ -317,7 +317,7 @@ static rtl::OUString transliterate_titlecase_Impl(
 
 // this function expects to be called on a word-by-word basis,
 // namely that startPos points to the first char of the word
-rtl::OUString SAL_CALL Transliteration_titlecase::transliterate(
+OUString SAL_CALL Transliteration_titlecase::transliterate(
     const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
     Sequence< sal_Int32 >& offset )
     throw(RuntimeException)
@@ -336,7 +336,7 @@ Transliteration_sentencecase::Transliteration_sentencecase()
 
 // this function expects to be called on a sentence-by-sentence basis,
 // namely that startPos points to the first word (NOT first char!) in the sentence
-rtl::OUString SAL_CALL Transliteration_sentencecase::transliterate(
+OUString SAL_CALL Transliteration_sentencecase::transliterate(
     const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
     Sequence< sal_Int32 >& offset )
     throw(RuntimeException)
diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx
index 11bdf4a00c4c..d42261bb3380 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.cxx
@@ -89,8 +89,8 @@ Transliteration_caseignore::transliterateRange( const OUString& str1, const OUSt
 
 sal_Bool SAL_CALL
 Transliteration_caseignore::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)
 {
     return (compare(str1, pos1, nCount1, nMatch1, str2, pos2, nCount2, nMatch2) == 0);
@@ -98,8 +98,8 @@ Transliteration_caseignore::equals(
 
 sal_Int32 SAL_CALL
 Transliteration_caseignore::compareSubstring(
-    const ::rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1,
-    const ::rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2)
+    const OUString& str1, sal_Int32 off1, sal_Int32 len1,
+    const OUString& str2, sal_Int32 off2, sal_Int32 len2)
     throw(RuntimeException)
 {
     sal_Int32 nMatch1, nMatch2;
@@ -109,8 +109,8 @@ Transliteration_caseignore::compareSubstring(
 
 sal_Int32 SAL_CALL
 Transliteration_caseignore::compareString(
-    const ::rtl::OUString& str1,
-    const ::rtl::OUString& str2)
+    const OUString& str1,
+    const OUString& str2)
     throw(RuntimeException)
 {
     sal_Int32 nMatch1, nMatch2;
@@ -119,8 +119,8 @@ Transliteration_caseignore::compareString(
 
 sal_Int32 SAL_CALL
 Transliteration_caseignore::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(RuntimeException)
 {
     const sal_Unicode *unistr1 = (sal_Unicode*) str1.getStr() + pos1;