[Libreoffice-commits] .: l10ntools/source

[Andras Timar]

 l10ntools/source/cfgmerge.cxx  |    4 ----
 l10ntools/source/helpmerge.cxx |    4 ----
 l10ntools/source/merge.cxx     |    4 ----
 3 files changed, 12 deletions(-)

New commits:
commit 881a93d3ab969454d52de1af95004ff3fbd5918f
Author: Andras Timar <atimar at suse.com>
Date:   Tue Nov 8 10:47:07 2011 +0100

    MERGE_SOURCE_LANGUAGES is never defined, removing ifdefs

diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 1fc568e..437e309 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -763,10 +763,6 @@ void CfgMerge::WorkOnText(
             if ( Export::isAllowed( nLangIndex ) &&
                 ( sContent != "-" ) && ( sContent.Len()))
             {
-#ifdef MERGE_SOURCE_LANGUAGES
-                    if( nLangIndex.EqualsIgnoreCaseAscii("de") || nLangIndex.EqualsIgnoreCaseAscii("en-US") )
-                        rText = sContent;
-#endif
                 Export::QuotHTML( rText );
             }
         }
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 9e744b2..214105c 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -550,11 +550,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
 
     pEntrys = NULL;
 
-#ifdef MERGE_SOURCE_LANGUAGES
-    if( true ){                  // Merge en-US!
-#else
     if( !sCur.EqualsIgnoreCaseAscii("en-US") ){
-#endif
         pXMLElement = (*aLangHM)[ "en-US" ];
         if( pXMLElement == NULL )
         {
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index d98f9ea..a42f058 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -222,11 +222,7 @@ MergeDataFile::MergeDataFile(
                 const ByteString sTITLE = sLine.GetToken( 0, '\t', rIdx );  // 13
 
 
-#ifdef MERGE_SOURCE_LANGUAGES
-                if( true )
-#else
                 if( !nLANG.EqualsIgnoreCaseAscii("en-US") )
-#endif
                 {
                     aLanguageSet.insert(nLANG);
                     InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE, filename, bCaseSensitive );