genlang, clenaup top of Lex files

Duplicate functions in lex files removed
Top part simplified and made identical.

Change-Id: I7288bfdbeba9d1ec96b5d2bc7b21dd65337cd8d7

20 files changed, 150 insertions, 404 deletions

diff --git a/l10ntools/inc/gConv.hxx b/l10ntools/inc/gConv.hxx
index 86d84a74fdc0..d329a5ac0295 100644
--- a/l10ntools/inc/gConv.hxx
+++ b/l10ntools/inc/gConv.hxx
@@ -42,7 +42,8 @@ class convert_gen
         virtual void doExecute() = 0;
 
         // utility functions for converters
-        void lexRead(char *sBuf, int *nResult, int nMax_size);
+        int lexRead(char *sBuf, int nMax_size);
+        static void lexStrncpy(char* s1, const char * s2, int n);
         string& copySource(char const *yyText, bool bDoClear = true);
 
     protected:
diff --git a/l10ntools/inc/gConvPo.hxx b/l10ntools/inc/gConvPo.hxx
index 31c037d107b5..5be3657a70bc 100644
--- a/l10ntools/inc/gConvPo.hxx
+++ b/l10ntools/inc/gConvPo.hxx
@@ -22,6 +22,10 @@
 
 
 
+extern int polex(void);
+
+
+
 class convert_po : public convert_gen
 {
     public:
@@ -61,5 +65,6 @@ class convert_po : public convert_gen
         filebuf outBuffer;
 
         void doExecute() override;
+        string genKeyId(const string& text);
 };
 #endif
diff --git a/l10ntools/inc/gConvSrc.hxx b/l10ntools/inc/gConvSrc.hxx
index 65bd5eb6daba..4aaa8bf55b29 100644
--- a/l10ntools/inc/gConvSrc.hxx
+++ b/l10ntools/inc/gConvSrc.hxx
@@ -21,6 +21,9 @@
 #include "gConv.hxx"
 
 
+extern int srclex(void);
+
+
 
 class convert_src : public convert_gen
 {
diff --git a/l10ntools/inc/gL10nMem.hxx b/l10ntools/inc/gL10nMem.hxx
index 635f4fb64702..f2c116c36150 100644
--- a/l10ntools/inc/gL10nMem.hxx
+++ b/l10ntools/inc/gL10nMem.hxx
@@ -39,7 +39,7 @@ class l10nMem
         static void showWarning(const string& sText, int iLineNo = 0);
         static void showDebug  (const string& sText, int iLineNo = 0);
         static void showVerbose(const string& sText, int iLineNo = 0);
-        static void keyToUpper (string& sKey);
+        static void keyToLower (string& sKey);
 
         void setModuleName(const string& sModuleName);
         const string& getModuleName(void);
diff --git a/l10ntools/source/gConv.cxx b/l10ntools/source/gConv.cxx
index 91044316b292..1070e88fa565 100644
--- a/l10ntools/source/gConv.cxx
+++ b/l10ntools/source/gConv.cxx
@@ -191,29 +191,38 @@ bool convert_gen::prepareFile()
 
 
 
-void convert_gen::lexRead(char *sBuf, int *nResult, int nMax_size)
+int convert_gen::lexRead(char *sBuf, int nMax_size)
 {
+    int nResult = 0;
+
     // did we hit eof
-    if (miSourceReadIndex == -1) {
-        *nResult = 0;
-        return;
+    if (miSourceReadIndex != -1) {
+        // assume we can copy all that are left.
+        nResult = msSourceBuffer.size() - miSourceReadIndex;
+
+        // space enough for the whole line ?
+        if (nResult <= nMax_size) {
+            msSourceBuffer.copy(sBuf, nResult, miSourceReadIndex);
+            l10nMem::showDebug(sBuf);
+            miSourceReadIndex = -1;
+        }
+        else {
+            msSourceBuffer.copy(sBuf, nMax_size, miSourceReadIndex);
+            l10nMem::showDebug(sBuf);
+            nResult = nMax_size;
+            miSourceReadIndex += nMax_size;
+        }
     }
+    return nResult;
+}
 
-    // assume we can copy all that are left.
-    *nResult = msSourceBuffer.size() - miSourceReadIndex;
 
-    // space enough for the whole line ?
-    if (*nResult <= nMax_size) {
-        msSourceBuffer.copy(sBuf, *nResult, miSourceReadIndex);
-        l10nMem::showDebug(sBuf);
-        miSourceReadIndex = -1;
-    }
-    else {
-        msSourceBuffer.copy(sBuf, nMax_size, miSourceReadIndex);
-        l10nMem::showDebug(sBuf);
-        *nResult = nMax_size;
-        miSourceReadIndex += nMax_size;
-    }
+
+void convert_gen::lexStrncpy(char *s1, const char *s2, int n)
+{
+    register int i;
+    for (i = 0; i < n; ++i)
+        s1[i] = s2[i];
 }
 
 
diff --git a/l10ntools/source/gConvPo.cxx b/l10ntools/source/gConvPo.cxx
index 1c3c4a066d8c..21b18cfa1d79 100644
--- a/l10ntools/source/gConvPo.cxx
+++ b/l10ntools/source/gConvPo.cxx
@@ -1,25 +1,36 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
- *
+
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+
  * This file incorporates work covered by the following license notice:
- *
+
  *   Licensed to the Apache Software Foundation (ASF) under one or more
  *   contributor license agreements. See the NOTICE file distributed
  *   with this work for additional information regarding copyright
  *   ownership. The ASF licenses this file to you under the Apache
  *   License, Version 2.0 (the "License"); you may not use this file
  *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0
  */
+#include <iomanip>
+#include <ctime>
 #include <string>
 #include <vector>
 using namespace std;
 
+#ifdef _MSC_VER
+#pragma warning (push, 1)
+#pragma warning (disable: 4245)
+#endif
+#include <boost/crc.hpp>
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
 #include "gL10nMem.hxx"
 #include "gConvPo.hxx"
 #include <iostream>
@@ -72,7 +83,7 @@ void convert_po::setValue(char *syyText, int iLineCnt)
         msId = syyText;
     if (mbExpectStr)
         msStr = syyText;
-    mbExpectId  =
+    mbExpectId =
     mbExpectStr = false;
     miLineNo   += iLineCnt;
 }
@@ -96,12 +107,12 @@ void convert_po::setKey(char *syyText)
 
     // skip "#:" and any blanks
     for (syyText += 2; *syyText == ' ' || *syyText == '\t'; ++syyText)
-        ;
+
     msKey = syyText;
 
     // remove trailing blanks
     for (i = msKey.size() -1; msKey[i] == '\r' || msKey[i] == ' ' || msKey[i] == '\t'; --i)
-        ;
+
     msKey.erase(i+1);
 }
 
