3 files changed, 22 insertions, 14 deletions
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index ae6c21ed8657..a4d2f8002da7 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -148,7 +148,7 @@ class ResData
 {
 public:
     ~ResData();
-    sal_Bool SetId( const ByteString &rId, sal_uInt16 nLevel );
+    sal_Bool SetId(const rtl::OString &rId, sal_uInt16 nLevel);
 
     sal_uInt16 nWidth;
     sal_uInt16 nChildIndex;
@@ -318,8 +318,8 @@ private:
 
 public:
     ParserQueue* pParseQueue; // public ?
-    static ByteString sLanguages; // public ?
-    static ByteString sForcedLanguages; // public ?
+    static rtl::OString sLanguages; // public ?
+    static rtl::OString sForcedLanguages; // public ?
 
 
     static bool skipProject( ByteString sPrj ) ;
@@ -352,8 +352,10 @@ public:
     static ByteString GetNativeFile( ByteString sSource );
     static DirEntry GetTempFile();
 
-    static void DumpExportList( ByteString& sListName , ExportList& aList );
-    static ByteString DumpMap( ByteString& sMapName , ByteStringHashMap& aMap );
+    static void DumpExportList(const rtl::OString& rListName,
+        ExportList& aList);
+    static ByteString DumpMap(const rtl::OString& rMapName,
+        ByteStringHashMap& aMap);
 
 private:
     static std::vector<ByteString> aLanguages;
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index a160b158091b..aeb61ae3e4af 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -64,7 +64,8 @@ public:
 
 /// Method merges the String from the SDFfile into XMLfile. Both Strings must
 /// point to existing files.
-    bool Merge( const ByteString &rSDFFile_in, const ByteString &rDestinationFile_in , ByteString& sLanguage , MergeDataFile& aMergeDataFile );
+    bool Merge( const ByteString &rSDFFile_in, const ByteString &rDestinationFile_in ,
+        const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile );
     bool Merge( const ByteString &rSDFFile, const ByteString &rPathX , const ByteString &rPathY , bool bISO
         , const std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir );
 
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index e658817c3e16..285f12953f1e 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -47,23 +47,28 @@ class LngParser
 private:
     sal_uInt16 nError;
     LngLineList *pLines;
-    ByteString sSource;
+    rtl::OString sSource;
     sal_Bool bDBIsUTF8;
     sal_Bool bULF;
     bool bQuiet;
     std::vector<ByteString> aLanguages;
 
     bool isNextGroup(  ByteString &sGroup_out , ByteString &sLine_in);
-    void ReadLine( const ByteString &sLine_in , ByteStringHashMap &rText_inout );
-    void WriteSDF( SvFileStream &aSDFStream , ByteStringHashMap &rText_inout ,
-                    const ByteString &rPrj ,
-                    const ByteString &rRoot , const ByteString &sActFileName , const ByteString &sID );
+    void ReadLine(const rtl::OString &rLine_in,
+        ByteStringHashMap &rText_inout);
+    void WriteSDF(SvFileStream &aSDFStream, ByteStringHashMap &rText_inout,
+        const rtl::OString &rPrj, const rtl::OString &rRoot,
+        const rtl::OString &rActFileName, const rtl::OString &rID);
 public:
-    LngParser( const ByteString &rLngFile, sal_Bool bUTF8, sal_Bool bULFFormat );
+    LngParser(const rtl::OString &rLngFile, sal_Bool bUTF8,
+        sal_Bool bULFFormat);
     ~LngParser();
 
-    sal_Bool CreateSDF( const ByteString &rSDFFile, const ByteString &rPrj, const ByteString &rRoot );
-    sal_Bool Merge( const ByteString &rSDFFile, const ByteString &rDestinationFile , const ByteString &rPrj );
+    sal_Bool CreateSDF(const rtl::OString &rSDFFile,
+        const rtl::OString &rPrj,
+        const rtl::OString &rRoot);
+    sal_Bool Merge(const rtl::OString &rSDFFile,
+        const rtl::OString &rDestinationFile);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */