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

10 files changed, 66 insertions, 66 deletions

diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index 3d2ab4aedbb0..96b3954174d3 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -34,12 +34,12 @@ class RscTop;
 class RscTypCont;
 
 /******************* G l o b a l   V a r i a b l e s *********************/
-extern rtl::OString* pStdParType;
-extern rtl::OString* pStdPar1;
-extern rtl::OString* pStdPar2;
-extern rtl::OString* pWinParType;
-extern rtl::OString* pWinPar1;
-extern rtl::OString* pWinPar2;
+extern OString* pStdParType;
+extern OString* pStdPar1;
+extern OString* pStdPar2;
+extern OString* pWinParType;
+extern OString* pWinPar1;
+extern OString* pWinPar2;
 extern sal_uInt32       nRefDeep;
 extern sal_uInt32       nRsc_XYMAPMODEId;
 extern sal_uInt32       nRsc_WHMAPMODEId;
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 05eb843794e8..3cba043db1fc 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -81,7 +81,7 @@ public:
 
 class RscNameTable;
 
-sal_uInt32 GetLangId( const rtl::OString& rLang);
+sal_uInt32 GetLangId( const OString& rLang);
 
 class RscLangEnum : public RscEnum
 {
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 89404d65cbd4..c0a416575ddd 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -41,8 +41,8 @@ class RscCmdLine;
 struct WriteRcContext
 {
     FILE *              fOutput;
-    rtl::OString        aOutputRc;
-    rtl::OString        aOutputSysList;
+    OString        aOutputRc;
+    OString        aOutputSysList;
     RscCmdLine*         pCmdLine;
 };
 
@@ -54,7 +54,7 @@ struct RscSysEntry
 {
     sal_uInt32      nKey;
     sal_uInt32      nRscTyp;
-    rtl::OString    aFileName;
+    OString    aFileName;
     sal_uInt32      nTyp;
     sal_uInt32      nRefId;
 };
@@ -66,10 +66,10 @@ class RscTypCont
     CharSet             nSourceCharSet;
     sal_uInt32          nMachineId;         // Globaler Maschinentyp
     RSCBYTEORDER_TYPE   nByteOrder;         // Intel oder
-    rtl::OString        aLanguage;          // output language
+    OString        aLanguage;          // output language
     std::vector< sal_uInt32 > aLangFallbacks;   // language fallback list (entry 0 is language itself)
-    rtl::OString        aSearchPath;        // Suchen der Bitmap, Icon, Pointer
-    rtl::OString        aSysSearchPath;     // aSearchPath plus language specific paths
+    OString        aSearchPath;        // Suchen der Bitmap, Icon, Pointer
+    OString        aSysSearchPath;     // aSearchPath plus language specific paths
     sal_uInt32          nUniqueId;          // eindeutiger Id fuer Systemresourcen
     sal_uLong           nFilePos;           // Position in der Datei ( MTF )
     sal_uInt32          nPMId;              // eindeutiger Id fuer PM-Rseourcefile
@@ -254,7 +254,7 @@ class RscTypCont
                                              RscTop * pStyleFamily );
     RscTop *    InitClassSfxSlotInfo( RscTop * pSuper );
 
-    void        InsWinBit( RscTop * pClass, const rtl::OString& rName,
+    void        InsWinBit( RscTop * pClass, const OString& rName,
                            Atom nVal );
     void        WriteInc( FILE * fOutput, sal_uLong lKey );
 
@@ -290,7 +290,7 @@ public:
     std::map<sal_uInt64, sal_uLong> aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu
                                        //(unter PM), oder eine Dateiposition (MTF)
 
-    RscTypCont( RscError *, RSCBYTEORDER_TYPE, const rtl::OString& rSearchPath, sal_uInt32 nFlags );
+    RscTypCont( RscError *, RSCBYTEORDER_TYPE, const OString& rSearchPath, sal_uInt32 nFlags );
     ~RscTypCont();
 
     Atom AddLanguage( const char* );
@@ -301,7 +301,7 @@ public:
                     { return (nFlags & NOSYSRESTEST_FLAG) ? sal_False : sal_True; }
     sal_Bool            IsSrsDefault() const
                     { return (nFlags & SRSDEFAULT_FLAG) ? sal_True : sal_False; }
-    rtl::OString ChangeLanguage(const rtl::OString & rNewLang);
+    OString ChangeLanguage(const OString & rNewLang);
     const std::vector< sal_uInt32 >& GetFallbacks() const
     { return aLangFallbacks; }
 
@@ -313,9 +313,9 @@ public:
         nSourceCharSet = aCharSet;
         return aOld;
     }