@@ -128,7 +139,6 @@ void convert_po::handleNL()
 
 
 
-extern int polex(void);
 void convert_po::doExecute()
 {
     if (mbMergeMode)
@@ -160,8 +170,9 @@ void convert_po::startSave(const string& sName,
 
     ostream outFile(&outBuffer);
 
-    // Set license header
-//FIX JAN POT-Creation-Date
+    // Set header
+    auto t = std::time(nullptr);
+    auto tm = *std::localtime(&t);
     outFile << "#. extracted from " << sName                       << endl
             << "msgid \"\""                                        << endl
             << "msgstr \"\""                                       << endl
@@ -170,7 +181,8 @@ void convert_po::startSave(const string& sName,
             << "https://bugs.libreoffice.org/enter_bug.cgi?"
             << "product=LibreOffice&bug_status=UNCONFIRMED"
             << "&component=UI\\n\""                                << endl
-            << "\"POT-Creation-Date: \\n\""                        << endl
+            << "\"POT-Creation-Date: "
+            << std::put_time(&tm, "%Y-%m-%d %H:%M%z") << "\\n\""   << endl
             << "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\""    << endl
             << "\"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"" << endl
             << "\"Language-Team: LANGUAGE <LL@li.org>\\n\""        << endl
@@ -199,7 +211,7 @@ void convert_po::save(const string& sFileName,
     newPos = sFileName.find_last_of("/\\", sFileName.length());
     sName = sFileName.substr(newPos + 1, sFileName.length());
 
-    outFile << endl << "#. xxxxx" << endl;
+    outFile << endl << "#. " << genKeyId(sName + sText) << endl;
     if (sComment.length())
         outFile << "#. " << sComment << endl;
     outFile << "#: " << sName << endl
@@ -215,8 +227,26 @@ void convert_po::save(const string& sFileName,
 
 
 
-
 void convert_po::endSave()
 {
     outBuffer.close();
 }
+
+
+
+string convert_po::genKeyId(const string& text)
+{
+    boost::crc_32_type aCRC32;
+    aCRC32.process_bytes(text.c_str(), text.length());
+    unsigned int nCRC = aCRC32.checksum();
+    string key;
+
+    // Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid confusing IDs
+    static const char sSymbols[] =
+        "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";
+    for (short nKeyInd = 0; nKeyInd < 5; ++nKeyInd) {
+        key += sSymbols[(nCRC & 63) % strlen(sSymbols)];
+        nCRC >>= 6;
+    }
+    return key;
+}
diff --git a/l10ntools/source/gConvSrc.cxx b/l10ntools/source/gConvSrc.cxx
index 04b32bcca20b..e2784851bc01 100644
--- a/l10ntools/source/gConvSrc.cxx
+++ b/l10ntools/source/gConvSrc.cxx
@@ -18,15 +18,14 @@
  */
 #include <string>
 #include <vector>
-using namespace std;
-
-#include "gL10nMem.hxx"
-
-#include "gConvSrc.hxx"
 #include <iostream>
 #include <fstream>
 #include <cstdlib>
 #include <sstream>
+using namespace std;
+
+#include "gL10nMem.hxx"
+#include "gConvSrc.hxx"
 
 
 convert_src::convert_src(l10nMem& crMemory)
@@ -44,7 +43,6 @@ convert_src::convert_src(l10nMem& crMemory)
 
 
 
-extern int srclex(void);
 void convert_src::doExecute()
 {
     srclex();
@@ -123,6 +121,7 @@ void convert_src::setCmd(char *syyText)
     mbExpectName = true;
     mbInList     = false;
     trim(msCmd);
+    l10nMem::keyToLower(msCmd);
 }
 
 
@@ -174,9 +173,9 @@ void convert_src::setNL(char *syyText, bool bMacro)
             msValue.erase(nL,1);
         }
 
-        sKey += "." + msCmd + "." + msTextName;
+//FIX        sKey += "." + msCmd + "." + msTextName;
         if (msValue.size() && msValue != "-") {
-            mcMemory.setSourceKey(miLineNo, msSourceFile, sKey, msValue, "", "", mbMergeMode);
+            mcMemory.setSourceKey(miLineNo, msSourceFile, sKey, msValue, "", msCmd, mbMergeMode);
             if (mbMergeMode)
                 insertLanguagePart(sKey, msTextName);
         }
diff --git a/l10ntools/source/gConvXcu.cxx b/l10ntools/source/gConvXcu.cxx
index fe8e07f63bcb..3bc2cd074bde 100644
--- a/l10ntools/source/gConvXcu.cxx
+++ b/l10ntools/source/gConvXcu.cxx
@@ -20,8 +20,13 @@
 #include <vector>
 using namespace std;
 
+
+
 #include "gL10nMem.hxx"
 #include "gConvXcu.hxx"
+
+
+
 convert_xcu::convert_xcu(l10nMem& crMemory)
                         : convert_gen(crMemory),
                           mbNoCollectingData(true),
diff --git a/l10ntools/source/gL10nMem.cxx b/l10ntools/source/gL10nMem.cxx
index 7b545e1b6637..789ec1ad1308 100644
--- a/l10ntools/source/gL10nMem.cxx
+++ b/l10ntools/source/gL10nMem.cxx
@@ -549,7 +549,7 @@ bool l10nMem::needWrite(const string sFileName, bool bForce)
     if (!iCntAdded && !iCntChanged && !iCntDeleted) {
         cout << "genLang: No changes in " <<   sFileName;
         if (bForce)
-            cout << ", -o switch used, so files are saved" << endl;
+            cout << ", -s switch used, so files are saved" << endl;
         else
             cout << " skipping \"save\"" << endl;
         return bForce;
@@ -731,7 +731,7 @@ void l10nMem::convEntryKey(int           iLineNo,
     if (curENUSindex == -1 || mbStrictMode) {
         // make copy of key in upper case
         curKeyUpper = sKey;
-        keyToUpper(curKeyUpper);
+        keyToLower(curKeyUpper);
 
         // Loop through all potential en-US entries
         for (i = 0; i < iSize; ++i) {
@@ -963,7 +963,7 @@ bool l10nMem::findFileName(const string& sSourceFile)
 
 
 
-void l10nMem::keyToUpper(string& sKey)
+void l10nMem::keyToLower(string& sKey)
 {
     int i, iSize;
 
@@ -973,6 +973,6 @@ void l10nMem::keyToUpper(string& sKey)
         if (ch == ' ' || ch == '*' || ch == '+' || ch == '%')
             sKey[i] = '_';
         else
-            sKey[i] = toupper(ch);
+            sKey[i] = tolower(ch);
     }
 }
diff --git a/l10ntools/source/gLexPo.l b/l10ntools/source/gLexPo.l
index d390e007e3a8..af0d2313c1ae 100644
--- a/l10ntools/source/gLexPo.l
+++ b/l10ntools/source/gLexPo.l
@@ -16,24 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-/*
- white-space
-     #  translator-comments
-     #. extracted-comments
-     #: reference...
-     #, fuzzy
-     #| msgid previous-untranslated-string
-     msgid untranslated-string
-     msgstr translated-string
-
-     #: lib/error.c:116
-     msgid "Unknown system error"
-     msgstr "Error desconegut del sistema"
-*/
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -42,38 +24,16 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvPo.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_po *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = xres;}
-
-#define yytext_ptr potext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr potext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
 
 
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream          */
-/* noyywrap           --> yywrap is not called (single file scan)            */
-/* never-interactive  --> no check for console output                        */
-/* prefix=            --> yyFlexLexer change name                            */
-/* --- The following options are for future use (maybe)                      */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions        */
-/* c++                --> generate C++ classes                               */
 %option prefix="po" 8bit noyywrap never-interactive
 %array
 %p 24000
diff --git a/l10ntools/source/gLexSrc.l b/l10ntools/source/gLexSrc.l
index e5446e417399..ef05201f41e3 100644
--- a/l10ntools/source/gLexSrc.l
+++ b/l10ntools/source/gLexSrc.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,56 +24,29 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvSrc.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_src *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = (yy_size_t)xres;}
-
-#define yytext_ptr srctext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr srctext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
-
-
 
 
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream   */
-/* noyywrap           --> yywrap is not called (single file scan)     */
-/* never-interactive  --> no check for console output                 */
-/* prefix=            --> yyFlexLexer change name                     */
-/* --- The following options are for future use (maybe)               */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions */
-/* c++                --> generate C++ classes                        */
 %option prefix="src" 8bit noyywrap never-interactive
 %array
 %p 24000
 %e 1200
 %n 500
-
-
 %x CMD
+
 PRE   ^[ \t]*
 SUF   [ \t\r\n\\]
 SUFT  [ \t\r\n\[]
 SPACE [ \t]*
 IDENT ([(a-zA-Z0-9_][ a-zA-Z0-9_\-\+\*(,&]*[a-zA-Z0-9)_]|[a-zA-Z0-9_])
 KEYID [a-zA-Z0-9_-]+
-
 %%
 
 
@@ -92,12 +62,12 @@ KEYID [a-zA-Z0-9_-]+
     }
     yytext[i+1] = '\0';
 
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 }
 
 
 "//".* {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 }
 
 
@@ -241,7 +211,7 @@ KEYID [a-zA-Z0-9_-]+
 }
 
 <CMD>[ \t=]+ {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 }
 
 <CMD>.|\n|\r {
@@ -310,7 +280,7 @@ KEYID [a-zA-Z0-9_-]+
 
 
 . {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 
     // Just to please compiler.
     if (false)
diff --git a/l10ntools/source/gLexTree.l b/l10ntools/source/gLexTree.l
index 151a38bcbfa3..768ed5b7acc5 100644
--- a/l10ntools/source/gLexTree.l
+++ b/l10ntools/source/gLexTree.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,49 +24,22 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvTree.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_tree *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = xres;}
-
-#define yytext_ptr treetext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr treetext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
-
 
 
-
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream          */
-/* noyywrap           --> yywrap is not called (single file scan)            */
-/* never-interactive  --> no check for console output                        */
-/* prefix=            --> yyFlexLexer change name                            */
-/* --- The following options are for future use (maybe)                      */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions        */
-/* c++                --> generate C++ classes                               */
 %option prefix="tree" 8bit noyywrap never-interactive
 %array
 %p 24000
 %e 1200
 %n 500
 
-
-
 SP [ \t]*
 IDENT [\.a-zA-Z0-9_-]+
 %%
diff --git a/l10ntools/source/gLexUi.l b/l10ntools/source/gLexUi.l
index 21fbb16df407..d7dd86b65222 100644
--- a/l10ntools/source/gLexUi.l
+++ b/l10ntools/source/gLexUi.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,56 +24,29 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvUi.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_ui *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = (yy_size_t)xres;}
-
-#define yytext_ptr uitext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr uitext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
-
-
 
 
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream   */
-/* noyywrap           --> yywrap is not called (single file scan)     */
-/* never-interactive  --> no check for console output                 */
-/* prefix=            --> yyFlexLexer change name                     */
-/* --- The following options are for future use (maybe)               */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions */
-/* c++                --> generate C++ classes                        */
 %option prefix="ui" 8bit noyywrap never-interactive
 %array
 %p 24000
 %e 1200
 %n 500
-
-
 %x CMD
+
 PRE   ^[ \t]*
 SUF   [ \t\r\n\\]
 SUFT  [ \t\r\n\[]
 SPACE [ \t]*
 IDENT ([(a-zA-Z0-9_][ a-zA-Z0-9_\-\+\*(,&]*[a-zA-Z0-9)_]|[a-zA-Z0-9_])
 KEYID [a-zA-Z0-9_-]+
-
 %%
 
 
@@ -92,18 +62,18 @@ KEYID [a-zA-Z0-9_-]+
     }
     yytext[i+1] = '\0';
 
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 }
 
 
 "//".* {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 }
 
 
 
 . {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 
     // Just to please compiler.
     if (false)
diff --git a/l10ntools/source/gLexUlf.l b/l10ntools/source/gLexUlf.l
index c0dcf157352f..1492666cd8f0 100644
--- a/l10ntools/source/gLexUlf.l
+++ b/l10ntools/source/gLexUlf.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,41 +24,16 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvUlf.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_ulf *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = xres;}
-
-#define yytext_ptr ulftext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr ulftext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
-
-
 
 
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream          */
-/* noyywrap           --> yywrap is not called (single file scan)            */
-/* never-interactive  --> no check for console output                        */
-/* prefix=            --> yyFlexLexer change name                            */
-/* --- The following options are for future use (maybe)                      */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions        */
-/* c++                --> generate C++ classes                               */
 %option prefix="ulf" 8bit noyywrap never-interactive
 %array
 %p 24000
@@ -89,7 +61,7 @@ KEYID [a-zA-Z0-9_-]+
     }
     yytext[i+1] = '\0';
 
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 }
 
 
@@ -119,7 +91,7 @@ KEYID [a-zA-Z0-9_-]+
 
 
 .|\n {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 
     // Just to please compiler.
     if (false)
diff --git a/l10ntools/source/gLexXcs.l b/l10ntools/source/gLexXcs.l
index 25abd467efed..98a0983ebf45 100644
--- a/l10ntools/source/gLexXcs.l
+++ b/l10ntools/source/gLexXcs.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,48 +24,21 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvXcs.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_xcs *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = xres;}
-#define yytext_ptr xcstext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr xcstext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
-
-
 
 
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream          */
-/* noyywrap           --> yywrap is not called (single file scan)            */
-/* never-interactive  --> no check for console output                        */
-/* prefix=            --> yyFlexLexer change name                            */
-/* --- The following options are for future use (maybe)                      */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions        */
-/* c++                --> generate C++ classes                               */
 %option prefix="xcs" 8bit noyywrap never-interactive
 %array
 %p 24000
 %e 1200
 %n 500
-
-
-
 %%
 
 "<prop"[^>]*> {
@@ -88,7 +58,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 }
 
 .|\n {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 
     // Just to please compiler.
     if (false)
diff --git a/l10ntools/source/gLexXcu.l b/l10ntools/source/gLexXcu.l
index 25c227756251..4f88c9b3c3f7 100644
--- a/l10ntools/source/gLexXcu.l
+++ b/l10ntools/source/gLexXcu.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,49 +24,22 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvXcu.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_xcu *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = xres;}
-
-#define yytext_ptr xcutext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr xcutext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
-
 
 
-
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream          */
-/* noyywrap           --> yywrap is not called (single file scan)            */
-/* never-interactive  --> no check for console output                        */
-/* prefix=            --> yyFlexLexer change name                            */
-/* --- The following options are for future use (maybe)                      */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions        */
-/* c++                --> generate C++ classes                               */
 %option prefix="xcu" 8bit noyywrap never-interactive
 %array
 %p 24000
 %e 1200
 %n 500
 
-
-
 SPACE [ \t]*
 NAME  .*"oor:name="\"[^\"]+\"{SPACE}
 FIN   [^/>]*">"
@@ -79,7 +49,7 @@ FIN   [^/>]*">"
 
 "component-data" {
     LOCptr->addLevel();
-    IMPLptr->copySource(yytext, false);
+    LOCptr->copySource(yytext, false);
 }
 
 
@@ -134,7 +104,7 @@ FIN   [^/>]*">"
 
 
 . {
-    IMPLptr->copySource(yytext, LOCptr->mbNoCollectingData);
+    LOCptr->copySource(yytext, LOCptr->mbNoCollectingData);
 
     // Just to please compiler.
     if (false)
diff --git a/l10ntools/source/gLexXhp.l b/l10ntools/source/gLexXhp.l
index 0af3a412d9a7..802b3060d35d 100644
--- a/l10ntools/source/gLexXhp.l
+++ b/l10ntools/source/gLexXhp.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,48 +24,22 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvXhp.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_xhp *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = xres;}
-
-#define yytext_ptr xhptext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr xhptext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
 
 
-
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream          */
-/* noyywrap           --> yywrap is not called (single file scan)            */
-/* never-interactive  --> no check for console output                        */
-/* prefix=            --> yyFlexLexer change name                            */
-/* --- The following options are for future use (maybe)                      */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions        */
-/* c++                --> generate C++ classes                               */
 %option prefix="xhp" 8bit noyywrap never-interactive
 %array
 %p 24000
 %e 1200
 %n 500
 
-
-
 SP [ \t]*
 IDENT [\.a-zA-Z0-9_-]+
 %%
diff --git a/l10ntools/source/gLexXml.l b/l10ntools/source/gLexXml.l
index 923b5c26cd3c..357f0bada40f 100644
--- a/l10ntools/source/gLexXml.l
+++ b/l10ntools/source/gLexXml.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,56 +24,29 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvXml.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_xml *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = (yy_size_t)xres;}
-
-#define yytext_ptr xmltext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr xmltext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
-
-
 
 
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream   */
-/* noyywrap           --> yywrap is not called (single file scan)     */
-/* never-interactive  --> no check for console output                 */
-/* prefix=            --> yyFlexLexer change name                     */
-/* --- The following options are for future use (maybe)               */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions */
-/* c++                --> generate C++ classes                        */
 %option prefix="xml" 8bit noyywrap never-interactive
 %array
 %p 24000
 %e 1200
 %n 500
-
-
 %x CMD
+
 PRE   ^[ \t]*
 SUF   [ \t\r\n\\]
 SUFT  [ \t\r\n\[]
 SPACE [ \t]*
 IDENT ([(a-zA-Z0-9_][ a-zA-Z0-9_\-\+\*(,&]*[a-zA-Z0-9)_]|[a-zA-Z0-9_])
 KEYID [a-zA-Z0-9_-]+
-
 %%
 
 
@@ -92,18 +62,18 @@ KEYID [a-zA-Z0-9_-]+
     }
     yytext[i+1] = '\0';
 
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 }
 
 
 "//".* {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 }
 
 
 
 . {
-    IMPLptr->copySource(yytext);
+    LOCptr->copySource(yytext);
 
     // Just to please compiler.
     if (false)
diff --git a/l10ntools/source/gLexXrm.l b/l10ntools/source/gLexXrm.l
index 593741157130..8567016a2836 100644
--- a/l10ntools/source/gLexXrm.l
+++ b/l10ntools/source/gLexXrm.l
@@ -16,9 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
-
 %top{
 #include <string>
 #include <vector>
@@ -27,40 +24,16 @@ using namespace std;
 #include "gL10nMem.hxx"
 #include "gConvXrm.hxx"
 
-#define IMPLptr convert_gen::mcImpl
 #define LOCptr ((convert_xrm *)convert_gen::mcImpl)
-
-/* enlarge token buffer to tokenize whole strings */
-#undef  YYLMAX
 #define YYLMAX 64000
-
-/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) {int xres; IMPLptr->lexRead(buf, &xres, max_size); result = xres;}
-
-#define yytext_ptr xrmtext_ptr
+#define YY_INPUT(buf,result,max_size) LOCptr->lexRead(buf, max_size)
 #define YY_NO_UNISTD_H 1
+#define yytext_ptr xrmtext_ptr
+#define yy_flex_strncpy convert_gen::lexStrncpy 
 }
 
-%{
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-    register int i;
-    for ( i = 0; i < n; ++i )
-        s1[i] = s2[i];
-}
-%}
-
-
 
 
-/*****************************   O P T I O N S   *****************************/
-/* 8bit               --> allow 8bit characters in the input stream          */
-/* noyywrap           --> yywrap is not called (single file scan)            */
-/* never-interactive  --> no check for console output                        */
-/* prefix=            --> yyFlexLexer change name                            */
-/* --- The following options are for future use (maybe)                      */
-/* yyclass=           --> subClass yyFlexLexer to allow own functions        */
-/* c++                --> generate C++ classes                               */
 %option prefix="xrm" 8bit noyywrap never-interactive
 %array
 %p 24000
