genlang, generating .pot files for .xrm files

Solved new pot directory structure

only tested .xrm files, but should be able to extract
all .pot files.

The LO tools generated the KID as part of the msg, this
is not implemented.

msgctxt is used as comments, this requires a slight change
of the lex programs.

Change-Id: Id9aadbd419fb44b73b633410f7dddd90d310ee8d

10 files changed, 15 insertions, 14 deletions

diff --git a/l10ntools/inc/gConv.hxx b/l10ntools/inc/gConv.hxx
index cda748346308..3f0f2137370b 100644
--- a/l10ntools/inc/gConv.hxx
+++ b/l10ntools/inc/gConv.hxx
@@ -36,10 +36,10 @@ class convert_gen
                                            const std::string& sSourceFile);
 
         // do extract/merge
-        bool execute(const bool bMerge, const bool bKid);
+        bool execute(const bool bMerge);
 
         // all converters MUST implement this function
-        virtual void execute() = 0;
+        virtual void doExecute() = 0;
 
         // utility functions for converters
         void lexRead(char *sBuf, int *nResult, int nMax_size);
@@ -62,9 +62,9 @@ class convert_gen
 
         // utility functions for converters
         void writeSourceFile(const std::string& line);
-        static bool checkAccess(std::string& sFile);
-        static bool createDir(std::string& sDir, std::string& sFile);
+        bool createDir(const std::string& sDir, const std::string& sFile);
 private:
         std::ofstream mcOutputFile;
+        bool checkAccess(std::string& sFile);
 };
 #endif
diff --git a/l10ntools/inc/gConvPo.hxx b/l10ntools/inc/gConvPo.hxx
index 7ca45bff93a2..4511a27e8981 100644
--- a/l10ntools/inc/gConvPo.hxx
+++ b/l10ntools/inc/gConvPo.hxx
@@ -42,7 +42,8 @@ class convert_po : public convert_gen
         void handleNL  ();
 
         // Used to save .pot files
-        void startSave(const std::string& sLanguage,
+        void startSave(const std::string& sName,
+                       const std::string& sTargetDir,
                        const std::string& sFile);
         void save(const std::string& sFileName,
                   const std::string& sKey,
@@ -58,6 +59,6 @@ class convert_po : public convert_gen
         bool         mbFuzzy;
         std::filebuf outBuffer;
 
-        void execute() override;
+        void doExecute() override;
 };
 #endif
diff --git a/l10ntools/inc/gConvProp.hxx b/l10ntools/inc/gConvProp.hxx
index 9e7f6e7b4758..819e92597cc9 100644
--- a/l10ntools/inc/gConvProp.hxx
+++ b/l10ntools/inc/gConvProp.hxx
@@ -29,6 +29,6 @@ class convert_prop : public convert_gen
         ~convert_prop();
 
     private:
-        void execute() override;
+        void doExecute() override;
 };
 #endif
diff --git a/l10ntools/inc/gConvSrc.hxx b/l10ntools/inc/gConvSrc.hxx
index 8df5d6c79330..69d339eb22d9 100644
--- a/l10ntools/inc/gConvSrc.hxx
+++ b/l10ntools/inc/gConvSrc.hxx
@@ -58,7 +58,7 @@ class convert_src : public convert_gen
         bool                     mbInListItem;
         int                      miListCount;
         int                      miMacroLevel;
-        void execute() override;
+        void doExecute() override;
         void trim(std::string& sText);
         void buildKey(std::string& sKey);
         void insertLanguagePart(std::string& sKey, std::string& sTextType);
diff --git a/l10ntools/inc/gConvTree.hxx b/l10ntools/inc/gConvTree.hxx
index 0807069fdbec..f795aa9cca02 100644
--- a/l10ntools/inc/gConvTree.hxx
+++ b/l10ntools/inc/gConvTree.hxx
@@ -57,6 +57,6 @@ class convert_tree : public convert_gen
         STATE_VAL       meStateVal;
         int             miCntLanguages;
 
-        void execute() override;
+        void doExecute() override;
 };
 #endif
diff --git a/l10ntools/inc/gConvUlf.hxx b/l10ntools/inc/gConvUlf.hxx
index 234c60e4aada..255d15fdd927 100644
--- a/l10ntools/inc/gConvUlf.hxx
+++ b/l10ntools/inc/gConvUlf.hxx
@@ -35,7 +35,7 @@ class convert_ulf : public convert_gen
     private:
         std::string msKey;
 
-        void execute() override;
+        void doExecute() override;
         void handleLines();
 };
 #endif
diff --git a/l10ntools/inc/gConvXcs.hxx b/l10ntools/inc/gConvXcs.hxx
index 3444907c5beb..26f4ed9b7a84 100644
--- a/l10ntools/inc/gConvXcs.hxx
+++ b/l10ntools/inc/gConvXcs.hxx
@@ -37,6 +37,6 @@ class convert_xcs : public convert_gen
         std::string msKey;
         bool        mbCollectingData;
 
-        void execute() override;
+        void doExecute() override;
 };
 #endif
diff --git a/l10ntools/inc/gConvXcu.hxx b/l10ntools/inc/gConvXcu.hxx
index 3e49f5285396..a9815cf270e4 100644
--- a/l10ntools/inc/gConvXcu.hxx
+++ b/l10ntools/inc/gConvXcu.hxx
@@ -45,6 +45,6 @@ class convert_xcu : public convert_gen
         int                      miLevel;
         bool                     mbNoTranslate;
 
-        void execute() override;
+        void doExecute() override;
 };
 #endif
diff --git a/l10ntools/inc/gConvXhp.hxx b/l10ntools/inc/gConvXhp.hxx
index c33e3b7abfc4..404a69b52dab 100644
--- a/l10ntools/inc/gConvXhp.hxx
+++ b/l10ntools/inc/gConvXhp.hxx
@@ -60,6 +60,6 @@ class convert_xhp : public convert_gen
         std::string    *msLangText;
         std::ofstream  *mcOutputFiles;
         int             miCntLanguages;
-        void            execute() override;
+        void            doExecute() override;
 };
 #endif
diff --git a/l10ntools/inc/gConvXrm.hxx b/l10ntools/inc/gConvXrm.hxx
index cb6e4a7bf5b8..e0b32474aa11 100644
--- a/l10ntools/inc/gConvXrm.hxx
+++ b/l10ntools/inc/gConvXrm.hxx
@@ -41,6 +41,6 @@ class convert_xrm : public convert_gen
         bool        mbIsLang;
         std::string msTag;
 
-        void execute() override;
+        void doExecute() override;
 };
 #endif