genlang, update to satisfy clang.

changes due a log from clang tinderbox.

minor changes to interpret more files

Change-Id: I3821aab91dc21e74c870628a4f2265ab61d37cca

4 files changed, 9 insertions, 4 deletions

diff --git a/l10ntools/inc/gConv.hxx b/l10ntools/inc/gConv.hxx
index 3b5c1d12a120..a32291272278 100644
--- a/l10ntools/inc/gConv.hxx
+++ b/l10ntools/inc/gConv.hxx
@@ -63,7 +63,7 @@ class convert_gen
 
         // utility functions for converters
         void writeSourceFile(const string& line);
-        bool createDir(const string& sDir, const string& sFile);
+        static bool createDir(const string& sDir, const string& sFile);
 private:
         ofstream mcOutputFile;
         static bool checkAccess(string& sFile);
diff --git a/l10ntools/inc/gConvPo.hxx b/l10ntools/inc/gConvPo.hxx
index 53257c2393e0..ebf1ee3f29ea 100644
--- a/l10ntools/inc/gConvPo.hxx
+++ b/l10ntools/inc/gConvPo.hxx
@@ -54,6 +54,7 @@ class convert_po : public convert_gen
                   const string& sText,
                   const string& sComment,
                   const string& sResource,
+                  const string& sGroup,
                   bool               bFuzzy);
         void endSave();
 
diff --git a/l10ntools/inc/gConvSrc.hxx b/l10ntools/inc/gConvSrc.hxx
index 4aaa8bf55b29..3f3f9a242019 100644
--- a/l10ntools/inc/gConvSrc.hxx
+++ b/l10ntools/inc/gConvSrc.hxx
@@ -52,6 +52,7 @@ class convert_src : public convert_gen
         string              msName;
         string              msTextName;
         string              msCmd;
+        string              msGroup;
         bool                     mbEnUs;
         bool                     mbExpectName;
         bool                     mbExpectMacro;
@@ -62,7 +63,7 @@ class convert_src : public convert_gen
         int                      miListCount;
         int                      miMacroLevel;
         void doExecute() override;
-        void trim(string& sText);
+        static void trim(string& sText);
         void buildKey(string& sKey);
         void insertLanguagePart(string& sKey, string& sTextType);
 };
diff --git a/l10ntools/inc/gL10nMem.hxx b/l10ntools/inc/gL10nMem.hxx
index f2c116c36150..c657c8225b2c 100644
--- a/l10ntools/inc/gL10nMem.hxx
+++ b/l10ntools/inc/gL10nMem.hxx
@@ -57,6 +57,7 @@ class l10nMem
                           const string& sText,
                           const string& sComment,
                           const string& sResource,
+                          const string& sGroup,
                           bool          bIsFuzzy);
         void setSourceKey(int           iLineNo,
                           const string& sFilename,
@@ -64,6 +65,7 @@ class l10nMem
                           const string& sText,
                           const string& sComment,
                           const string& sResource,
+                          const string& sGroup,
                           bool          bMustExist);
 
         void saveTemplates(const string& sTargetDir,
@@ -88,7 +90,6 @@ class l10nMem
         int  miCurFileInx;
         int  miCurLangInx;
         int  miCurENUSinx;
-        bool mbNeedWrite;
         bool mbConvertMode;
         bool mbStrictMode;
         vector<l10nMem_enus_entry>      mcENUSlist;
@@ -111,7 +112,8 @@ class l10nMem
                          const string& sKey,
                          const string& sMsgId,
                          const string& sComment,
-                         const string& sResource);
+                         const string& sResource,
+                         const string& sGroup);
         void loadLangKey(int           iLineNo,
                          const string& sSourceFile,
                          const string& sKey,
@@ -130,6 +132,7 @@ class l10nMem
                     const string& sMsgId,
                     const string& sComment,
                     const string& sResource,
+                    const string& sGroup,
                     l10nMem::ENTRY_STATE eStat);
         bool findFileName(const string& sSourceFile);
 };