@@ -106,7 +79,7 @@ SP    [ \t]*
 
 
 .|\n {
-    IMPLptr->copySource(yytext, LOCptr->mbNoCollectingData);
+    LOCptr->copySource(yytext, LOCptr->mbNoCollectingData);
 
     // Just to please compiler.
     if (false)
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index 00ddbe8b8f11..459e36f64f37 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -24,7 +24,7 @@ ${MYCMD} --files nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/help.tree
 
 ${MYCMD} --target workdir/jan/helpcontent2/sbasic/guide.pot --base helpcontent2/source/text/sbasic/guide --files access2base.xhp control_properties.xhp create_dialog.xhp insert_control.xhp sample_code.xhp show_dialog.xhp translation.xhp
 
-${MYCMD} --target workdir/jan/helpcontent2/sbasic/shared.pot --base helpcontent2/source/text/sbasic/shared --files 00000002.xhp 00000003.xhp 01000000.xhp 01010210.xhp 01020000.xhp 01020100.xhp 01020200.xhp 01020300.xhp 01020500.xhp 01030000.xhp 01030100.xhp 01030200.xhp 01030300.xhp 01030400.xhp 01040000.xhp 01050000.xhp 01050100.xhp 01050200.xhp 01050300.xhp 01170100.xhp 01170101.xhp 01170103.xhp 03000000.xhp 03010000.xhp 03010100.xhp 03010101.xhp 03010102.xhp 03010103.xhp 03010200.xhp 03010201.xhp 03010300.xhp 03010301.xhp 03010302.xhp 03010303.xhp 03010304.xhp 03010305.xhp 03020000.xhp 03020100.xhp 03020101.xhp 03020102.xhp 03020103.xhp 03020104.xhp 03020200.xhp 03020201.xhp 03020202.xhp 03020203.xhp 03020204.xhp 03020205.xhp 03020301.xhp 03020302.xhp 03020303.xhp 03020304.xhp 03020305.xhp 03020400.xhp 03020401.xhp 03020402.xhp 03020403.xhp 03020404.xhp 03020405.xhp 03020406.xhp 03020407.xhp 03020408.xhp 03020409.xhp 03020410.xhp 03020411.xhp 03020412.xhp 03020413.xhp 03020414.xhp 03020415.xhp 03030000.xhp 03030100.xhp 03030101.xhp 03030102.xhp 03030103.xhp 03030104.xhp 03030105.xhp 03030106.xhp 03030107.xhp 03030108.xhp 03030110.xhp 03030111.xhp 03030112.xhp 03030113.xhp 03030114.xhp 03030115.xhp 03030116.xhp 03030120.xhp 03030130.xhp 03030200.xhp 03030201.xhp 03030202.xhp 03030203.xhp 03030204.xhp 03030205.xhp 03030206.xhp 03030300.xhp 03030301.xhp 03030302.xhp 03030303.xhp 03050000.xhp 03050100.xhp 03050200.xhp 03050300.xhp 03050500.xhp 03060000.xhp 03060100.xhp 03060200.xhp 03060300.xhp 03060400.xhp 03060500.xhp 03060600.xhp 03070000.xhp 03070100.xhp 03070200.xhp 03070300.xhp 03070400.xhp 03070500.xhp 03070600.xhp 03080000.xhp 03080100.xhp 03080101.xhp 03080102.xhp 03080103.xhp 03080104.xhp 03080200.xhp 03080201.xhp 03080202.xhp 03080300.xhp 03080301.xhp 03080302.xhp 03080400.xhp 03080401.xhp 03080500.xhp 03080501.xhp 03080502.xhp 03080600.xhp 03080601.xhp 03080700.xhp 03080701.xhp 03080800.xhp 03080801.xhp 03080802.xhp 03090000.xhp 03090100.xhp 03090101.xhp 03090102.xhp 03090103.xhp 03090200.xhp 03090201.xhp 03090202.xhp 03090203.xhp 03090300.xhp 03090301.xhp 03090302.xhp 03090303.xhp 03090400.xhp 03090401.xhp 03090402.xhp 03090403.xhp 03090404.xhp 03090405.xhp 03090406.xhp 03090407.xhp 03090408.xhp 03090409.xhp 03090410.xhp 03090411.xhp 03090412.xhp 03100000.xhp 03100050.xhp 03100060.xhp 03100070.xhp 03100080.xhp 03100100.xhp 03100300.xhp 03100400.xhp 03100500.xhp 03100600.xhp 03100700.xhp 03100900.xhp 03101000.xhp 03101100.xhp 03101110.xhp 03101120.xhp 03101130.xhp 03101140.xhp 03101300.xhp 03101400.xhp 03101500.xhp 03101600.xhp 03101700.xhp 03102000.xhp 03102100.xhp 03102101.xhp 03102200.xhp 03102300.xhp 03102400.xhp 03102450.xhp 03102600.xhp 03102700.xhp 03102800.xhp 03102900.xhp 03103000.xhp 03103100.xhp 03103200.xhp 03103300.xhp 03103400.xhp 03103450.xhp 03103500.xhp 03103600.xhp 03103700.xhp 03103800.xhp 03103900.xhp 03104000.xhp 03104100.xhp 03104200.xhp 03104300.xhp 03104400.xhp 03104500.xhp 03104600.xhp 03104700.xhp 03110000.xhp 03110100.xhp 03120000.xhp 03120100.xhp 03120101.xhp 03120102.xhp 03120103.xhp 03120104.xhp 03120105.xhp 03120200.xhp 03120201.xhp 03120202.xhp 03120300.xhp 03120301.xhp 03120302.xhp 03120303.xhp 03120304.xhp 03120305.xhp 03120306.xhp 03120307.xhp 03120308.xhp 03120309.xhp 03120310.xhp 03120311.xhp 03120312.xhp 03120313.xhp 03120314.xhp 03120315.xhp 03120400.xhp 03120401.xhp 03120402.xhp 03120403.xhp 03130000.xhp 03130100.xhp 03130500.xhp 03130600.xhp 03130700.xhp 03130800.xhp 03131000.xhp 03131300.xhp 03131400.xhp 03131500.xhp 03131600.xhp 03131700.xhp 03131800.xhp 03131900.xhp 03132000.xhp 03132100.xhp 03132200.xhp 03132300.xhp 03132400.xhp 03132500.xhp 05060700.xhp code-stubs.xhp keys.xhp main0211.xhp main0601.xhp menu/insert_chart.xhp menu/insert_form_control.xhp menu/insert_shape.xhp
+${MYCMD} --target workdir/jan/helpcontent2/sbasic/shared.pot --base helpcontent2/source/text/sbasic/shared --files 00000002.xhp 00000003.xhp 01000000.xhp 01010210.xhp 01020000.xhp 01020100.xhp 01020200.xhp 01020300.xhp 01020500.xhp 01030000.xhp 01030100.xhp 01030200.xhp 01030300.xhp 01030400.xhp 01040000.xhp 01050000.xhp 01050100.xhp 01050200.xhp 01050300.xhp 01170100.xhp 01170101.xhp 01170103.xhp 03000000.xhp 03010000.xhp 03010100.xhp 03010101.xhp 03010102.xhp 03010103.xhp 03010200.xhp 03010201.xhp 03010300.xhp 03010301.xhp 03010302.xhp 03010303.xhp 03010304.xhp 03010305.xhp 03020000.xhp 03020100.xhp 03020101.xhp 03020102.xhp 03020103.xhp 03020104.xhp 03020200.xhp 03020201.xhp 03020202.xhp 03020203.xhp 03020204.xhp 03020205.xhp 03020301.xhp 03020302.xhp 03020303.xhp 03020304.xhp 03020305.xhp 03020400.xhp 03020401.xhp 03020402.xhp 03020403.xhp 03020404.xhp 03020405.xhp 03020406.xhp 03020407.xhp 03020408.xhp 03020409.xhp 03020410.xhp 03020411.xhp 03020412.xhp 03020413.xhp 03020414.xhp 03020415.xhp 03030000.xhp 03030100.xhp 03030101.xhp 03030102.xhp 03030103.xhp 03030104.xhp 03030105.xhp 03030106.xhp 03030107.xhp 03030108.xhp 03030110.xhp 03030111.xhp 03030112.xhp 03030113.xhp 03030114.xhp 03030115.xhp 03030116.xhp 03030120.xhp 03030130.xhp 03030200.xhp 03030201.xhp 03030202.xhp 03030203.xhp 03030204.xhp 03030205.xhp 03030206.xhp 03030300.xhp 03030301.xhp 03030302.xhp 03030303.xhp 03050000.xhp 03050100.xhp 03050200.xhp 03050300.xhp 03050500.xhp 03060000.xhp 03060100.xhp 03060200.xhp 03060300.xhp 03060400.xhp 03060500.xhp 03060600.xhp 03070000.xhp 03070100.xhp 03070200.xhp 03070300.xhp 03070400.xhp 03070500.xhp 03070600.xhp 03080000.xhp 03080100.xhp 03080101.xhp 03080102.xhp 03080103.xhp 03080104.xhp 03080200.xhp 03080201.xhp 03080202.xhp 03080300.xhp 03080301.xhp 03080302.xhp 03080400.xhp 03080401.xhp 03080500.xhp 03080501.xhp 03080502.xhp 03080600.xhp 03080601.xhp 03080700.xhp 03080701.xhp 03080800.xhp 03080801.xhp 03080802.xhp 03090000.xhp 03090100.xhp 03090101.xhp 03090102.xhp 03090103.xhp 03090200.xhp 03090201.xhp 03090202.xhp 03090203.xhp 03090300.xhp 03090301.xhp 03090302.xhp 03090303.xhp 03090400.xhp 03090401.xhp 03090402.xhp 03090403.xhp 03090404.xhp 03090405.xhp 03090406.xhp 03090407.xhp 03090408.xhp 03090409.xhp 03090410.xhp 03090411.xhp 03090412.xhp 03100000.xhp 03100050.xhp 03100060.xhp 03100070.xhp 03100080.xhp 03100100.xhp 03100300.xhp 03100400.xhp 03100500.xhp 03100600.xhp 03100700.xhp 03100900.xhp 03101000.xhp 03101100.xhp 03101110.xhp 03101120.xhp 03101130.xhp 03101140.xhp 03101300.xhp 03101400.xhp 03101500.xhp 03101600.xhp 03101700.xhp 03102000.xhp 03102100.xhp 03102101.xhp 03102200.xhp 03102300.xhp 03102400.xhp 03102450.xhp 03102600.xhp 03102700.xhp 03102800.xhp 03102900.xhp 03103000.xhp 03103100.xhp 03103200.xhp 03103300.xhp 03103400.xhp 03103450.xhp 03103500.xhp 03103600.xhp 03103700.xhp 03103800.xhp 03103900.xhp 03104000.xhp 03104100.xhp 03104200.xhp 03104300.xhp 03104400.xhp 03104500.xhp 03104600.xhp 03104700.xhp 03110000.xhp 03110100.xhp 03120000.xhp 03120100.xhp 03120101.xhp 03120102.xhp 03120103.xhp 03120104.xhp 03120105.xhp 03120200.xhp 03120201.xhp 03120202.xhp 03120300.xhp 03120301.xhp 03120302.xhp 03120303.xhp 03120304.xhp 03120305.xhp 03120306.xhp 03120307.xhp 03120308.xhp 03120309.xhp 03120310.xhp 03120311.xhp 03120312.xhp 03120313.xhp 03120314.xhp 03120315.xhp 03120400.xhp 03120401.xhp 03120402.xhp 03120403.xhp 03130000.xhp 03130100.xhp 03130500.xhp 03130600.xhp 03130700.xhp 03130800.xhp 03131000.xhp 03131300.xhp 03131400.xhp 03131500.xhp 03131600.xhp 03131700.xhp 03131800.xhp 03131900.xhp 03132000.xhp 03132100.xhp 03132200.xhp 03132300.xhp 03132400.xhp 03132500.xhp 05060700.xhp code-stubs.xhp keys.xhp main0211.xhp main0601.xhp
 
 ${MYCMD} --target workdir/jan/helpcontent2/sbasic/shared/01.pot --base helpcontent2/source/text/sbasic/shared/01 --files 06130000.xhp 06130100.xhp 06130500.xhp
 
@@ -76,7 +76,7 @@ ${MYCMD} --target workdir/jan/helpcontent2/shared/05.pot --base helpcontent2/sou
 
 ${MYCMD} --target workdir/jan/helpcontent2/shared/07.pot --files helpcontent2/source/text/shared/07/09000000.xhp
 
-${MYCMD} --target workdir/jan/helpcontent2/shared.pot --base helpcontent2/source/text/shared --files 3dsettings_toolbar.xhp fontwork_toolbar.xhp main0108.xhp main0201.xhp main0204.xhp main0208.xhp main0212.xhp main0213.xhp main0214.xhp main0226.xhp main0227.xhp main0400.xhp main0500.xhp main0600.xhp main0650.xhp main0800.xhp need_help.xhp
+${MYCMD} --target workdir/jan/helpcontent2/shared.pot --base helpcontent2/source/text/shared --files 3dsettings_toolbar.xhp fontwork_toolbar.xhp main0108.xhp main0201.xhp main0204.xhp main0208.xhp main0212.xhp main0213.xhp main0214.xhp main0226.xhp main0227.xhp main0400.xhp main0500.xhp main0600.xhp main0650.xhp main0800.xhp need_help.xhp menu/insert_chart.xhp menu/insert_form_control.xhp menu/insert_shape.xhp
 
 ${MYCMD} --target workdir/jan/helpcontent2/shared/autokorr.pot --base helpcontent2/source/text/shared/autokorr --files 01000000.xhp 02000000.xhp 03000000.xhp 04000000.xhp 05000000.xhp 06000000.xhp 07000000.xhp 08000000.xhp 09000000.xhp 10000000.xhp 12000000.xhp 13000000.xhp
 
@@ -485,7 +485,7 @@ ${MYCMD} --base dictionaries/hu_HU/dialog --files hu_HU_en_US.properties hu_HU_h
 
 ${MYCMD} --files dictionaries/pt_BR/dialog/pt_BR_pt_BR.properties
 
-${MYCMD} --target workdir/jan/dictionaries/ru_RU/dialog.pot --base dictionaries/ru_RU/dialog --files ru_RU_en_US.properties dialog/ru_RU_ru_RU.properties
+${MYCMD} --target workdir/jan/dictionaries/ru_RU/dialog.pot --base dictionaries/ru_RU/dialog --files ru_RU_en_US.properties ru_RU_ru_RU.properties
 
 ${MYCMD} --files librelogo/source/pythonpath/LibreLogo_en_US.properties
 
@@ -945,7 +945,7 @@ ${MYCMD} --files dictionaries/oc_FR/dictionaries.xcu
 
 ${MYCMD} --files dictionaries/pl_PL/dictionaries.xcu
 
-${MYCMD} --files dictionaries/pt_BR --files dictionaries.xcu Linguistic.xcu
+${MYCMD} --base  dictionaries/pt_BR --files dictionaries.xcu Linguistic.xcu
 
 ${MYCMD} --files dictionaries/pt_BR/dialog/OptionsDialog.xcu
 
@@ -1009,8 +1009,6 @@ ${MYCMD} --files mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Dr
 
 #${MYCMD} --base odk/examples/DevelopersGuide/Components/Addons/JobsAddon --files Addons.xcu Jobs.xcu
 
-${MYCMD} --base odk/examples/DevelopersGuide/Components/Addons --files ProtocolHandlerAddon_cpp Addons.xcu
-
 #${MYCMD} --files odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/ProtocolHandler.xcu
 
 #${MYCMD} --base odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java --files Addons.xcu ProtocolHandler.xcu