summaryrefslogtreecommitdiff
path: root/transex3
diff options
context:
space:
mode:
authorNils Fuhrmann <nf@openoffice.org>2001-08-29 13:13:57 +0000
committerNils Fuhrmann <nf@openoffice.org>2001-08-29 13:13:57 +0000
commitcb60d831f510ae0b7b83859f82170019f05240f2 (patch)
treedef3da7402a2e59217434913b61b7999bfa58b16 /transex3
parent9e20c6e06069609af9c3513123ddd04e0debaaff (diff)
Fixes for creation of StringList #87136#, Fallback is rev 1.21
Diffstat (limited to 'transex3')
-rw-r--r--transex3/source/export.cxx20
1 files changed, 11 insertions, 9 deletions
diff --git a/transex3/source/export.cxx b/transex3/source/export.cxx
index 428cec58a89f..9c468194df31 100644
--- a/transex3/source/export.cxx
+++ b/transex3/source/export.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: export.cxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: nf $ $Date: 2001-08-29 13:16:38 $
+ * last change: $Author: nf $ $Date: 2001-08-29 14:13:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2448,13 +2448,15 @@ void Export::MergeRest( ResData *pResData, USHORT nMode )
if ( !sLine.Len())
sLine = sLastListLine;
- if (( nList != LIST_UIENTRIES ) &&
- (( sLine.Search( "{" ) == STRING_NOTFOUND ) ||
- ( sLine.Search( "{" ) >= sLine.Search( "\"" ))) &&
- (( sLine.Search( "<" ) == STRING_NOTFOUND ) ||
- ( sLine.Search( "<" ) >= sLine.Search( "\"" ))))
- {
- sLine.SearchAndReplace( "\"", "< \"" );
+ if ( sLastListLine.Search( "<" ) != STRING_NOTFOUND ) {
+ if (( nList != LIST_UIENTRIES ) &&
+ (( sLine.Search( "{" ) == STRING_NOTFOUND ) ||
+ ( sLine.Search( "{" ) >= sLine.Search( "\"" ))) &&
+ (( sLine.Search( "<" ) == STRING_NOTFOUND ) ||
+ ( sLine.Search( "<" ) >= sLine.Search( "\"" ))))
+ {
+ sLine.SearchAndReplace( "\"", "< \"" );
+ }
}
while( PrepareTextToMerge( sLine, nList, nListLang, pResData ) && ( nListIndex < nMaxIndex )) {
ByteString sText( "\t" );