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

6 files changed, 199 insertions, 199 deletions

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index bbe68eb14f85..c34ba06d5f9c 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -28,7 +28,7 @@
 #include "boost/unordered_map.hpp"
 #include "po.hxx"
 
-typedef boost::unordered_map<rtl::OString, rtl::OString, rtl::OStringHash> OStringHashMap;
+typedef boost::unordered_map<OString, OString, OStringHash> OStringHashMap;
 
 
 //
@@ -41,22 +41,22 @@ friend class CfgParser;
 friend class CfgExport;
 friend class CfgMerge;
 private:
-    rtl::OString sTagType;
-    rtl::OString sIdentifier;
+    OString sTagType;
+    OString sIdentifier;
 
-    rtl::OString sResTyp;
+    OString sResTyp;
 
-    rtl::OString sTextTag;
-    rtl::OString sEndTextTag;
+    OString sTextTag;
+    OString sEndTextTag;
 
     OStringHashMap sText;
 public:
-    CfgStackData(const rtl::OString &rTag, const rtl::OString &rId)
+    CfgStackData(const OString &rTag, const OString &rId)
         : sTagType( rTag ), sIdentifier( rId )
     {}
 
-    const rtl::OString &GetTagType() { return sTagType; }
-    const rtl::OString &GetIdentifier() { return sIdentifier; }
+    const OString &GetTagType() { return sTagType; }
+    const OString &GetIdentifier() { return sIdentifier; }
 
 };
 
@@ -75,7 +75,7 @@ public:
     CfgStack() {}
     ~CfgStack();
 
-    CfgStackData *Push(const rtl::OString &rTag, const rtl::OString &rId);
+    CfgStackData *Push(const OString &rTag, const OString &rId);
     CfgStackData *Pop()
     {
         if (maList.empty())
@@ -87,7 +87,7 @@ public:
 
     CfgStackData *GetStackData();
 
-    rtl::OString GetAccessPath( size_t nPos );
+    OString GetAccessPath( size_t nPos );
 
     size_t size() const { return maList.size(); }
 };
@@ -99,11 +99,11 @@ public:
 class CfgParser
 {
 protected:
-    rtl::OString sCurrentResTyp;
-    rtl::OString sCurrentIsoLang;
-    rtl::OString sCurrentText;
+    OString sCurrentResTyp;
+    OString sCurrentIsoLang;
+    OString sCurrentText;
 
-    rtl::OString sLastWhitespace;
+    OString sLastWhitespace;
 
     CfgStack aStack;
     CfgStackData *pStackData;
@@ -111,24 +111,24 @@ protected:
     sal_Bool bLocalize;
 
     virtual void WorkOnText(
-        rtl::OString &rText,
-        const rtl::OString &rLangIndex )=0;
+        OString &rText,
+        const OString &rLangIndex )=0;
 
     virtual void WorkOnResourceEnd()=0;
 
-    virtual void Output(const rtl::OString & rOutput)=0;
+    virtual void Output(const OString & rOutput)=0;
 
-    void Error(const rtl::OString &rError);
+    void Error(const OString &rError);
 
 private:
     int ExecuteAnalyzedToken( int nToken, char *pToken );
-    std::vector<rtl::OString> aLanguages;
+    std::vector<OString> aLanguages;
     void AddText(
-        rtl::OString &rText,
-        const rtl::OString &rIsoLang,
-        const rtl::OString &rResTyp );
+        OString &rText,
+        const OString &rIsoLang,
+        const OString &rResTyp );
 
-    sal_Bool IsTokenClosed(const rtl::OString &rToken);
+    sal_Bool IsTokenClosed(const OString &rToken);
 
 public:
     CfgParser();
