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

[Michael Stahl]

 l10ntools/inc/helpmerge.hxx    |    2 +-
 l10ntools/source/helpmerge.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 466c03f9566344b24aaa70b374daf46054914290
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 8 15:18:33 2016 +0100

    Revert "tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals"
    
    In a build --with-lang=2 languages this generates millions of lines of
    output, it prints for > 2 minutes straight.  Our build system is not a
    terminal benchmark, and i have no idea what the problem with
    "OSL_DEBUG_LEVEL > 1" conditionals is anyway, so revert it for now.
    
    This reverts commit 3f80f144cff8d8ddd1d33e7b8ca6dbe2ad8d8491.

diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index dcc3130..89c8543 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -31,7 +31,7 @@ class HelpParser
 private:
     OString sHelpFile;
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 2
     /// Debugmethod, prints the content of the map to stdout
     static void Dump(LangHashMap* rElem_in , const OString & sKey_in);
 
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 6766036..c5fda05 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -46,7 +46,7 @@
 #include "helper.hxx"
 #include "po.hxx"
 
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 2
 void HelpParser::Dump(XMLHashMap* rElem_in)
 {
     for(XMLHashMap::iterator pos = rElem_in->begin();pos != rElem_in->end(); ++pos)
@@ -180,7 +180,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile
     {
         posm = aXMLStrHM->find( *pos );
         LangHashMap*  aLangHM = posm->second;
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 2
         printf("*********************DUMPING HASHMAP***************************************");
         Dump(aXMLStrHM);
         printf("DBG: sHelpFile = %s\n",sHelpFile.getStr() );