-    void            SetSearchPath( const rtl::OString& rStr) { aSearchPath = rStr; }
-    rtl::OString    GetSearchPath() const { return aSearchPath; }
-    void            SetSysSearchPath( const rtl::OString& rStr ) { aSysSearchPath = rStr; }
+    void            SetSearchPath( const OString& rStr) { aSearchPath = rStr; }
+    OString    GetSearchPath() const { return aSearchPath; }
+    void            SetSysSearchPath( const OString& rStr ) { aSysSearchPath = rStr; }
     void        InsertType( RscTop * pType )
                 {
                     aBaseLst.push_back( pType );
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index be54ad756daa..0ca4ec6b5ff5 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -62,7 +62,7 @@ public:
                     ((sal_Int32)aExp.aLong.nHi << 16);
          }
     sal_Bool Evaluate( sal_Int32 * pValue ) const;
-    void AppendMacro( rtl::OStringBuffer & ) const;
+    void AppendMacro( OStringBuffer & ) const;
 };
 
 /*********** R s c I d ***************************************************/
@@ -96,7 +96,7 @@ public:
 
     static void    SetNames( sal_Bool bSet = sal_True );
     operator         sal_Int32() const;   // Gibt Nummer zurueck
-    rtl::OString GetName()  const;   // Gibt den Namen des Defines zurueck
+    OString GetName()  const;   // Gibt den Namen des Defines zurueck
     sal_Bool    operator <  ( const RscId& rRscId ) const;
     sal_Bool    operator >  ( const RscId& rRscId ) const;
     sal_Bool    operator == ( const RscId& rRscId ) const;
@@ -121,16 +121,16 @@ friend class RscId;
     RscExpression * pExp;       // Ausdruck
 protected:
 
