Implement more Po method for merge

Implement file oprerations(entire reading
and rest part of writing)
Convert text to merge/sdf form
Plus cleanup

Change-Id: I6bab9bb202fcdc6d0f2a13f6c44d28e22c688e1e
Reviewed-on: https://gerrit.libreoffice.org/520Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>

l10ntools/Executable_localize.mk

@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,localize,\
 
 $(eval $(call gb_Executable_use_libraries,localize,\
     sal \
+    i18nregexp \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,localize,\

l10ntools/Executable_renewpo.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_Executable_set_include,renewpo,\
 
 $(eval $(call gb_Executable_use_libraries,renewpo,\
     sal \
+    i18nregexp \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,renewpo,\

l10ntools/StaticLibrary_transex.mk

@@ -32,6 +32,8 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_StaticLibrary_use_sdk_api,transex))
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
     l10ntools/source/export2 \
     l10ntools/source/merge \

l10ntools/inc/po.hxx

@@ -31,6 +31,14 @@ public:
                         GenPoEntry();
     virtual             ~GenPoEntry();
 
+    virtual OString     getWhiteSpace() const   { return m_sWhiteSpace; }
+    virtual OString     getExtractCom() const   { return m_sExtractCom; }
+    virtual OString     getReference() const    { return m_sReference; }
+    virtual OString     getContext() const      { return m_sContext; }
+    virtual OString     getUnTransStr() const   { return m_sUnTransStr; }
+    virtual OString     getTransStr() const     { return m_sTransStr; }
+    virtual bool        getFuzzy() const        { return m_bFuzzy; }
+
     virtual void        setWhiteSpace(const OString& rWhiteSpace)
                         { m_sWhiteSpace = rWhiteSpace; }
     virtual void        setExtractCom(const OString& rExtractCom)
@@ -46,7 +54,9 @@ public:
     virtual void        setFuzzy(bool bFuzzy)
                         { m_bFuzzy = bFuzzy; }
     virtual void        genKeyId();
-    virtual void        writeToFile(std::ofstream& io_rOFStream);
+
+    virtual void        writeToFile(std::ofstream& rOFStream);
+    virtual void        readFromFile(std::ifstream& rIFStream);
 };
 
 class PoEntry: public GenPoEntry
@@ -67,13 +77,19 @@ private:
 
 public:
 
+                        PoEntry();
                         PoEntry(const OString& i_rSDFLine,
-                            const TYPE eType = TTEXT);
+                                const TYPE eType = TTEXT);
     virtual             ~PoEntry();
 
+    virtual OString     getUnTransStr() const;
+    virtual OString     getTransStr() const;
     virtual void        setUnTransStr(const OString& rUnTransStr);
     virtual void        setTransStr(const OString& rTransStr);
 
+    virtual void        writeToFile(std::ofstream& rOFStream);
+    virtual void        readFromFile(std::ifstream& rIFStream);
+
 };
 
 class PoHeader: public GenPoEntry

l10ntools/source/renewpo.cxx

@@ -63,7 +63,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath,
     //Generate and open sdf
     cout << "Process start with language: " <<  LangEntryName.getStr() << endl;
     system( (rpo2loPath +
-            " -i " + rPath.getStr() + LangEntryName +
+            " -i " + rPath + "/" + LangEntryName +
             " -o " + SDFFileName +
             " -l " + LangEntryName +
             " -t " + rSDFPath).getStr());
@@ -77,7 +77,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath,
     while(!aSDFInput.eof())
     {
         OString sActUnTrans = sLine;
-        OString sPath = rPath + LangEntryName;
+        OString sPath = rPath + "/"+ LangEntryName;
         OString sActSourcePath = GetPath(sPath,sActUnTrans);
         //Make new po file, copy header with some changes
         if (!aOutPut.is_open())