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

4 files changed, 67 insertions, 67 deletions

diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index f538bec146a0..3d6ce3708545 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -144,14 +144,14 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
                 pDataBase->Load( aStm );
                 if( aStm.GetError() != SVSTREAM_OK )
                 {
-                    rtl::OStringBuffer aStr;
+                    OStringBuffer aStr;
                     if( aStm.GetError() == SVSTREAM_FILEFORMAT_ERROR )
                         aStr.append("error: incompatible format, file ");
                     else if( aStm.GetError() == SVSTREAM_WRONGVERSION )
                         aStr.append("error: wrong version, file ");
                     else
                         aStr.append("error during load, file ");
-                    aStr.append(rtl::OUStringToOString(aFileName,
+                    aStr.append(OUStringToOString(aFileName,
                         RTL_TEXTENCODING_UTF8));
                     fprintf( stderr, "%s\n", aStr.getStr() );
                     return sal_False;
@@ -166,7 +166,7 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
         }
         else
         {
-            const rtl::OString aStr(rtl::OUStringToOString(aFileName,
+            const OString aStr(OUStringToOString(aFileName,
                 RTL_TEXTENCODING_UTF8));
             fprintf( stderr, "unable to read input file: %s\n", aStr.getStr() );
             return sal_False;
@@ -178,16 +178,16 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
 static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
 {
     // program name
-    pList->push_back( new String(rtl::OUString::createFromAscii(*argv) ) );
+    pList->push_back( new String(OUString::createFromAscii(*argv) ) );
     for( int i = 1; i < argc; i++ )
     {
         if( '@' == **(argv +i) )
         { // when @, then response file
-            SvFileStream aStm( rtl::OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
+            SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
             if( aStm.GetError() != SVSTREAM_OK )
                 return sal_False;
 
-            rtl::OString aStr;
+            OString aStr;
             while( aStm.ReadLine( aStr ) )
             {
                 sal_uInt16 n = 0;
@@ -200,12 +200,12 @@ static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
                     while( aStr[n] && !isspace( aStr[n] ) )
                         n++;
                     if( n != nPos )
-                        pList->push_back( new String( rtl::OStringToOUString(aStr.copy(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ) );
+                        pList->push_back( new String( OStringToOUString(aStr.copy(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ) );
                 }
             }
         }
         else if( argv[ i ] )
-            pList->push_back( new String( rtl::OUString::createFromAscii( argv[ i ] ) ) );
+            pList->push_back( new String( OUString::createFromAscii( argv[ i ] ) ) );
     }
     return sal_True;
 }
@@ -293,7 +293,7 @@ SvCommand::SvCommand( int argc, char ** argv )
                     {
                         printf(
                             "unknown switch: %s\n",
-                            rtl::OUStringToOString(
+                            OUStringToOString(
                                 aParam, RTL_TEXTENCODING_UTF8).getStr());
                         exit( -1 );
                     }
@@ -336,7 +336,7 @@ SvCommand::SvCommand( int argc, char ** argv )
                     // temporary compatibility hack
                     printf(
                         "unknown switch: %s\n",
-                        rtl::OUStringToOString(
+                        OUStringToOString(
                             aParam, RTL_TEXTENCODING_UTF8).getStr());
                     exit( -1 );
                 }
@@ -356,13 +356,13 @@ SvCommand::SvCommand( int argc, char ** argv )
         delete aList[ i ];
     aList.clear();
 
-    rtl::OString aInc(getenv("INCLUDE"));
+    OString aInc(getenv("INCLUDE"));
     // append include environment variable
     if( aInc.getLength() )
     {
         if( aPath.Len() )
             aPath += OUString( SAL_PATHSEPARATOR );
-        aPath += rtl::OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US);
+        aPath += OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US);
     }
 }
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 7e907e769302..8850d9813d8e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -75,7 +75,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
     return aTypeList;
 }
 
-SvMetaModule * SvIdlDataBase::GetModule( const rtl::OString& rName )
+SvMetaModule * SvIdlDataBase::GetModule( const OString& rName )
 {
     for( sal_uLong n = 0; n < aModuleList.size(); n++ )
         if( aModuleList[n]->GetName().getString().equals(rName) )
@@ -157,7 +157,7 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
     aPStm << nUniqueId;
 }
 
-void SvIdlDataBase::SetError( const rtl::OString& rError, SvToken * pTok )
+void SvIdlDataBase::SetError( const OString& rError, SvToken * pTok )
 {
     if( pTok->GetLine() > 10000 )
         aError.SetText( "hgchcg" );
@@ -175,7 +175,7 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
     GetStack().Push( pObj );
 }
 
-sal_Bool SvIdlDataBase::FindId( const rtl::OString& rIdName, sal_uLong * pVal )
+sal_Bool SvIdlDataBase::FindId( const OString& rIdName, sal_uLong * pVal )
 {
     if( pIdTable )
     {
@@ -189,7 +189,7 @@ sal_Bool SvIdlDataBase::FindId( const rtl::OString& rIdName, sal_uLong * pVal )
     return sal_False;
 }
 
-sal_Bool SvIdlDataBase::InsertId( const rtl::OString& rIdName, sal_uLong nVal )
+sal_Bool SvIdlDataBase::InsertId( const OString& rIdName, sal_uLong nVal )
 {
     if( !pIdTable )
         pIdTable = new SvStringHashTable( 20003 );
@@ -228,12 +228,12 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                 if( pTok->Is( SvHash_define() ) )
                 {
                     pTok = aTokStm.GetToken_Next();
-                    rtl::OString aDefName;
+                    OString aDefName;
                     if( pTok->IsIdentifier() )
                         aDefName = pTok->GetString();
                     else
                     {
-                        rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+                        OString aStr(RTL_CONSTASCII_STRINGPARAM(
                             "unexpected token after define"));
                         // set error
                         SetError( aStr, pTok );
@@ -264,7 +264,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                               || pTok->GetChar() == '^'
                               || pTok->GetChar() == '~' )
                             {
-                                rtl::OStringBuffer aStr("unknown operator '");
+                                OStringBuffer aStr("unknown operator '");
                                 aStr.append(pTok->GetChar());
                                 aStr.append("'in define");
                                 // set error
@@ -290,7 +290,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                     {
                         if( !InsertId( aDefName, nVal ) )
                         {
-                            rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM("hash table overflow: "));
+                            OString aStr(RTL_CONSTASCII_STRINGPARAM("hash table overflow: "));
                             SetError( aStr, pTok );
                             WriteError( aTokStm );
                             return sal_False;
@@ -300,7 +300,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                 else if( pTok->Is( SvHash_include() ) )
                 {
                     pTok = aTokStm.GetToken_Next();
-                    rtl::OStringBuffer aName;
+                    OStringBuffer aName;
                     if( pTok->IsString() )
                         aName.append(pTok->GetString());
                     else if( pTok->IsChar() && pTok->GetChar() == '<' )
@@ -314,7 +314,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                         }
                         if( pTok->IsEof() )
                         {
-                            rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+                            OString aStr(RTL_CONSTASCII_STRINGPARAM(
                                 "unexpected eof in #include"));
                             // set error
                             SetError(aStr, pTok);
@@ -322,10 +322,10 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
                             return sal_False;
                         }
                     }
-                    if (!ReadIdFile(rtl::OStringToOUString(aName.toString(),
+                    if (!ReadIdFile(OStringToOUString(aName.toString(),
                         RTL_TEXTENCODING_ASCII_US)))
                     {
-                        rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+                        OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
                             "cannot read file: "));
                         aStr.append(aName.makeStringAndClear());
                         SetError(aStr.makeStringAndClear(), pTok);
@@ -352,7 +352,7 @@ SvMetaType * SvIdlDataBase::FindType( const SvMetaType * pPType,
     return NULL;
 }
 
-SvMetaType * SvIdlDataBase::FindType( const rtl::OString& rName )
+SvMetaType * SvIdlDataBase::FindType( const OString& rName )
 {
     for( SvMetaTypeMemberList::const_iterator it = aTypeList.begin(); it != aTypeList.end(); ++it )
         if( rName.equals((*it)->GetName().getString()) )
@@ -401,7 +401,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
 
     if( pTok->IsIdentifier() )
     {
-        rtl::OString aName = pTok->GetString();
+        OString aName = pTok->GetString();
         SvMetaTypeMemberList & rList = GetTypeList();
         SvMetaTypeMemberList::const_iterator it = rList.begin();
         SvMetaType * pType = NULL;
@@ -484,7 +484,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
                 }
             }
 
-            rtl::OStringBuffer aStr("Nicht gefunden : ");
+            OStringBuffer aStr("Nicht gefunden : ");
             aStr.append(pTok->GetString());
             OSL_FAIL(aStr.getStr());
         }
@@ -530,15 +530,15 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
     return NULL;
 }
 
-void SvIdlDataBase::Write(const rtl::OString& rText)
+void SvIdlDataBase::Write(const OString& rText)
 {
     if( nVerbosity != 0 )
         fprintf( stdout, "%s", rText.getStr() );
 }
 
-void SvIdlDataBase::WriteError( const rtl::OString& rErrWrn,
-                                const rtl::OString& rFileName,
-                                const rtl::OString& rErrorText,
+void SvIdlDataBase::WriteError( const OString& rErrWrn,
+                                const OString& rFileName,
+                                const OString& rErrorText,
                                 sal_uLong nRow, sal_uLong nColumn ) const
 {
     // error treatment
@@ -555,7 +555,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
 {
     // error treatment
     String aFileName( rInStm.GetFileName() );
-    rtl::OStringBuffer aErrorText;
+    OStringBuffer aErrorText;
     sal_uLong   nRow = 0, nColumn = 0;
 
     rInStm.SeekEnd();
@@ -595,7 +595,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
         aError = SvIdlError();
     }
 
-    WriteError("error", rtl::OUStringToOString(aFileName,
+    WriteError("error", OUStringToOString(aFileName,
         RTL_TEXTENCODING_UTF8), aErrorText.makeStringAndClear(), nRow, nColumn);
 
     DBG_ASSERT( pTok, "token must be found" );
@@ -610,7 +610,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
     }
     if( pTok && pTok->IsIdentifier() )
     {
-        rtl::OString aN = IDLAPP->pHashTable->GetNearString( pTok->GetString() );
+        OString aN = IDLAPP->pHashTable->GetNearString( pTok->GetString() );
         if( !aN.isEmpty() )
             fprintf( stderr, "%s versus %s\n", pTok->GetString().getStr(), aN.getStr() );
     }
@@ -636,7 +636,7 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
             {
                 OUString aFullName;
                 if( osl::FileBase::E_None == osl::File::searchFileURL(
-                    rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US),
+                    OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US),
                     rPath,
                     aFullName) )
                 {
@@ -648,8 +648,8 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
                     {
                         if( aStm.GetError() == SVSTREAM_WRONGVERSION )
                         {
-                            rtl::OStringBuffer aStr("wrong version, file ");
-                            aStr.append(rtl::OUStringToOString( aFullName, RTL_TEXTENCODING_UTF8));
+                            OStringBuffer aStr("wrong version, file ");
+                            aStr.append(OUStringToOString( aFullName, RTL_TEXTENCODING_UTF8));
                             SetError(aStr.makeStringAndClear(), pTok);
                             WriteError( rInStm );
                             bOk = sal_False;
@@ -716,7 +716,7 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
             SvStringHashEntry* pEntry = aList[ i ];
             rOutStm << "#define " << pEntry->GetName().getStr()
                     << '\t'
-                    << rtl::OString::valueOf(static_cast<sal_Int64>(
+                    << OString::valueOf(static_cast<sal_Int64>(
                         pEntry->GetValue())).getStr()
                     << endl;
         }
@@ -834,12 +834,12 @@ void SvIdlDataBase::AddDepFile(String const& rFileName)
 }
 
 #ifdef WNT
-static ::rtl::OString
-lcl_ConvertToCygwin(::rtl::OString const& rString)
+static OString
+lcl_ConvertToCygwin(OString const& rString)
 {
     sal_Int32 i = 0;
     sal_Int32 const len = rString.getLength();
-    ::rtl::OStringBuffer buf(len + 16);
+    OStringBuffer buf(len + 16);
     if ((2 <= len) && (':' == rString[1]))
     {
         buf.append("/cygdrive/");
@@ -866,21 +866,21 @@ lcl_ConvertToCygwin(::rtl::OString const& rString)
 }
 #endif
 
-static ::rtl::OString
-lcl_Convert(::rtl::OUString const& rString)
+static OString
+lcl_Convert(OUString const& rString)
 {
     return
 #ifdef WNT
         lcl_ConvertToCygwin
 #endif
-            (::rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
+            (OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
 }
 
 struct WriteDep
 {
     SvFileStream & m_rStream;
     explicit WriteDep(SvFileStream & rStream) : m_rStream(rStream) { }
-    void operator() (::rtl::OUString const& rItem)
+    void operator() (OUString const& rItem)
     {
         m_rStream << " \\\n ";
         m_rStream << lcl_Convert(rItem).getStr();
@@ -888,7 +888,7 @@ struct WriteDep
 };
 
 bool SvIdlDataBase::WriteDepFile(
-        SvFileStream & rStream, ::rtl::OUString const& rTarget)
+        SvFileStream & rStream, OUString const& rTarget)
 {
     rStream << lcl_Convert(rTarget).getStr();
     rStream << " :";
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 1b2bb45b2328..ad8c9432324e 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -67,7 +67,7 @@ IdlDll::~IdlDll()
     delete pHashTable;
 }
 
-inline SvStringHashEntry * INS( const rtl::OString& rName )
+inline SvStringHashEntry * INS( const OString& rName )
 {
     sal_uInt32  nIdx;
     IDLAPP->pHashTable->Insert( rName, &nIdx );
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index ea2c227e23b9..33e190e07401 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -96,8 +96,8 @@ inline OUString tempFileHelper(OUString const & fname)
     }
     else
     {
-        rtl::OStringBuffer aStr("invalid filename: ");
-        aStr.append(rtl::OUStringToOString(fname, RTL_TEXTENCODING_UTF8));
+        OStringBuffer aStr("invalid filename: ");
+        aStr.append(OUStringToOString(fname, RTL_TEXTENCODING_UTF8));
         fprintf(stderr, "%s\n", aStr.getStr());
     }
     return aTmpFile;
@@ -147,8 +147,8 @@ int cdecl main ( int argc, char ** argv)
             if( !pDataBase->WriteDocumentation( aOutStm ) )
             {
                 nExit = -1;
-                rtl::OStringBuffer aStr("cannot write documentation file: ");
-                aStr.append(rtl::OUStringToOString(aCommand.aDocuFile, RTL_TEXTENCODING_UTF8));
+                OStringBuffer aStr("cannot write documentation file: ");
+                aStr.append(OUStringToOString(aCommand.aDocuFile, RTL_TEXTENCODING_UTF8));
                 fprintf(stderr, "%s\n", aStr.getStr());
             }
         }
@@ -159,8 +159,8 @@ int cdecl main ( int argc, char ** argv)
             if( !pDataBase->WriteSvIdl( aOutStm ) )
             {
                 nExit = -1;
-                rtl::OStringBuffer aStr("cannot write list file: ");
-                aStr.append(rtl::OUStringToOString(aCommand.aListFile, RTL_TEXTENCODING_UTF8));
+                OStringBuffer aStr("cannot write list file: ");
+                aStr.append(OUStringToOString(aCommand.aListFile, RTL_TEXTENCODING_UTF8));
                 fprintf(stderr, "%s\n", aStr.getStr());
             }
         }
@@ -171,8 +171,8 @@ int cdecl main ( int argc, char ** argv)
             if( !pDataBase->WriteSfx( aOutStm ) )
             {
                 nExit = -1;
-                rtl::OStringBuffer aStr("cannot write slotmap file: ");
-                aStr.append(rtl::OUStringToOString(aCommand.aSlotMapFile, RTL_TEXTENCODING_UTF8));
+                OStringBuffer aStr("cannot write slotmap file: ");
+                aStr.append(OUStringToOString(aCommand.aSlotMapFile, RTL_TEXTENCODING_UTF8));
                 fprintf(stderr, "%s\n", aStr.getStr());
             }
         }
@@ -183,8 +183,8 @@ int cdecl main ( int argc, char ** argv)
             if (!pDataBase->WriteHelpIds( aStm ) )
             {
                 nExit = -1;
-                rtl::OStringBuffer aStr("cannot write help ID file: ");
-                aStr.append(rtl::OUStringToOString(aCommand.aHelpIdFile, RTL_TEXTENCODING_UTF8));
+                OStringBuffer aStr("cannot write help ID file: ");
+                aStr.append(OUStringToOString(aCommand.aHelpIdFile, RTL_TEXTENCODING_UTF8));
                 fprintf(stderr, "%s\n", aStr.getStr());
             }
         }
@@ -195,8 +195,8 @@ int cdecl main ( int argc, char ** argv)
             if (!pDataBase->WriteCSV( aStm ) )
             {
                 nExit = -1;
-                rtl::OStringBuffer aStr("cannot write CSV file: ");
-                aStr.append(rtl::OUStringToOString(aCommand.aCSVFile, RTL_TEXTENCODING_UTF8));
+                OStringBuffer aStr("cannot write CSV file: ");
+                aStr.append(OUStringToOString(aCommand.aCSVFile, RTL_TEXTENCODING_UTF8));
                 fprintf(stderr, "%s\n", aStr.getStr());
             }
         }
@@ -207,8 +207,8 @@ int cdecl main ( int argc, char ** argv)
             if( !pDataBase->WriteSfxItem( aOutStm ) )
             {
                 nExit = -1;
-                rtl::OStringBuffer aStr("cannot write item file: ");
-                aStr.append(rtl::OUStringToOString(aCommand.aSfxItemFile, RTL_TEXTENCODING_UTF8));
+                OStringBuffer aStr("cannot write item file: ");
+                aStr.append(OUStringToOString(aCommand.aSfxItemFile, RTL_TEXTENCODING_UTF8));
                 fprintf(stderr, "%s\n", aStr.getStr());
             }
         }
@@ -220,8 +220,8 @@ int cdecl main ( int argc, char ** argv)
             if( aOutStm.GetError() != SVSTREAM_OK )
             {
                 nExit = -1;
-                rtl::OStringBuffer aStr("cannot write database file: ");
-                aStr.append(rtl::OUStringToOString(aCommand.aDataBaseFile, RTL_TEXTENCODING_UTF8));
+                OStringBuffer aStr("cannot write database file: ");
+                aStr.append(OUStringToOString(aCommand.aDataBaseFile, RTL_TEXTENCODING_UTF8));
                 fprintf(stderr, "%s\n", aStr.getStr());
             }
         }
@@ -234,7 +234,7 @@ int cdecl main ( int argc, char ** argv)
             {
                 nExit = -1;
                 fprintf( stderr, "cannot write dependency file: %s\n",
-                        ::rtl::OUStringToOString( aCommand.m_DepFile,
+                        OUStringToOString( aCommand.m_DepFile,
                             RTL_TEXTENCODING_UTF8 ).getStr() );
             }
         }
@@ -315,11 +315,11 @@ int cdecl main ( int argc, char ** argv)
         if( bErr )
         {
             nExit = -1;
-            rtl::OStringBuffer aStr("cannot move file from: ");
-            aStr.append(rtl::OUStringToOString(aErrFile2,
+            OStringBuffer aStr("cannot move file from: ");
+            aStr.append(OUStringToOString(aErrFile2,
                 RTL_TEXTENCODING_UTF8));
             aStr.append("\n              to file: ");
-            aStr.append(rtl::OUStringToOString(aErrFile,
+            aStr.append(OUStringToOString(aErrFile,
                 RTL_TEXTENCODING_UTF8));
             fprintf( stderr, "%s\n", aStr.getStr() );
         }