-            RscDefine( sal_uLong lFileKey, const rtl::OString& rDefName,
+            RscDefine( sal_uLong lFileKey, const OString& rDefName,
                        sal_Int32 lDefId );
-            RscDefine( sal_uLong lFileKey, const rtl::OString& rDefName,
+            RscDefine( sal_uLong lFileKey, const OString& rDefName,
                        RscExpression * pExpression );
             ~RscDefine();
     void    IncRef(){ nRefCount++; }
     sal_uInt32  GetRefCount() const    { return nRefCount; }
     void    DecRef();
     void    DefineToNumber();
-    void    SetName(const rtl::OString& rNewName) { m_aName = rNewName; }
+    void    SetName(const OString& rNewName) { m_aName = rNewName; }
 
     using StringNode::Search;
 public:
@@ -138,7 +138,7 @@ public:
     sal_uLong       GetFileKey() const { return lFileKey; }
     sal_Bool        Evaluate();
     sal_Int32       GetNumber() const  { return lId;      }
-    rtl::OString    GetMacro();
+    OString    GetMacro();
 };
 
 typedef ::std::vector< RscDefine* > RscSubDefList;
@@ -149,9 +149,9 @@ friend class RscFileTab;
 private:
     RscSubDefList   maList;
                 // pExpression wird auf jedenfall Eigentum der Liste
-    RscDefine * New( sal_uLong lFileKey, const rtl::OString& rDefName,
+    RscDefine * New( sal_uLong lFileKey, const OString& rDefName,
                      sal_Int32 lDefId, size_t lPos );
-    RscDefine * New( sal_uLong lFileKey, const rtl::OString& rDefName,
+    RscDefine * New( sal_uLong lFileKey, const OString& rDefName,
                      RscExpression * pExpression, size_t lPos );
     sal_Bool        Remove();
     size_t      GetPos( RscDefine* item ) {
@@ -175,7 +175,7 @@ public:
                                RscExpType aRE );
                 ~RscExpression();
     sal_Bool        Evaluate( sal_Int32 * pValue );
-    rtl::OString GetMacro();
+    OString GetMacro();
 };
 
 /********************** R S C F I L E ************************************/
@@ -197,8 +197,8 @@ public:
     sal_Bool            bLoaded;    // Ist die Datei geladen
     sal_Bool            bScanned;   // Wurde Datei nach Inclide abgesucht
     sal_Bool            bDirty;     // Dirty-Flag
-    rtl::OString aFileName;  // Name der Datei
-    rtl::OString aPathName;  // Pfad und Name der Datei
+    OString aFileName;  // Name der Datei
+    OString aPathName;  // Pfad und Name der Datei
     RscDefineList   aDefLst;    // Liste der Defines
     RscDependList   aDepLst;    // List of Depend
 
@@ -228,13 +228,13 @@ public:
 class RscFileTab : public RscSubFileTab
 {
     RscDefTree aDefTree;
-    sal_uLong       Find(const rtl::OString& rName);
+    sal_uLong       Find(const OString& rName);
 public:
                 RscFileTab();
                 ~RscFileTab();
 
     RscDefine * FindDef( const char * );
-    RscDefine * FindDef(const rtl::OString& rStr)
+    RscDefine * FindDef(const OString& rStr)
     {
         return FindDef(rStr.getStr());
     }
@@ -245,15 +245,15 @@ public:
     sal_Bool        TestDef( sal_uLong lFileKey, size_t lPos,
                          const RscExpression * pExpDec );
 
-    RscDefine * NewDef( sal_uLong lKey, const rtl::OString& rDefName,
+    RscDefine * NewDef( sal_uLong lKey, const OString& rDefName,
                         sal_Int32 lId, sal_uLong lPos );
-    RscDefine * NewDef( sal_uLong lKey, const rtl::OString& rDefName,
+    RscDefine * NewDef( sal_uLong lKey, const OString& rDefName,
                         RscExpression *, sal_uLong lPos );
 
            // Alle Defines die in dieser Datei Definiert sind loeschen
     void   DeleteFileContext( sal_uLong lKey );
-    sal_uLong  NewCodeFile(const rtl::OString& rName);
-    sal_uLong  NewIncFile(const rtl::OString& rName, const rtl::OString& rPath);
+    sal_uLong  NewCodeFile(const OString& rName);
+    sal_uLong  NewIncFile(const OString& rName, const OString& rPath);
     RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); }
 };
 
diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx
index c015c2d6652d..b8f734445394 100644
--- a/rsc/inc/rschash.hxx
+++ b/rsc/inc/rschash.hxx
@@ -30,15 +30,15 @@ typedef sal_uInt32 Atom;
 class AtomContainer
 {
     Atom m_nNextID;
-    boost::unordered_map< rtl::OString, Atom, rtl::OStringHash > m_aStringToID;
-    boost::unordered_map< Atom, rtl::OString > m_aIDToString;
+    boost::unordered_map< OString, Atom, OStringHash > m_aStringToID;
+    boost::unordered_map< Atom, OString > m_aIDToString;
 
     public:
     AtomContainer();
     ~AtomContainer();
 
-    Atom getID( const rtl::OString& rStr, bool bOnlyIfExists = false );
-    const rtl::OString& getString( Atom nAtom );
+    Atom getID( const OString& rStr, bool bOnlyIfExists = false );
+    const OString& getString( Atom nAtom );
 
 };
 
diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx
index a2ad19f32fb3..2b6605f3604a 100644
--- a/rsc/inc/rsclex.hxx
+++ b/rsc/inc/rsclex.hxx
@@ -24,7 +24,7 @@
 // a buffer for unique strings
 class StringContainer
 {
-    boost::unordered_set< rtl::OString, rtl::OStringHash >      m_aStrings;
+    boost::unordered_set< OString, OStringHash >      m_aStrings;
 public:
     StringContainer() {}
     ~StringContainer() {}
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 92ffe0d530fc..d5a768e15733 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -41,29 +41,29 @@ class RscCmdLine
 public:
 
     RscStrList          aInputList;     // Liste der Quelldateien
-    rtl::OString        aPath;          // Liste der Pfade
+    OString        aPath;          // Liste der Pfade
     RSCBYTEORDER_TYPE   nByteOrder;
     unsigned short      nCommands;      // Steuerbits
-    rtl::OString        aOutputSrs;     // Name der Srs-Ausgabedatei
-    rtl::OString        aILDir;
+    OString        aOutputSrs;     // Name der Srs-Ausgabedatei
+    OString        aILDir;
 
     struct OutputFile
     {
-        rtl::OString aLangName;         // language name
-        rtl::OString aOutputRc;         // target file
-        rtl::OString aLangSearchPath;   // language specific search path
-        ::std::list< rtl::OString >    aSysSearchDirs;    // paths to search for images
+        OString aLangName;         // language name
+        OString aOutputRc;         // target file
+        OString aLangSearchPath;   // language specific search path
+        ::std::list< OString >    aSysSearchDirs;    // paths to search for images
 
         OutputFile() {}
     };
 
     std::list<OutputFile>                                   m_aOutputFiles;
-    std::list< std::pair< rtl::OString, rtl::OString > >    m_aReplacements;
+    std::list< std::pair< OString, OString > >    m_aReplacements;
 
     RscCmdLine( int argc, char ** argv, RscError * pEH );
     ~RscCmdLine();
 
-    ::rtl::OString     substitutePaths( const ::rtl::OString& rIn );
+    OString     substitutePaths( const OString& rIn );
 };
 /****************** R s c ************************************************/
 
@@ -73,12 +73,12 @@ class RscCompiler
 {
 private:
     void            CreateResFile( const char * pRc );
-    void            Append( const rtl::OString& rOutputSrs, const rtl::OString& rTmpFile );
+    void            Append( const OString& rOutputSrs, const OString& rTmpFile );
 
     bool            GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
                                       const WriteRcContext& rContext,
-                                      const rtl::OString& rBaseFileName,
-                                      rtl::OString& rImagePath,
+                                      const OString& rBaseFileName,
+                                      OString& rImagePath,
                                       FILE* pSysListFile );
     void            PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
                                        const WriteRcContext& rContext,
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 7d4db5892c93..e26efcd60807 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -40,10 +40,10 @@ enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN };
 #define ALIGNED_SIZE( nSize )                               \
             (nSize + sizeof( void * ) -1) / sizeof( void * ) * sizeof( void * )
 /******************* F u n c t i o n   F o r w a r d s *******************/
-rtl::OString GetTmpFileName();
-sal_Bool Append(const rtl::OString &rDestFile, const rtl::OString &rSourceFile);
-sal_Bool Append(FILE * fDest, rtl::OString &raSourceFile);
-rtl::OString OutputFile(const rtl::OString &rInput, const char * ext);
+OString GetTmpFileName();
+sal_Bool Append(const OString &rDestFile, const OString &rSourceFile);
+sal_Bool Append(FILE * fDest, OString &raSourceFile);
+OString OutputFile(const OString &rInput, const char * ext);
 char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv,
                      sal_uInt32 nArgc );
 void RscExit( sal_uInt32 nExit );
