strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS so8betal10n (1.16.24); FILE MERGED

Browse source 
2004/11/25 18:36:36 ihi 1.16.24.1: German merge fix
This commit is contained in:
Ivo Hinkelmann 2004-11-26 19:44:36 +00:00
parent 455aa70daa
commit 72dcd2cb50
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
transex3/source/merge.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: merge.cxx,v $
*
* $Revision: 1.17 $
* $Revision: 1.18 $
*
* last change: $Author: rt $ $Date: 2004-11-18 08:17:30 $
* last change: $Author: ihi $ $Date: 2004-11-26 20:44:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -299,7 +299,7 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFi
//if (( nLANG != 49 ) && ( LANGUAGE_ALLOWED( GetLangIndex( nLANG ))))
nLANG.EraseLeadingAndTrailingChars();
if ( !nLANG.EqualsIgnoreCaseAscii( "de" ) && !nLANG.EqualsIgnoreCaseAscii("en-US") ){
if ( !nLANG.EqualsIgnoreCaseAscii("en-US") ){
InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE );
if( nLANG.Len() > 0 ){
bool bFound = false;
@ -348,7 +348,7 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFi
//if (( nLANG != 49 ) && ( LANGUAGE_ALLOWED( GetLangIndex( nLANG ))))
nLANG.EraseLeadingAndTrailingChars();
if ( !nLANG.EqualsIgnoreCaseAscii("de") && !nLANG.EqualsIgnoreCaseAscii("en-US") ){
if ( !nLANG.EqualsIgnoreCaseAscii("en-US") ){
InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE );
if( nLANG.Len() > 0 ){
bool bFound = false;