@@ -144,19 +144,19 @@ public:
 class CfgExport : public CfgParser
 {
 private:
-    rtl::OString sPath;
-    std::vector<rtl::OString> aLanguages;
+    OString sPath;
+    std::vector<OString> aLanguages;
 
     PoOfstream pOutputStream;
 
 protected:
     virtual void WorkOnText(
-        rtl::OString &rText,
-        const rtl::OString &rIsoLang
+        OString &rText,
+        const OString &rIsoLang
         );
 
     void WorkOnResourceEnd();
-    void Output(const rtl::OString& rOutput);
+    void Output(const OString& rOutput);
 public:
     CfgExport(
         const OString &rOutputFile,
@@ -174,20 +174,20 @@ class CfgMerge : public CfgParser
 {
 private:
     MergeDataFile *pMergeDataFile;
-    std::vector<rtl::OString> aLanguages;
+    std::vector<OString> aLanguages;
     ResData *pResData;
 
-    rtl::OString sFilename;
+    OString sFilename;
     sal_Bool bEnglish;
 
     std::ofstream pOutputStream;
 
 protected:
-    virtual void WorkOnText(rtl::OString &rText, const rtl::OString &rLangIndex);
+    virtual void WorkOnText(OString &rText, const OString &rLangIndex);
 
     void WorkOnResourceEnd();
 
-    void Output(const rtl::OString& rOutput);
+    void Output(const OString& rOutput);
 public:
     CfgMerge(
         const OString &rMergeSource, const OString &rOutputFile,
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 8dc9ab8a3273..9575dcda564e 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -46,16 +46,16 @@
 class PFormEntrys;
 class MergeData;
 
-typedef boost::unordered_map<rtl::OString, rtl::OString, rtl::OStringHash>
+typedef boost::unordered_map<OString, OString, OStringHash>
     OStringHashMap;
 
-typedef boost::unordered_map<rtl::OString, bool, rtl::OStringHash>
+typedef boost::unordered_map<OString, bool, OStringHash>
     OStringBoolHashMap;
 
-typedef boost::unordered_map<rtl::OString, PFormEntrys*, rtl::OStringHash>
+typedef boost::unordered_map<OString, PFormEntrys*, OStringHash>
     PFormEntrysHashMap;
 
-typedef boost::unordered_map<rtl::OString, MergeData*, rtl::OStringHash>
+typedef boost::unordered_map<OString, MergeData*, OStringHash>
     MergeDataHashMap;
 
 #define SOURCE_LANGUAGE "en-US"
@@ -109,10 +109,10 @@ public:
 class ResData
 {
 public:
-    ResData(const rtl::OString &rPF, const rtl::OString &rGId);
-    ResData(const rtl::OString &rPF, const rtl::OString &rGId , const rtl::OString &rFilename);
+    ResData(const OString &rPF, const OString &rGId);
+    ResData(const OString &rPF, const OString &rGId , const OString &rFilename);
     ~ResData();
-    sal_Bool SetId(const rtl::OString &rId, sal_uInt16 nLevel);
+    sal_Bool SetId(const OString &rId, sal_uInt16 nLevel);
 
     sal_Int32 nWidth;
     sal_uInt16 nChildIndex;
@@ -128,11 +128,11 @@ public:
 
     sal_Bool bRestMerged;
 
-    rtl::OString sResTyp;
-    rtl::OString sId;
-    rtl::OString sGId;
-    rtl::OString sHelpId;
-    rtl::OString sFilename;
+    OString sResTyp;
+    OString sId;
+    OString sGId;
+    OString sHelpId;
+    OString sFilename;
 
     OStringHashMap sText;
     sal_uInt16 nTextRefId;
@@ -146,7 +146,7 @@ public:
     OStringHashMap sTitle;
     sal_uInt16 nTitleRefId;
 
-    rtl::OString sTextTyp;
+    OString sTextTyp;
 
     ExportList  *pStringList;
     ExportList  *pUIEntries;
@@ -154,7 +154,7 @@ public:
     ExportList  *pFilterList;
     ExportList  *pPairedList;
 
-    rtl::OString sPForm;
+    OString sPForm;
 };
 
 
@@ -196,57 +196,57 @@ private:
 
     ResStack aResStack;                 // stack for parsing recursive
 
-    rtl::OString sActPForm;               // hold cur. system
+    OString sActPForm;               // hold cur. system
 
     sal_Bool bDefine;                       // cur. res. in a define?
     sal_Bool bNextMustBeDefineEOL;          // define but no \ at lineend
     std::size_t nLevel; // res. recursiv? how deep?
     sal_uInt16 nList;                       // cur. res. is String- or FilterList
-    rtl::OString m_sListLang;
+    OString m_sListLang;
     std::size_t nListIndex;
     std::size_t nListLevel;
     bool bSkipFile;
     sal_Bool bMergeMode;
-    rtl::OString sMergeSrc;
-    rtl::OString sLastListLine;
+    OString sMergeSrc;
+    OString sLastListLine;
     sal_Bool bError;                        // any errors while export?
     sal_Bool bReadOver;
     sal_Bool bDontWriteOutput;
-    rtl::OString sLastTextTyp;
+    OString sLastTextTyp;
     bool isInitialized;
-    rtl::OString sFilename;
-    rtl::OString sLanguages;
+    OString sFilename;
+    OString sLanguages;
 
-    std::vector<rtl::OString> aLanguages;
+    std::vector<OString> aLanguages;
 
     sal_Bool WriteData( ResData *pResData, sal_Bool bCreateNew = sal_False );// called befor dest. cur ResData
     sal_Bool WriteExportList( ResData *pResData, ExportList *pExportList,
-                        const rtl::OString &rTyp, sal_Bool bCreateNew = sal_False );
+                        const OString &rTyp, sal_Bool bCreateNew = sal_False );
 
-    rtl::OString MergePairedList( rtl::OString const & sLine , rtl::OString const & sText );
+    OString MergePairedList( OString const & sLine , OString const & sText );
 
-    rtl::OString FullId();                    // creates cur. GID
+    OString FullId();                    // creates cur. GID
 
-    rtl::OString GetPairedListID(const rtl::OString & rText);
-    rtl::OString GetPairedListString(const rtl::OString& rText);
-    rtl::OString StripList(const rtl::OString& rText);
+    OString GetPairedListID(const OString & rText);
+    OString GetPairedListString(const OString& rText);
+    OString StripList(const OString& rText);
 
-    void InsertListEntry(const rtl::OString &rText, const rtl::OString &rLine);
-    void CleanValue( rtl::OString &rValue );
-    rtl::OString GetText(const rtl::OString &rSource, int nToken);
+    void InsertListEntry(const OString &rText, const OString &rLine);
+    void CleanValue( OString &rValue );
+    OString GetText(const OString &rSource, int nToken);
 
-    sal_Bool PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
-        rtl::OString &rLangIndex, ResData *pResData);
-    void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const rtl::OString& rTextType );
+    sal_Bool PrepareTextToMerge(OString &rText, sal_uInt16 nTyp,
+        OString &rLangIndex, ResData *pResData);
+    void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const OString& rTextType );
     void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
