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

3 files changed, 12 insertions, 13 deletions

diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 463479937c58..5199b0712eea 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -207,7 +207,7 @@ long PaperInfo::sloppyFitPageDimension(long nDimension)
 
 PaperInfo PaperInfo::getSystemDefaultPaper()
 {
-    rtl::OUString aLocaleStr = officecfg::Setup::L10N::ooSetupSystemLocale::get();
+    OUString aLocaleStr = officecfg::Setup::L10N::ooSetupSystemLocale::get();
 
 #ifdef UNX
     // if set to "use system", get papersize from system
@@ -233,7 +233,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
 
             if (pBuffer && *pBuffer != 0)
             {
-                rtl::OString aPaper(pBuffer);
+                OString aPaper(pBuffer);
                 aPaper = aPaper.trim();
                 static struct { const char *pName; Paper ePaper; } aCustoms [] =
                 {
@@ -328,7 +328,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
         aLocaleStr = officecfg::System::L10N::Locale::get();
 
     if (aLocaleStr.isEmpty())
-        aLocaleStr = rtl::OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US"));
+        aLocaleStr = OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US"));
 
     // convert locale string to locale struct
     ::com::sun::star::lang::Locale aSysLocale;
@@ -368,13 +368,13 @@ PaperInfo::PaperInfo(long nPaperWidth, long nPaperHeight)
     }
 }
 
-rtl::OString PaperInfo::toPSName(Paper ePaper)
+OString PaperInfo::toPSName(Paper ePaper)
 {
     return static_cast<size_t>(ePaper) < nTabSize ?
-        rtl::OString(aDinTab[ePaper].m_pPSName) : rtl::OString();
+        OString(aDinTab[ePaper].m_pPSName) : OString();
 }
 
-Paper PaperInfo::fromPSName(const rtl::OString &rName)
+Paper PaperInfo::fromPSName(const OString &rName)
 {
     if (rName.isEmpty())
         return PAPER_USER;
diff --git a/i18nutil/source/utility/scripttypedetector.cxx b/i18nutil/source/utility/scripttypedetector.cxx
index 799774f34314..ece2b575e593 100644
--- a/i18nutil/source/utility/scripttypedetector.cxx
+++ b/i18nutil/source/utility/scripttypedetector.cxx
@@ -47,14 +47,14 @@ static sal_Int16 scriptDirection[] = {
     ScriptDirection::NEUTRAL,           // DirectionProperty_BOUNDARY_NEUTRAL = 18,
 };
 
-sal_Int16 ScriptTypeDetector::getScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection )
+sal_Int16 ScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection )
 {
     sal_Int16 dir = scriptDirection[unicode::getUnicodeDirection(Text[nPos])];
     return (dir == ScriptDirection::NEUTRAL) ? defaultScriptDirection : dir;
 }
 
 // return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range.
-sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction )
+sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction )
 {
         sal_Int32 cPos = nPos;
 
@@ -67,7 +67,7 @@ sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const rtl::OUString& Text,
         return cPos == nPos ? -1 : cPos + 1;
 }
 
-sal_Int32 ScriptTypeDetector::endOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction )
+sal_Int32 ScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction )
 {
         sal_Int32 cPos = nPos;
         sal_Int32 len = Text.getLength();
@@ -81,7 +81,7 @@ sal_Int32 ScriptTypeDetector::endOfScriptDirection( const rtl::OUString& Text, s
         return cPos == nPos ? -1 : cPos;
 }
 
-sal_Int16 ScriptTypeDetector::getCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+sal_Int16 ScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos )
 {
     static ScriptTypeList typeList[] = {
         { UnicodeScript_kHebrew, UnicodeScript_kHebrew, CTLScriptType::CTL_HEBREW },    // 10
@@ -95,7 +95,7 @@ sal_Int16 ScriptTypeDetector::getCTLScriptType( const rtl::OUString& Text, sal_I
 }
 
 // Begin of Script Type is inclusive.
-sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos )
 {
     if (nPos < 0)
         return 0;
@@ -112,7 +112,7 @@ sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const rtl::OUString& Text, s
 }
 
 // End of the Script Type is exclusive, the return value pointing to the begin of next script type
-sal_Int32 ScriptTypeDetector::endOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos )
+sal_Int32 ScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos )
 {
     if (nPos < 0)
         return 0;
diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx
index 0777c979101f..99508043dee8 100644
--- a/i18nutil/source/utility/widthfolding.cxx
+++ b/i18nutil/source/utility/widthfolding.cxx
@@ -25,7 +25,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 namespace com { namespace sun { namespace star { namespace i18n {