diff options
| author | Andras Timar <atimar@suse.com> | 2011-11-08 10:47:07 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-11-08 10:47:38 +0100 |
| commit | 881a93d3ab969454d52de1af95004ff3fbd5918f (patch) | |
| tree | 0467be3f7deb90e205b2110a9a1638cdd8882dc0 /l10ntools | |
| parent | 9b0d9a2ace6d51363f2360621aae44f1b353e4df (diff) | |
MERGE_SOURCE_LANGUAGES is never defined, removing ifdefs
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/cfgmerge.cxx | 4 | ||||
| -rw-r--r-- | l10ntools/source/helpmerge.cxx | 4 | ||||
| -rw-r--r-- | l10ntools/source/merge.cxx | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index 1fc568eaac94..437e3099a3bc 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 9e744b238778..214105c25c79 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 d98f9ea156f7..a42f058cd160 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 ); |