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

2 files changed, 18 insertions, 18 deletions

diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index a4c225699f25..704edb1a8770 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -60,8 +60,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
         rOut.SetStreamCharSet( eCharSet );
 
     sal_Unicode cStrDelim('"');
-    rtl::OString aStrDelimEncoded;    // only used if not Unicode
-    rtl::OUString aStrDelimDecoded;     // only used if context encoding
+    OString aStrDelimEncoded;    // only used if not Unicode
+    OUString aStrDelimDecoded;     // only used if context encoding
     bool bContextOrNotAsciiEncoding;
     if ( eCharSet == RTL_TEXTENCODING_UNICODE )
     {
@@ -70,7 +70,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
     }
     else
     {
-        aStrDelimEncoded = rtl::OString(&cStrDelim, 1, eCharSet);
+        aStrDelimEncoded = OString(&cStrDelim, 1, eCharSet);
         rtl_TextEncodingInfo aInfo;
         aInfo.StructSize = sizeof(aInfo);
         if ( rtl_getTextEncodingInfo( eCharSet, &aInfo ) )
@@ -79,7 +79,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
                 (((aInfo.Flags & RTL_TEXTENCODING_INFO_CONTEXT) != 0) ||
                  ((aInfo.Flags & RTL_TEXTENCODING_INFO_ASCII) == 0));
             if ( bContextOrNotAsciiEncoding )
-                aStrDelimDecoded = rtl::OStringToOUString(aStrDelimEncoded, eCharSet);
+                aStrDelimDecoded = OStringToOUString(aStrDelimEncoded, eCharSet);
         }
         else
             bContextOrNotAsciiEncoding = false;
@@ -93,8 +93,8 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
     const sal_Char*     pNumDataERROR = "0,0\nERROR\n";
 
     FltError            eRet = eERR_OK;
-    rtl::OUStringBuffer aOS;
-    rtl::OUString       aString;
+    OUStringBuffer aOS;
+    OUString       aString;
     SCCOL               nEndCol = rRange.aEnd.Col();
     SCROW               nEndRow = rRange.aEnd.Row();
     SCCOL               nNumCols = nEndCol - rRange.aStart.Col() + 1;
@@ -243,14 +243,14 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
                 else if ( bContextOrNotAsciiEncoding )
                 {
                     // to byte encoding
-                    rtl::OString aStrEnc = rtl::OUStringToOString(aTmpStr, eCharSet);
+                    OString aStrEnc = OUStringToOString(aTmpStr, eCharSet);
                     // back to Unicode
-                    rtl::OUString aStrDec = rtl::OStringToOUString(aStrEnc, eCharSet);
+                    OUString aStrDec = OStringToOUString(aStrEnc, eCharSet);
                     // search on re-decoded string
                     sal_Int32 nPos = aStrDec.indexOf(aStrDelimDecoded);
                     while (nPos >= 0)
                     {
-                        rtl::OUStringBuffer aBuf(aStrDec);
+                        OUStringBuffer aBuf(aStrDec);
                         aBuf.insert(nPos, aStrDelimDecoded);
                         aStrDec = aBuf.makeStringAndClear();
                         nPos = aStrDec.indexOf(
@@ -263,12 +263,12 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
                 }
                 else
                 {
-                    rtl::OString aStrEnc = rtl::OUStringToOString(aTmpStr, eCharSet);
+                    OString aStrEnc = OUStringToOString(aTmpStr, eCharSet);
                     // search on encoded string
                     sal_Int32 nPos = aStrEnc.indexOf(aStrDelimEncoded);
                     while (nPos >= 0)
                     {
-                        rtl::OStringBuffer aBuf(aStrEnc);
+                        OStringBuffer aBuf(aStrEnc);
                         aBuf.insert(nPos, aStrDelimEncoded);
                         aStrEnc = aBuf.makeStringAndClear();
                         nPos = aStrEnc.indexOf(
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 7e2ae9dc1a4d..734253a6de93 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -61,7 +61,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
     bool        bSyntErrWarn = false;
     bool        bOverflowWarn = false;
 
-    rtl::OUString   aData = aDifParser.aData;
+    OUString   aData = aDifParser.aData;
     bool        bData = false;
 
     rIn.Seek( 0 );
@@ -308,7 +308,7 @@ TOPIC DifParser::GetNextTopic( void )
     };
 
     STATE                   eS = S_START;
-    rtl::OUString           aLine;
+    OUString           aLine;
 
     nVector = 0;
     nVal = 0;
@@ -430,7 +430,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData )
     else
     {   // ...und zur Strafe mit'm Numberformatter...
         OSL_ENSURE( pNumFormatter, "-DifParser::GetNextDataset(): No Formatter, more fun!" );
-        rtl::OUString aTestVal( pPossibleNumericData );
+        OUString aTestVal( pPossibleNumericData );
         sal_uInt32 nFormat = 0;
         double fTmpVal;
         if( pNumFormatter->IsNumberFormat( aTestVal, nFormat, fTmpVal ) )
@@ -445,7 +445,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* pPossibleNumericData )
     return eRet;
 }
 
-bool DifParser::ReadNextLine( rtl::OUString& rStr )
+bool DifParser::ReadNextLine( OUString& rStr )
 {
     if( aLookAheadLine.isEmpty() )
     {
@@ -454,7 +454,7 @@ bool DifParser::ReadNextLine( rtl::OUString& rStr )
     else
     {
         rStr = aLookAheadLine;
-        aLookAheadLine = rtl::OUString();
+        aLookAheadLine = OUString();
         return true;
     }
 }
@@ -502,7 +502,7 @@ bool DifParser::LookAhead()
 DATASET DifParser::GetNextDataset( void )
 {
     DATASET             eRet = D_UNKNOWN;
-    rtl::OUString       aLine;
+    OUString       aLine;
     const sal_Unicode*      pAktBuffer;
 
     ReadNextLine( aLine );
@@ -529,7 +529,7 @@ DATASET DifParser::GetNextDataset( void )
             {
                 pAktBuffer++;
                 eRet = GetNumberDataset(pAktBuffer);
-                rtl::OUString aTmpLine;
+                OUString aTmpLine;
                 ReadNextLine( aTmpLine );
                 if ( eRet == D_SYNT_ERROR )
                 {   // for broken records write "#ERR: data" to cell