diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-13 18:16:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-13 18:16:42 +0000 |
| commit | ba982daa2ec1a56de407bf0ee975424a27220b46 (patch) | |
| tree | 532beffcca759870d7c37b2e9dbc1511d2c4f65d /transex3 | |
| parent | 7994b60ff3561722e009bce2b8469229eaddfd84 (diff) | |
INTEGRATION: CWS babelfish (1.43.2); FILE MERGED
2004/12/08 18:24:30 ihi 1.43.2.1: #i38677# Don't merge untranslatable Text
Diffstat (limited to 'transex3')
| -rw-r--r-- | transex3/source/export.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/transex3/source/export.cxx b/transex3/source/export.cxx index 221659d09ac2..43f9a7502c0b 100644 --- a/transex3/source/export.cxx +++ b/transex3/source/export.cxx @@ -2,9 +2,9 @@ * * $RCSfile: export.cxx,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: rt $ $Date: 2004-11-18 08:16:38 $ + * last change: $Author: kz $ $Date: 2005-01-13 19:16:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1032,16 +1032,16 @@ int Export::Execute( int nToken, char * pToken ) ByteString sText( GetText( sToken, nToken )); if ( !bMergeMode ) sText = sText.Convert( aCharSet, RTL_TEXTENCODING_MS_1252 ); - ByteString sLang( "de" ); + //ByteString sLang( "de" ); + ByteString sLang; if ( sToken.GetToken( 0, '=' ).Search( "[" ) != STRING_NOTFOUND ) { sLang = sToken.GetToken( 0, '=' ).GetToken( 1, '[' ).GetToken( 0, ']' ); CleanValue( sLang ); } ByteString nLangIndex = sLang; ByteString sOrigKey = sKey; - if ( sText.Len()) { - - + //if ( sText.Len()) { + if ( sText.Len() && sLang.Len() ) { if (( sKey.ToUpperAscii() == "TEXT" ) || ( sKey == "MESSAGE" ) || ( sKey == "CUSTOMUNITTEXT" ) || @@ -2388,6 +2388,7 @@ void Export::MergeRest( ResData *pResData, USHORT nMode ) ULONG nMaxIndex = 0; if ( pList ) nMaxIndex = pList->GetGermanEntryCount(); + //if( pMergeDataFile ) pMergeDataFile->Dump(); while(( pEntrys = pMergeDataFile->GetPFormEntrys( pResData )) && ( nLIndex < nMaxIndex )) { //if( pEntrys ) pEntrys->Dump(); ByteString sText; |