-    void ConvertMergeContent( rtl::OString &rText );
+    void ConvertMergeContent( OString &rText );
 
-    void WriteToMerged(const rtl::OString &rText , bool bSDFContent);
+    void WriteToMerged(const OString &rText , bool bSDFContent);
     void SetChildWithText();
 
     void InitLanguages( bool bMergeMode = false );
 
-    void CutComment( rtl::OString &rText );
+    void CutComment( OString &rText );
 
 public:
     Export(const OString &rOutput, const OString &rLanguage);
@@ -273,8 +273,8 @@ class PFormEntrys
 {
 friend class MergeDataFile;
 private:
-    rtl::OString data_; //TODO
-    rtl::OString sHelpText; // empty string
+    OString data_; //TODO
+    OString sHelpText; // empty string
     OStringHashMap sText;
     OStringBoolHashMap bTextFirst;
     OStringHashMap sQuickHelpText;
@@ -283,9 +283,9 @@ private:
     OStringBoolHashMap bTitleFirst;
 
 public:
-    PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
-    void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
-        const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
+    PFormEntrys( const OString &rPForm ) : data_( rPForm ) {};
+    void InsertEntry(const OString &rId, const OString &rText,
+        const OString &rQuickHelpText, const OString &rTitle)
     {
 
         sText[ rId ] = rText;
@@ -295,8 +295,8 @@ public:
         sTitle[ rId ] = rTitle;
         bTitleFirst[ rId ] = true;
     }
-    sal_Bool GetText( rtl::OString &rReturn, sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
-    sal_Bool GetTransex3Text( rtl::OString &rReturn, sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
+    sal_Bool GetText( OString &rReturn, sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel = sal_False );
+    sal_Bool GetTransex3Text( OString &rReturn, sal_uInt16 nTyp, const OString &nLangIndex, sal_Bool bDel = sal_False );
 
 };
 
@@ -313,19 +313,19 @@ class MergeDataFile;
 class MergeData
 {
 public:
-    rtl::OString sTyp;
-    rtl::OString sGID;
-    rtl::OString sLID;
-    rtl::OString sFilename;
+    OString sTyp;
+    OString sGID;
+    OString sLID;
+    OString sFilename;
     PFormEntrysHashMap aMap;
 public:
-    MergeData( const rtl::OString &rTyp, const rtl::OString &rGID, const rtl::OString &rLID , const rtl::OString &rFilename )
+    MergeData( const OString &rTyp, const OString &rGID, const OString &rLID , const OString &rFilename )
             : sTyp( rTyp ), sGID( rGID ), sLID( rLID ) , sFilename( rFilename ) {};
     ~MergeData();
     PFormEntrys* GetPFormEntries();
 
     void Insert( PFormEntrys* pfEntrys );
-    PFormEntrys* GetPFObject( const rtl::OString &rPFO );
+    PFormEntrys* GetPFObject( const OString &rPFO );
 
     sal_Bool operator==( ResData *pData );
 };
@@ -341,43 +341,43 @@ public:
 class MergeDataFile
 {
     private:
-        rtl::OString sErrorLog;
+        OString sErrorLog;
         MergeDataHashMap aMap;
-        std::set<rtl::OString> aLanguageSet;
+        std::set<OString> aLanguageSet;
 
         MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false );
-        void InsertEntry(const rtl::OString &rTYP, const rtl::OString &rGID,
-            const rtl::OString &rLID, const rtl::OString &rPFO,
-            const rtl::OString &nLang, const rtl::OString &rTEXT,
-            const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
-            const rtl::OString &sFilename, bool bCaseSensitive);
+        void InsertEntry(const OString &rTYP, const OString &rGID,
+            const OString &rLID, const OString &rPFO,
+            const OString &nLang, const OString &rTEXT,
+            const OString &rQHTEXT, const OString &rTITLE,
+            const OString &sFilename, bool bCaseSensitive);
     public:
         explicit MergeDataFile(
-            const rtl::OString &rFileName, const rtl::OString& rFile,
+            const OString &rFileName, const OString& rFile,
             bool bCaseSensitive, bool bWithQtz = true );
         ~MergeDataFile();
 
 
-        std::vector<rtl::OString> GetLanguages() const;
+        std::vector<OString> GetLanguages() const;
         const MergeDataHashMap& getMap() const { return aMap; }
 
         PFormEntrys *GetPFormEntrys( ResData *pResData );
         PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData );
 
-        static rtl::OString CreateKey(const rtl::OString& rTYP, const rtl::OString& rGID,
-            const rtl::OString& rLID, const rtl::OString& rFilename , bool bCaseSensitive = false);
+        static OString CreateKey(const OString& rTYP, const OString& rGID,
+            const OString& rLID, const OString& rFilename , bool bCaseSensitive = false);
 };
 
 
 class QueueEntry
 {
 public:
-    QueueEntry(int nTypVal, const rtl::OString &rLineVal)
+    QueueEntry(int nTypVal, const OString &rLineVal)
         : nTyp(nTypVal), sLine(rLineVal)
     {
     }
     int nTyp;
-    rtl::OString sLine;
+    OString sLine;
 };
 
 class ParserQueue
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 1f11726182f6..95aad6d15ab3 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -27,18 +27,18 @@
 class HelpParser
 {
 private:
-    rtl::OString sHelpFile;
+    OString sHelpFile;
 
 #if OSL_DEBUG_LEVEL > 2
     /// Debugmethod, prints the content of the map to stdout
-    static void Dump(LangHashMap* rElem_in , const rtl::OString & sKey_in);
+    static void Dump(LangHashMap* rElem_in , const OString & sKey_in);
 
     /// Debugmethod, prints the content of the map to stdout
     static void Dump(XMLHashMap* rElem_in);
 #endif
 
 public:
-    HelpParser( const rtl::OString &rHelpFile );
+    HelpParser( const OString &rHelpFile );
     ~HelpParser(){};
 
 /// Method append a PO file with the content of a parsed XML file
@@ -48,13 +48,13 @@ public:
 
 /// Method merges the String from the POfile into XMLfile. Both Strings must
 /// point to existing files.
-    bool Merge( const rtl::OString &rPOFile_in, const rtl::OString &rDestinationFile_in ,
-        const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile );
+    bool Merge( const OString &rPOFile_in, const OString &rDestinationFile_in ,
+        const OString& sLanguage , MergeDataFile& aMergeDataFile );
 
 private:
-    bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const rtl::OString& sLanguage , rtl::OString const & sPath );
+    bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const OString& sLanguage , OString const & sPath );
 
