diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-29 15:48:05 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-29 15:48:05 +0000 |
commit | caa6f1c26924886f6dd5ac348050f0d1cb9f0d17 (patch) | |
tree | 2cba6183fc384cf745945b93dc502281f1684a58 /transex3 | |
parent | 18ad4b1542a90f7aa0972b62feeafd0b1bd5e3f2 (diff) |
INTEGRATION: CWS mergem8 (1.30.2.1.18); FILE MERGED
2003/04/07 13:42:36 nf 1.30.2.1.18.1: #-i11961#
Diffstat (limited to 'transex3')
-rw-r--r-- | transex3/source/export.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/transex3/source/export.cxx b/transex3/source/export.cxx index 3212fa46ec57..485e76b0cbdc 100644 --- a/transex3/source/export.cxx +++ b/transex3/source/export.cxx @@ -2,9 +2,9 @@ * * $RCSfile: export.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: hr $ $Date: 2003-03-27 17:10:45 $ + * last change: $Author: hr $ $Date: 2003-04-29 16:48:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -883,9 +883,13 @@ int Export::Execute( int nToken, char * pToken ) if ( nList ) { SetChildWithText(); ByteString sEntry( sToken.GetToken( 1, '\"' )); + if ( sToken.GetTokenCount( '\"' ) > 3 ) + sEntry += "\""; + if ( sEntry == "\\\"" ) + sEntry = "\""; sEntry = sEntry.Convert( aCharSet, RTL_TEXTENCODING_MS_1252 ); InsertListEntry( sEntry, sOrig ); - if ( bMergeMode ) { + if ( bMergeMode && ( sEntry != "\"" )) { PrepareTextToMerge( sOrig, nList, nListLang, pResData ); } } |