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

INTEGRATION: CWS mergem8 (1.30.2.1.18); FILE MERGED

Browse source 
2003/04/07 13:42:36 nf 1.30.2.1.18.1: #-i11961#
This commit is contained in:
Jens-Heiner Rechtien 2003-04-29 15:48:05 +00:00
parent 18ad4b1542
commit caa6f1c269
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
transex3/source/export.cxx
View file

@ -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 );
}
}