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, 23 insertions, 25 deletions

diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index 41589f18310d..35d9139b6bfe 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -40,9 +40,9 @@
 
 namespace {
 
-rtl::OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab)
+OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab)
 {
-    rtl::OUString aString;
+    OUString aString;
     Color* pColor;
     ScRefCellValue aCell;
     aCell.assign(*pDoc, ScAddress(nCol, nRow, nTab));
@@ -57,9 +57,9 @@ rtl::OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRo
     return aString;
 }
 
-rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
+OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
 {
-    rtl::OStringBuffer aString("Error in Table: ");
+    OStringBuffer aString("Error in Table: ");
     aString.append(static_cast<sal_Int32>(nTab));
     aString.append(" Column: ");
     aString.append(static_cast<sal_Int32>(nCol));
@@ -68,20 +68,20 @@ rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
     return aString.makeStringAndClear();
 }
 
-rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const rtl::OUString& rExpectedString, const rtl::OUString& rString)
+OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rExpectedString, const OUString& rString)
 {
-    rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
+    OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
     aString.append("; Expected: '");
-    aString.append(rtl::OUStringToOString(rExpectedString, RTL_TEXTENCODING_UTF8));
+    aString.append(OUStringToOString(rExpectedString, RTL_TEXTENCODING_UTF8));
     aString.append("' Found: '");
-    aString.append(rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
+    aString.append(OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
     aString.append("'");
     return aString.makeStringAndClear();
 }
 
-rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue)
+OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double aExpected, double aValue)
 {
-    rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
+    OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
     aString.append("; Expected: '");
     aString.append(aExpected);
     aString.append("' Found: '");
@@ -133,12 +133,12 @@ public:
         }
         else if (meStringType == PureString)
         {
-            rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
-            rtl::OUString aString = mpDoc->GetString(mnCol, mnRow, mnTab);
+            OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
+            OUString aString = mpDoc->GetString(mnCol, mnRow, mnTab);
 
 #if DEBUG_CSV_HANDLER
-                std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
-                std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+                std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+                std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
                 std::cout << "result: " << (int)(aCSVString == aString) << std::endl;
 #endif //DEBUG_CSV_HANDLER
 
@@ -151,7 +151,7 @@ public:
             double nValue = strtod(&aStr[0], &pRemainingChars);
             if (*pRemainingChars)
             {
-                rtl::OUString aString;
+                OUString aString;
                 switch (meStringType)
                 {
                     case StringValue:
@@ -163,10 +163,10 @@ public:
                     default:
                         break;
                 }
-                rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
+                OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
 #if DEBUG_CSV_HANDLER
-                std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
-                std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+                std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+                std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
                 std::cout << "result: " << (int)(aCSVString == aString) << std::endl;
 #endif //DEBUG_CSV_HANDLER
 
@@ -222,11 +222,11 @@ public:
 #if DEBUG_CSV_HANDLER
         std::cout << "Col: " << mnCol << " Row: " << mnRow << std::endl;
 #endif //DEBUG_CSV_HANDLER
-        rtl::OUString aString = getConditionalFormatString(mpDoc, mnCol, mnRow, mnTab);
-        rtl::OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
+        OUString aString = getConditionalFormatString(mpDoc, mnCol, mnRow, mnTab);
+        OUString aCSVString(p, n, RTL_TEXTENCODING_UTF8);
 #if DEBUG_CSV_HANDLER
-        std::cout << "String: " << rtl::OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
-        std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+        std::cout << "String: " << OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+        std::cout << "CSVString: " << OUStringToOString(aCSVString, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
         std::cout << "result: " << (int)(aCSVString == aString) << std::endl;
 #endif //DEBUG_CSV_HANDLER
         CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, aCSVString, aString).getStr(), aString == aCSVString );
diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx
index 4de5c9d72599..e54cc43bc8c1 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -52,8 +52,6 @@
 #include <iostream>
 
 using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using ::std::cout;
 using ::std::cerr;
 using ::std::endl;
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index b610f5883144..9558691aba86 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -154,7 +154,7 @@ protected:
             SfxItemSet* pSet = pSrcMed->GetItemSet();
             pSet->Put(SfxStringItem(SID_PASSWORD, *pPassword));
         }
-        printf("about to load %s\n", rtl::OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+        printf("about to load %s\n", OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() );
         if (!xDocShRef->DoLoad(pSrcMed))
         {
             xDocShRef->DoClose();