@@ -55,7 +55,7 @@ char* rsc_strdup( const char* );
 
 /****************** C L A S S E S ****************************************/
 
-typedef ::std::vector< rtl::OString* > RscStrList;
+typedef ::std::vector< OString* > RscStrList;
 
 /*********** R s c C h a r ***********************************************/
 class RscChar
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 4f5b7842bd71..34723c618f1e 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -45,9 +45,9 @@ protected:
                             RscTop * pSuperCl = NULL );
 
 public:
-    rtl::OString    aCallPar1;      // Klassenaufruf ohne Typen bis ResId
-    rtl::OString    aCallPar2;      // Klassenaufruf ohne Typen ab ResId
-    rtl::OString    aCallParType;   // Klassenaufruf mit Typen
+    OString    aCallPar1;      // Klassenaufruf ohne Typen bis ResId
+    OString    aCallPar2;      // Klassenaufruf ohne Typen ab ResId
+    OString    aCallParType;   // Klassenaufruf mit Typen
 
             void    SetSuperClass( RscTop * pClass )
                     {
@@ -64,8 +64,8 @@ public:
                     {
                         return( 0 != aCallParType.getLength() );
                     }
-            void    SetCallPar( const rtl::OString& rPar1, const rtl::OString& rPar2,
-                                const rtl::OString& rParType );
+            void    SetCallPar( const OString& rPar1, const OString& rPar2,
+                                const OString& rParType );
             void    SetRefClass( RscTop * pRef ) { pRefClass = pRef; }
             RscTop* GetRefClass() const { return pRefClass; }
     virtual RSCCLASS_TYPE GetClassType() const = 0;
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 600db98097fe..ed3bb3ee2cb8 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -91,14 +91,14 @@ class StringNode : public NameNode
 protected:
     using NameNode::Search;
 
-    rtl::OString m_aName;
+    OString m_aName;
 
 public:
     StringNode() {}
-    StringNode(const rtl::OString& rStr) { m_aName = rStr; }
+    StringNode(const OString& rStr) { m_aName = rStr; }
 
     StringNode*     Search( const char * ) const;
-    rtl::OString    GetName() const { return m_aName; }
+    OString    GetName() const { return m_aName; }
 };
 
 #endif // _RSCTREE_HXX