-    void ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile );
+    void ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 8c5940cbdfee..8441824339ba 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -25,7 +25,7 @@
 #include "common.hxx"
 #include "export.hxx"
 
-typedef std::vector< rtl::OString* > LngLineList;
+typedef std::vector< OString* > LngLineList;
 
 #define LNG_OK              0x0000
 #define LNG_COULD_NOT_OPEN  0x0001
@@ -39,17 +39,17 @@ class LngParser
 private:
     sal_uInt16 nError;
     LngLineList *pLines;
-    rtl::OString sSource;
+    OString sSource;
     sal_Bool bULF;
-    std::vector<rtl::OString> aLanguages;
+    std::vector<OString> aLanguages;
 
-    bool isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in);
-    void ReadLine(const rtl::OString &rLine_in,
+    bool isNextGroup(OString &sGroup_out, const OString &sLine_in);
+    void ReadLine(const OString &rLine_in,
         OStringHashMap &rText_inout);
     void WritePO(PoOfstream &aPOStream, OStringHashMap &rText_inout,
-        const rtl::OString &rActFileName, const rtl::OString &rID);
+        const OString &rActFileName, const OString &rID);
 public:
-    LngParser(const rtl::OString &rLngFile,
+    LngParser(const OString &rLngFile,
         sal_Bool bULFFormat);
     ~LngParser();
 
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 55867d3f70ab..8daf546fcc7f 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -56,21 +56,21 @@ using namespace std;
 class XMLAttribute
 {
 private:
-    rtl::OUString sName;
-    rtl::OUString sValue;
+    OUString sName;
+    OUString sValue;
 
 public:
     /// creates an attribute
     XMLAttribute(
-        const rtl::OUString &rName,    // attributes name
-        const rtl::OUString &rValue    // attributes data
+        const OUString &rName,    // attributes name
+        const OUString &rValue    // attributes data
     )
                 : sName( rName ), sValue( rValue ) {}
 
-    rtl::OUString GetName() const { return sName; }
-    rtl::OUString GetValue() const { return sValue; }
+    OUString GetName() const { return sName; }
+    OUString GetValue() const { return sValue; }
 
-    void setValue(const rtl::OUString &rValue){sValue=rValue;}
+    void setValue(const OUString &rValue){sValue=rValue;}
 
     /// returns true if two attributes are equal and have the same value
     sal_Bool IsEqual(
@@ -164,16 +164,16 @@ public:
 //-------------------------------------------------------------------------
 
 /// Mapping numeric Language code <-> XML Element
-typedef boost::unordered_map<rtl::OString, XMLElement*, rtl::OStringHash> LangHashMap;
+typedef boost::unordered_map<OString, XMLElement*, OStringHash> LangHashMap;
 
 /// Mapping XML Element string identifier <-> Language Map
-typedef boost::unordered_map<rtl::OString, LangHashMap*, rtl::OStringHash> XMLHashMap;
+typedef boost::unordered_map<OString, LangHashMap*, OStringHash> XMLHashMap;
 
 /// Mapping iso alpha string code <-> iso numeric code
-typedef boost::unordered_map<rtl::OString, int, rtl::OStringHash> HashMap;
+typedef boost::unordered_map<OString, int, OStringHash> HashMap;
 
 /// Mapping XML tag names <-> have localizable strings
-typedef boost::unordered_map<rtl::OString, sal_Bool, rtl::OStringHash> TagMap;
+typedef boost::unordered_map<OString, sal_Bool, OStringHash> TagMap;
 
 /** Holds information of a XML file, is root node of tree
  */
@@ -183,7 +183,7 @@ class XMLFile : public XMLParentNode
 {
 public:
     XMLFile(
-        const rtl::OUString &rFileName // the file name, empty if created from memory stream
+        const OUString &rFileName // the file name, empty if created from memory stream
     );
     XMLFile( const XMLFile& obj ) ;
     ~XMLFile();
@@ -193,7 +193,7 @@ public:
     void        Extract( XMLFile *pCur = NULL );
 
     XMLHashMap* GetStrings(){return XMLStrings;}
-    void Write( rtl::OString const &rFilename );
+    void Write( OString const &rFilename );
     sal_Bool        Write( ofstream &rStream , XMLNode *pCur = NULL );
 
     bool        CheckExportStatus( XMLParentNode *pCur = NULL );// , int pos = 0 );
@@ -203,25 +203,25 @@ public:
     virtual sal_uInt16  GetNodeType();
 
     /// returns file name
-    rtl::OUString GetName() { return sFileName; }
-    void          SetName( const rtl::OUString &rFilename ) { sFileName = rFilename; }
-    const std::vector<rtl::OString> getOrder(){ return order; }
+    OUString GetName() { return sFileName; }
+    void          SetName( const OUString &rFilename ) { sFileName = rFilename; }
+    const std::vector<OString> getOrder(){ return order; }
 
 protected:
     // writes a string as UTF8 with dos line ends to a given stream
-    void        WriteString( ofstream &rStream, const rtl::OUString &sString );
+    void        WriteString( ofstream &rStream, const OUString &sString );
 
     void        InsertL10NElement( XMLElement* pElement);
 
     // DATA
-    rtl::OUString      sFileName;
+    OUString      sFileName;
 
-    const rtl::OString ID, OLDREF, XML_LANG;
+    const OString ID, OLDREF, XML_LANG;
 
     TagMap      nodes_localize;
     XMLHashMap* XMLStrings;
 
-    std::vector <rtl::OString> order;
+    std::vector <OString> order;
 };
 
 /// An Utility class for XML
@@ -245,9 +245,9 @@ public:
 class XMLElement : public XMLParentNode
 {
 private:
-    rtl::OUString sElementName;
+    OUString sElementName;
     XMLAttributeList *pAttributes;
-    rtl::OString   project,
+    OString   project,
                  filename,
                  id,
                  sOldRef,
@@ -261,7 +261,7 @@ public:
     /// create a element node
     XMLElement(){}
     XMLElement(
-        const rtl::OUString &rName,    // the element name
+        const OUString &rName,    // the element name
         XMLParentNode *Parent   // parent node of this element
     ):          XMLParentNode( Parent ),
                 sElementName( rName ),
@@ -283,34 +283,34 @@ public:
     virtual sal_uInt16 GetNodeType();
 
     /// returns element name
-    rtl::OUString GetName() { return sElementName; }
+    OUString GetName() { return sElementName; }
 
     /// returns list of attributes of this element
     XMLAttributeList *GetAttributeList() { return pAttributes; }
 
     /// adds a new attribute to this element, typically used by parser
-    void AddAttribute( const rtl::OUString &rAttribute, const rtl::OUString &rValue );
+    void AddAttribute( const OUString &rAttribute, const OUString &rValue );
 
-    void ChangeLanguageTag( const rtl::OUString &rValue );
+    void ChangeLanguageTag( const OUString &rValue );
 
     // Return a Unicode String representation of this object
     OUString ToOUString();
 
-    void SetProject         ( rtl::OString const & prj        ){ project = prj;        }
-    void SetFileName        ( rtl::OString const & fn         ){ filename = fn;        }
-    void SetId              ( rtl::OString const & theId      ){ id = theId;           }
-    void SetResourceType    ( rtl::OString const & rt         ){ resourceType = rt;    }
-    void SetLanguageId      ( rtl::OString const & lid        ){ languageId = lid;     }
+    void SetProject         ( OString const & prj        ){ project = prj;        }
+    void SetFileName        ( OString const & fn         ){ filename = fn;        }
+    void SetId              ( OString const & theId      ){ id = theId;           }
+    void SetResourceType    ( OString const & rt         ){ resourceType = rt;    }
+    void SetLanguageId      ( OString const & lid        ){ languageId = lid;     }
     void SetPos             ( int nPos_in           ){ nPos = nPos_in;       }
-    void SetOldRef          ( rtl::OString const & sOldRef_in ){ sOldRef = sOldRef_in; }
+    void SetOldRef          ( OString const & sOldRef_in ){ sOldRef = sOldRef_in; }
 
     virtual int        GetPos()         { return nPos;         }
-    rtl::OString GetProject()     { return project;      }
-    rtl::OString GetFileName()    { return filename;     }
-    rtl::OString GetId()          { return id;           }
-    rtl::OString GetOldref()      { return sOldRef;      }
-    rtl::OString GetResourceType(){ return resourceType; }
-    rtl::OString GetLanguageId()  { return languageId;   }
+    OString GetProject()     { return project;      }
+    OString GetFileName()    { return filename;     }
+    OString GetId()          { return id;           }
+    OString GetOldref()      { return sOldRef;      }
+    OString GetResourceType(){ return resourceType; }
+    OString GetLanguageId()  { return languageId;   }
 
 
 };
@@ -322,18 +322,18 @@ public:
 class XMLData : public XMLChildNode
 {
 private:
-    rtl::OUString sData;
+    OUString sData;
     bool   isNewCreated;
 
 public:
     /// create a data node
     XMLData(
-        const rtl::OUString &rData,    // the initial data
+        const OUString &rData,    // the initial data
         XMLParentNode *Parent   // the parent node of this data, typically a element node
     )
                 : XMLChildNode( Parent ), sData( rData ) , isNewCreated ( false ){}
     XMLData(
-        const rtl::OUString &rData,    // the initial data
+        const OUString &rData,    // the initial data
         XMLParentNode *Parent,  // the parent node of this data, typically a element node
         bool newCreated
     )
@@ -345,12 +345,12 @@ public:
     virtual sal_uInt16 GetNodeType();
 
     /// returns the data
-    rtl::OUString GetData() { return sData; }
+    OUString GetData() { return sData; }
 
     bool isNew() { return isNewCreated; }
     /// adds new character data to the existing one
     void AddData(
-        const rtl::OUString &rData // the new data
+        const OUString &rData // the new data
     );
 
 
@@ -364,12 +364,12 @@ public:
 class XMLComment : public XMLChildNode
 {
 private:
-    rtl::OUString sComment;
+    OUString sComment;
 
 public:
     /// create a comment node
     XMLComment(
-        const rtl::OUString &rComment, // the comment
+        const OUString &rComment, // the comment
         XMLParentNode *Parent   // the parent node of this comemnt, typically a element node
     )
                 : XMLChildNode( Parent ), sComment( rComment ) {}
@@ -381,7 +381,7 @@ public:
     XMLComment& operator=(const XMLComment& obj);
 
     /// returns the comment
-    rtl::OUString GetComment()  { return sComment; }
+    OUString GetComment()  { return sComment; }
 };
 
 //-------------------------------------------------------------------------
@@ -391,12 +391,12 @@ public:
 class XMLDefault : public XMLChildNode
 {
 private:
-    rtl::OUString sDefault;
+    OUString sDefault;
 
 public:
     /// create a comment node
     XMLDefault(
-        const rtl::OUString &rDefault, // the comment
+        const OUString &rDefault, // the comment
         XMLParentNode *Parent   // the parent node of this comemnt, typically a element node
     )
                 : XMLChildNode( Parent ), sDefault( rDefault ) {}
@@ -409,7 +409,7 @@ public:
     virtual sal_uInt16 GetNodeType();
 
     /// returns the comment
-    rtl::OUString GetDefault()  { return sDefault; }
+    OUString GetDefault()  { return sDefault; }
 };
 
 //-------------------------------------------------------------------------
@@ -420,7 +420,7 @@ struct XMLError {
     XML_Error eCode;    // the error code
     std::size_t nLine; // error line number
     std::size_t nColumn; // error column number
-    rtl::OUString sMessage;    // readable error message
+    OUString sMessage;    // readable error message
 };
 
 //-------------------------------------------------------------------------
@@ -460,7 +460,7 @@ public:
 
     /// parse a file, returns NULL on criticall errors
     XMLFile *Execute(
-        const rtl::OUString &rFileName,    // the file name
+        const OUString &rFileName,    // the file name
         XMLFile *pXMLFileIn         // the XMLFile
     );
 
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 8659fe1f4f19..ca6a820c4dc4 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -28,39 +28,39 @@
 class XRMResParser
 {
 private:
-    rtl::OString sGID;
-    rtl::OString sLID;
+    OString sGID;
+    OString sLID;
 
     sal_Bool bError;
     sal_Bool bText;
 
-    rtl::OString sCurrentOpenTag;
-    rtl::OString sCurrentCloseTag;
-    rtl::OString sCurrentText;
+    OString sCurrentOpenTag;
+    OString sCurrentCloseTag;
+    OString sCurrentText;
 protected:
-    std::vector<rtl::OString> aLanguages;
-    rtl::OString GetAttribute( const rtl::OString &rToken, const rtl::OString &rAttribute );
-    void Error( const rtl::OString &rError );
+    std::vector<OString> aLanguages;
+    OString GetAttribute( const OString &rToken, const OString &rAttribute );
+    void Error( const OString &rError );
 
-    virtual void Output( const rtl::OString& rOutput )=0;
+    virtual void Output( const OString& rOutput )=0;
     virtual void WorkOnDesc(
-        const rtl::OString &rOpenTag,
-        rtl::OString &rText
+        const OString &rOpenTag,
+        OString &rText
     )=0;
     virtual void WorkOnText(
-        const rtl::OString &rOpenTag,
-        rtl::OString &rText
+        const OString &rOpenTag,
+        OString &rText
     )=0;
     virtual void EndOfText(
-        const rtl::OString &rOpenTag,
-        const rtl::OString &rCloseTag
+        const OString &rOpenTag,
+        const OString &rCloseTag
     )=0;
 
-    rtl::OString GetGID() { return sGID; }
-    rtl::OString GetLID() { return sLID; }
+    OString GetGID() { return sGID; }
+    OString GetLID() { return sLID; }
 
-    void ConvertStringToDBFormat( rtl::OString &rString );
-    void ConvertStringToXMLFormat( rtl::OString &rString );
+    void ConvertStringToDBFormat( OString &rString );
+    void ConvertStringToXMLFormat( OString &rString );
 
 public:
     XRMResParser();
@@ -80,22 +80,22 @@ class XRMResExport : public XRMResParser
 {
 private:
     ResData *pResData;
-    rtl::OString sPath;
+    OString sPath;
     PoOfstream pOutputStream;
 protected:
     void WorkOnDesc(
-        const rtl::OString &rOpenTag,
-        rtl::OString &rText
+        const OString &rOpenTag,
+        OString &rText
     );
     void WorkOnText(
-        const rtl::OString &rOpenTag,
-        rtl::OString &rText
+        const OString &rOpenTag,
+        OString &rText
     );
     void EndOfText(
-        const rtl::OString &rOpenTag,
-        const rtl::OString &rCloseTag
+        const OString &rOpenTag,
+        const OString &rCloseTag
     );
-    void Output( const rtl::OString& rOutput );
+    void Output( const OString& rOutput );
 
 public:
     XRMResExport(
@@ -113,29 +113,29 @@ class XRMResMerge : public XRMResParser
 {
 private:
     MergeDataFile *pMergeDataFile;
-    rtl::OString sFilename;
+    OString sFilename;
     ResData *pResData;
     std::ofstream pOutputStream;
 
 protected:
     void WorkOnDesc(
-        const rtl::OString &rOpenTag,
-        rtl::OString &rText
+        const OString &rOpenTag,
+        OString &rText
     );
     void WorkOnText(
-        const rtl::OString &rOpenTag,
-        rtl::OString &rText
+        const OString &rOpenTag,
+        OString &rText
     );
     void EndOfText(
-        const rtl::OString &rOpenTag,
-        const rtl::OString &rCloseTag
+        const OString &rOpenTag,
+        const OString &rCloseTag
     );
-    void Output( const rtl::OString& rOutput );
+    void Output( const OString& rOutput );
 public:
     XRMResMerge(
-        const rtl::OString &rMergeSource,
-        const rtl::OString &rOutputFile,
-        const rtl::OString &rFilename
+        const OString &rMergeSource,
+        const OString &rOutputFile,
+        const OString &rFilename
     );
     virtual ~XRMResMerge();
 };