genlang, PO files contain both comment and resource extra

the .ulf ==> .pot keep the x-comment, therefore the memory
db is expanded with sResource and sComment.

The memory db API is changed to add the 2 new fields, which
causes a change in all callers.

Change-Id: I38527c8d2db9d56ecf9ae42550ed5420371b658e

1 files changed, 12 insertions, 11 deletions

diff --git a/l10ntools/inc/gConvTree.hxx b/l10ntools/inc/gConvTree.hxx
index 90ee86037a50..fff9248d836b 100644
--- a/l10ntools/inc/gConvTree.hxx
+++ b/l10ntools/inc/gConvTree.hxx
@@ -42,20 +42,21 @@ class convert_tree : public convert_gen
         convert_tree(l10nMem& crMemory);
         ~convert_tree();
 
-        void         setString         (char *yytext);
-        void         setState          (char *yytext, STATE_TAG eNewStateTag, STATE_VAL eNewStateVAL, char *sModule);
-        void         setValue          (char *yytext);
-        string& copySourceSpecial (char *yytext, int iType);
-        void         writeSourceFile   (string& sText, int inx);
+        void setString(char *yytext);
+        void setState(char *yytext, STATE_TAG eNewStateTag, STATE_VAL eNewStateVAL, char *sModule);
+        void setValue(char *yytext);
+        void writeSourceFile(string& sText, int inx);
+        string& copySourceSpecial(char *yytext, int iType);
 
     private:
-        string     msLine;
-        string     msId;
-        string     msAppl;
+        string msLine;
+        string msModule;
+        string msId;
+        string msAppl;
         ofstream  *mcOutputFiles;
-        STATE_TAG       meStateTag;
-        STATE_VAL       meStateVal;
-        int             miCntLanguages;
+        STATE_TAG  meStateTag;
+        STATE_VAL  meStateVal;
+        int        miCntLanguages;
 
         void doExecute() override;
 };