Revert "fdo#52246 let helpex use gsicheck's tag checker"

This reverts commit e3b92778.
There will be a better solution in feature/killsdf soon.

Conflicts:

	l10ntools/inc/gsicheck.hxx
	l10ntools/source/gsicheck.cxx
	l10ntools/source/gsimain.cxx

Change-Id: I5d12f4ee069d7024345d78c45fb1587cb006c922

l10ntools/Executable_gsicheck.mk

@@ -34,12 +34,10 @@ $(eval $(call gb_Executable_set_include,gsicheck,\
 $(eval $(call gb_Executable_use_libraries,gsicheck,\
     sal \
 ))
-$(eval $(call gb_Executable_use_static_libraries,gsicheck,\
-    transex \
-))
 
 $(eval $(call gb_Executable_add_exception_objects,gsicheck,\
-    l10ntools/source/gsimain \
+    l10ntools/source/gsicheck \
+    l10ntools/source/tagtest \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:

l10ntools/StaticLibrary_transex.mk

@@ -37,8 +37,6 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
     l10ntools/source/merge \
     l10ntools/source/file \
     l10ntools/source/directory \
-    l10ntools/source/tagtest \
-    l10ntools/source/gsicheck \
 ))
 
 # vim: set noet sw=4 ts=4:

l10ntools/inc/export.hxx

@@ -71,9 +71,6 @@ typedef boost::unordered_map<rtl::OString, PFormEntrys*, rtl::OStringHash>
 typedef boost::unordered_map<rtl::OString, MergeData*, rtl::OStringHash>
     MergeDataHashMap;
 
-typedef boost::unordered_map<rtl::OString, size_t, rtl::OStringHash>
-    LineNumberHashMap;
-
 #define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))
 #define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))
 #define LIST_REFID  "LIST_REFID"
@@ -377,36 +374,23 @@ private:
     OStringBoolHashMap bQuickHelpTextFirst;
     OStringHashMap sTitle;
     OStringBoolHashMap bTitleFirst;
-    OStringHashMap sSDFLine;
-    LineNumberHashMap nLine;
 
 public:
     PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
     void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
-        const rtl::OString &rQuickHelpText, const rtl::OString &rTitle,
-        const rtl::OString &rSDFLine, const std::size_t nLineIn)
+        const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
     {
+
         sText[ rId ] = rText;
         bTextFirst[ rId ] = true;
         sQuickHelpText[ rId ] = rQuickHelpText;
         bQuickHelpTextFirst[ rId ] = true;
         sTitle[ rId ] = rTitle;
         bTitleFirst[ rId ] = true;
-        sSDFLine[ rId ] = rSDFLine;
-        nLine[ rId ] = nLineIn;
     }
     sal_Bool GetText( rtl::OString &rReturn, sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
     sal_Bool GetTransex3Text( rtl::OString &rReturn, sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
 
-    rtl::OString & GetSDF(const rtl::OString &nLangIndex)
-    {
-        return sSDFLine[nLangIndex];
-    }
-
-    std::size_t GetNLine(const rtl::OString &nLangIndex)
-    {
-        return nLine[nLangIndex];
-    }
 };
 
 //
@@ -459,8 +443,7 @@ class MergeDataFile
             const rtl::OString &rLID, const rtl::OString &rPFO,
             const rtl::OString &nLang, const rtl::OString &rTEXT,
             const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
-            const rtl::OString &sFilename, bool bCaseSensitive,
-            const rtl::OString &rSDF, std::size_t nLine);
+            const rtl::OString &sFilename, bool bCaseSensitive);
     public:
         explicit MergeDataFile(const rtl::OString &rFileName,
             const rtl::OString& rFile, bool bCaseSensitive);

l10ntools/inc/gsicheck.hxx

@@ -33,7 +33,6 @@
 
 #include <cstddef>
 #include <vector>
-#include <fstream>
 
 #include "tagtest.hxx"
 
@@ -132,39 +131,6 @@ public:
     void WriteFixed( LazyStream &aFixOut );
 };
 
-sal_Bool check(rtl::OString s,std::size_t nLine);
-
-void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg, rtl::OString const & aPrefix,
-                   rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString aUniqueId = rtl::OString() );
-
-void PrintError( rtl::OString const & aMsg, rtl::OString const & aPrefix,
-                 rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString const & aUniqueId = rtl::OString() );
-
-bool LanguageOK( rtl::OString const & aLang );
-
-class LazyStream: public std::ofstream
-{
-
-private:
-    rtl::OString aFileName;
-    bool bOpened;
-
-public:
-    LazyStream()
-    : aFileName()
-    , bOpened(false)
-    {};
-
-    void SetFileName( const rtl::OString& rFileName )
-    {
-        aFileName = rFileName;
-    };
-
-    void LazyOpen();
-};
-
-sal_Int32 const MAX_GID_LID_LEN = 250;
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

l10ntools/source/helpmerge.cxx

@@ -52,7 +52,6 @@
 
 #include "common.hxx"
 #include "helper.hxx"
-#include "gsicheck.hxx"
 
 #if OSL_DEBUG_LEVEL > 2
 void HelpParser::Dump(XMLHashMap* rElem_in)
@@ -395,13 +394,10 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const rtl::OString& sCur ,
                 if (!sNewdata.isEmpty())
                 {
                     if( pXMLElement != NULL )
-                    {
-                        if (check(pEntrys->GetSDF(sCur),pEntrys->GetNLine(sCur)))
                     {
                         data   = new XMLData( sNewdata , NULL , true ); // Add new one
                         pXMLElement->RemoveAndDeleteAllChildren();
                         pXMLElement->AddChild( data );
-                        }
                         aLangHM->erase( sCur );
                     }
                 }

l10ntools/source/merge.cxx

@@ -151,7 +151,6 @@ MergeDataFile::MergeDataFile(
         printf("Warning : Can't open %s\n", rFileName.getStr());
         return;
     }
-    std::size_t nLine=0;
     while (!aInputStream.eof())
     {
         std::string buf;
@@ -172,12 +171,11 @@ MergeDataFile::MergeDataFile(
             const rtl::OString sTEXT = sLine.getToken( 0, '\t', n ); // token 10
             const rtl::OString sQHTEXT = sLine.getToken( 1, '\t', n ); // token 12
             const rtl::OString sTITLE = sLine.getToken( 0, '\t', n ); // token 13
-            const rtl::OString sSDF(buf.data(),buf.length());
 
             if (!nLANG.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")))
             {
                 aLanguageSet.insert(nLANG);
-                InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE, filename, bCaseSensitive, sSDF, ++nLine);
+                InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE, filename, bCaseSensitive );
             }
         }
     }
@@ -245,8 +243,7 @@ void MergeDataFile::InsertEntry(
     const rtl::OString &rLID, const rtl::OString &rPFO,
     const rtl::OString &nLANG, const rtl::OString &rTEXT,
     const rtl::OString &rQHTEXT, const rtl::OString &rTITLE ,
-    const rtl::OString &rInFilename , bool bCaseSensitive,
-    const rtl::OString &rSDFLine, const std::size_t nLine
+    const rtl::OString &rInFilename , bool bCaseSensitive
     )
 {
     MergeData *pData;
@@ -277,7 +274,7 @@ void MergeDataFile::InsertEntry(
     }
 
     // finaly insert the cur string
-    pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE, rSDFLine, nLine );
+    pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE );
 }
 
 rtl::OString MergeDataFile::CreateKey(const rtl::OString& rTYP, const rtl::OString& rGID,