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, 42 insertions, 44 deletions

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index d67a2c3b2168..ec88131b9e11 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -60,8 +60,6 @@
 #endif
 
 using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 #if DEBUG_UNIT_TEST
 using ::std::cout;
@@ -73,7 +71,7 @@ namespace {
 #if DEBUG_UNIT_TEST
 ::std::ostream& operator<< (::std::ostream& os, const OUString& str)
 {
-    return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr();
+    return os << OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr();
 }
 #endif
 
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index 90ca5fa71044..3d160d66bee5 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -79,10 +79,10 @@ public:
         return m_identifier;
     }
 
-    virtual rtl::OUString SAL_CALL getContentType()
+    virtual OUString SAL_CALL getContentType()
         throw (css::uno::RuntimeException)
     {
-        return rtl::OUString();
+        return OUString();
     }
 
     virtual void SAL_CALL addContentEventListener(
@@ -123,7 +123,7 @@ Content::Content(
     m_identifier(identifier)
 {
     assert(m_identifier.is());
-    rtl::OUString uri(m_identifier->getContentIdentifier());
+    OUString uri(m_identifier->getContentIdentifier());
     if (!uri.matchIgnoreAsciiCase(m_prefix)
         || uri.indexOf('#', RTL_CONSTASCII_LENGTH(m_prefix)) != -1)
     {
@@ -146,10 +146,10 @@ css::uno::Any Content::execute(
     // otherwise, if the last non-empty segment starts with '1', add a final
     // slash, and if the last non-empty segment starts with '2', remove a final
     // slash (if any); also, turn the given uri into all-lowercase:
-    rtl::OUString uri(m_identifier->getContentIdentifier());
+    OUString uri(m_identifier->getContentIdentifier());
     sal_Unicode c = '0';
     for (sal_Int32 i = RTL_CONSTASCII_LENGTH(m_prefix); i != -1;) {
-        rtl::OUString seg(uri.getToken(0, '/', i));
+        OUString seg(uri.getToken(0, '/', i));
         if (seg.getLength() > 0) {
             c = seg[0];
             if (c < '0' || c > '2') {
@@ -228,7 +228,7 @@ void Test::finish() {
 void Test::testNormalizedMakeRelative() {
     css::ucb::UniversalContentBroker::create(m_context)->
         registerContentProvider(
-            new Provider, rtl::OUString("test"),
+            new Provider, OUString("test"),
             true);
     struct Data {
         char const * base;
@@ -259,14 +259,14 @@ void Test::testNormalizedMakeRelative() {
     for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) {
         css::uno::Reference< css::uri::XUriReference > ref(
             URIHelper::normalizedMakeRelative(
-                m_context, rtl::OUString::createFromAscii(tests[i].base),
-                rtl::OUString::createFromAscii(tests[i].absolute)));
+                m_context, OUString::createFromAscii(tests[i].base),
+                OUString::createFromAscii(tests[i].absolute)));
         bool ok = tests[i].relative == 0
             ? !ref.is()
             : ref.is() && ref->getUriReference().equalsAscii(tests[i].relative);
-        rtl::OString msg;
+        OString msg;
         if (!ok) {
-            rtl::OStringBuffer buf;
+            OStringBuffer buf;
             buf.append('<');
             buf.append(tests[i].base);
             buf.append(">, <");
@@ -275,7 +275,7 @@ void Test::testNormalizedMakeRelative() {
             if (ref.is()) {
                 buf.append('<');
                 buf.append(
-                    rtl::OUStringToOString(
+                    OUStringToOString(
                         ref->getUriReference(), RTL_TEXTENCODING_UTF8));
                 buf.append('>');
             } else {
@@ -386,19 +386,19 @@ void Test::testFindFirstURLInText() {
     };
     CharClass charClass( m_context, LanguageTag( com::sun::star::lang::Locale("en", "US", "")));
     for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) {
-        rtl::OUString input(rtl::OUString::createFromAscii(tests[i].input));
+        OUString input(OUString::createFromAscii(tests[i].input));
         sal_Int32 begin = 0;
         sal_Int32 end = input.getLength();
-        rtl::OUString result(
+        OUString result(
             URIHelper::FindFirstURLInText(input, begin, end, charClass));
         bool ok = tests[i].result == 0
             ? (result.getLength() == 0 && begin == input.getLength()
                && end == input.getLength())
             : (result.equalsAscii(tests[i].result) && begin == tests[i].begin
                && end == tests[i].end);
-        rtl::OString msg;
+        OString msg;
         if (!ok) {
-            rtl::OStringBuffer buf;
+            OStringBuffer buf;
             buf.append('"');
             buf.append(tests[i].input);
             buf.append("\" -> ");
@@ -409,7 +409,7 @@ void Test::testFindFirstURLInText() {
             buf.append(static_cast< sal_Int32 >(tests[i].end));
             buf.append(')');
             buf.append(" != ");
-            buf.append(rtl::OUStringToOString(result, RTL_TEXTENCODING_UTF8));
+            buf.append(OUStringToOString(result, RTL_TEXTENCODING_UTF8));
             buf.append(" (");
             buf.append(static_cast< sal_Int32 >(begin));
             buf.append(", ");
diff --git a/svl/qa/unit/test_lngmisc.cxx b/svl/qa/unit/test_lngmisc.cxx
index febc64b533b8..3381126aff1e 100644
--- a/svl/qa/unit/test_lngmisc.cxx
+++ b/svl/qa/unit/test_lngmisc.cxx
@@ -58,16 +58,16 @@ namespace
 
   void LngMiscTest::testRemoveHyphens()
   {
-    ::rtl::OUString str1("");
-    ::rtl::OUString str2("a-b--c---");
+    OUString str1("");
+    OUString str2("a-b--c---");
 
-    ::rtl::OUStringBuffer str3Buf;
+    OUStringBuffer str3Buf;
     str3Buf.append(SVT_SOFT_HYPHEN);
     str3Buf.append(SVT_HARD_HYPHEN);
     str3Buf.append(SVT_HARD_HYPHEN);
-    ::rtl::OUString str3(str3Buf.makeStringAndClear());
+    OUString str3(str3Buf.makeStringAndClear());
 
-    ::rtl::OUString str4("asdf");
+    OUString str4("asdf");
 
     bool bModified = linguistic::RemoveHyphens(str1);
     CPPUNIT_ASSERT(!bModified);
@@ -89,17 +89,17 @@ namespace
 
   void LngMiscTest::testRemoveControlChars()
   {
-    ::rtl::OUString str1("");
-    ::rtl::OUString str2("asdf");
-    ::rtl::OUString str3("asdf\nasdf");
+    OUString str1("");
+    OUString str2("asdf");
+    OUString str3("asdf\nasdf");
 
-    ::rtl::OUStringBuffer str4Buf(33);
+    OUStringBuffer str4Buf(33);
     str4Buf.setLength(33);
     for(int i = 0; i < 33; i++)
       str4Buf[i] = static_cast<sal_Unicode>(i);
     //    TODO: is this a bug? shouldn't RemoveControlChars remove this?
     //    str4Buf[33] = static_cast<sal_Unicode>(0x7F);
-    ::rtl::OUString str4(str4Buf.makeStringAndClear());
+    OUString str4(str4Buf.makeStringAndClear());
 
     bool bModified = linguistic::RemoveControlChars(str1);
     CPPUNIT_ASSERT(!bModified);
@@ -120,17 +120,17 @@ namespace
 
   void LngMiscTest::testReplaceControlChars()
   {
-    ::rtl::OUString str1("");
-    ::rtl::OUString str2("asdf");
-    ::rtl::OUString str3("asdf\nasdf");
+    OUString str1("");
+    OUString str2("asdf");
+    OUString str3("asdf\nasdf");
 
-    ::rtl::OUStringBuffer str4Buf(33);
+    OUStringBuffer str4Buf(33);
     str4Buf.setLength(33);
     for(int i = 0; i < 33; i++)
       str4Buf[i] = static_cast<sal_Unicode>(i);
     //    TODO: is this a bug? shouldn't RemoveControlChars remove this?
     //    str4Buf[33] = static_cast<sal_Unicode>(0x7F);
-    ::rtl::OUString str4(str4Buf.makeStringAndClear());
+    OUString str4(str4Buf.makeStringAndClear());
 
     bool bModified = linguistic::ReplaceControlChars(str1);
     CPPUNIT_ASSERT(!bModified);
@@ -153,16 +153,16 @@ namespace
 
   void LngMiscTest::testGetThesaurusReplaceText()
   {
-    const ::rtl::OUString str1("");
-    const ::rtl::OUString str2("asdf");
-    const ::rtl::OUString str3("asdf (abc)");
-    const ::rtl::OUString str4("asdf*");
-    const ::rtl::OUString str5("asdf * ");
-    const ::rtl::OUString str6("asdf (abc) *");
-    const ::rtl::OUString str7("asdf asdf * (abc)");
-    const ::rtl::OUString str8(" * (abc) asdf *");
-
-    ::rtl::OUString r = linguistic::GetThesaurusReplaceText(str1);
+    const OUString str1("");
+    const OUString str2("asdf");
+    const OUString str3("asdf (abc)");
+    const OUString str4("asdf*");
+    const OUString str5("asdf * ");
+    const OUString str6("asdf (abc) *");
+    const OUString str7("asdf asdf * (abc)");
+    const OUString str8(" * (abc) asdf *");
+
+    OUString r = linguistic::GetThesaurusReplaceText(str1);
     CPPUNIT_ASSERT(r.isEmpty());
 
     r = linguistic::GetThesaurusReplaceText(str2);