[Libreoffice-commits] .: l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/export.hxx       |    5 +++--
 l10ntools/source/helpex.cxx    |    5 +++--
 l10ntools/source/lngmerge.cxx  |    2 +-
 l10ntools/source/merge.cxx     |    5 +++--
 l10ntools/source/propmerge.cxx |    3 ++-
 l10ntools/source/treemerge.cxx |    2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 05ac3878bba25f39077b98ad2ac2fee908aea265
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Dec 2 05:07:46 2012 +0100

    Ignore qtz in ulfex and some other places
    
    Installation not works well with qtz so ignore
    it in ulf files.
    In those executables which work with one lang at
    a time it is unwanted to store the useless qtz strings
    at all call.
    
    Change-Id: I1d65ec340da1832404001ad18820407e56615db6

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 28807f6..af94c17 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -460,8 +460,9 @@ class MergeDataFile
             const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
             const rtl::OString &sFilename, bool bCaseSensitive);
     public:
-        explicit MergeDataFile(const rtl::OString &rFileName,
-            const rtl::OString& rFile, bool bCaseSensitive);
+        explicit MergeDataFile(
+            const rtl::OString &rFileName, const rtl::OString& rFile,
+            bool bCaseSensitive, bool bWithQtz = true );
         ~MergeDataFile();
 
 
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 7ab581a..21a8b9d 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -81,7 +81,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
                 std::cerr << "Helpex error: cannot open input file\n";
                 return 1;
             }
-            MergeDataFile aMergeDataFile( aArgs.m_sMergeSrc, OString(), false);
+            MergeDataFile aMergeDataFile(
+                aArgs.m_sMergeSrc, OString(), false, false );
             std::string sTemp;
             aInput >> sTemp;
             while( !aInput.eof() )
@@ -104,7 +105,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
         {
             HelpParser aParser( aArgs.m_sInputFile );
             MergeDataFile aMergeDataFile(
-                aArgs.m_sMergeSrc, aArgs.m_sInputFile, false );
+                aArgs.m_sMergeSrc, aArgs.m_sInputFile, false, false );
             hasNoError =
                 aParser.Merge(
                     aArgs.m_sMergeSrc, aArgs.m_sOutputFile,
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 7294e27..9da45b6 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -184,7 +184,7 @@ sal_Bool LngParser::Merge(
     }
     nError = LNG_OK;
 
-    MergeDataFile aMergeDataFile( rSDFFile, sSource, false );
+    MergeDataFile aMergeDataFile( rSDFFile, sSource, false, false );
     rtl::OString sTmp( Export::sLanguages );
     if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")) )
         Export::SetLanguages( aMergeDataFile.GetLanguages() );
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 98334be..4f065fb 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -151,7 +151,7 @@ sal_Bool MergeData::operator==( ResData *pData )
 
 MergeDataFile::MergeDataFile(
     const rtl::OString &rFileName, const rtl::OString &rFile,
-    bool bCaseSensitive)
+    bool bCaseSensitive, bool bWithQtz )
 {
     std::ifstream aInputStream( rFileName.getStr() );
     if ( !aInputStream.is_open() )
@@ -261,7 +261,8 @@ MergeDataFile::MergeDataFile(
                 aActPo.getLocalId(), sHack, sLang, sText,
                 sQHText, sTitle, aActPo.getSourceFile(), bCaseSensitive );
 
-            if( bFirstLang && ( strcmp(getenv("ENABLE_RELEASE_BUILD"),"TRUE") ) )
+            if( bFirstLang && bWithQtz &&
+                ( strcmp(getenv("ENABLE_RELEASE_BUILD"),"TRUE") ) )
             {
                 aLanguageSet.insert("qtz");
                 InsertEntry(
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index a4440e9..79c737e 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -180,7 +180,8 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil
         return;
     }
 
-    MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false );
+    MergeDataFile aMergeDataFile(
+        rMergeSrc, m_sSource, false, m_sLang == "qtz" );
 
     const std::vector<OString> vLanguages = aMergeDataFile.GetLanguages();
     if( m_sLang != "qtz" && vLanguages.size()>=2 &&
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index bc9596c..8f022de 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -280,7 +280,7 @@ void TreeParser::Merge(
     else
     {
         MergeDataFile aMergeDataFile(
-            rMergeSrc, static_cast<OString>( m_pSource->name ), false );
+            rMergeSrc, static_cast<OString>( m_pSource->name ), false, false );
         const std::vector<OString> vLanguages = aMergeDataFile.GetLanguages();
         if( vLanguages.size()>=2 &&
             vLanguages[vLanguages[0]=="qtz" ? 0 : 1] != m_sLang )