diff options
| author | Nils Fuhrmann <nf@openoffice.org> | 2001-08-29 12:16:38 +0000 |
|---|---|---|
| committer | Nils Fuhrmann <nf@openoffice.org> | 2001-08-29 12:16:38 +0000 |
| commit | 23f9aca7c3e9887fd5ccdbfb187029b81b63b3bd (patch) | |
| tree | 3e4f38900903911fc3e9599e8b61e3ae6e7664bc /transex3/source | |
| parent | 52e56441dda350fee3df8d4c75f084c4b5099d70 (diff) | |
Fixes for creation of StringList #87136#, Fallback is rev 1.21
Diffstat (limited to 'transex3/source')
| -rw-r--r-- | transex3/source/export.cxx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/transex3/source/export.cxx b/transex3/source/export.cxx index 98a315a15fcb..428cec58a89f 100644 --- a/transex3/source/export.cxx +++ b/transex3/source/export.cxx @@ -2,9 +2,9 @@ * * $RCSfile: export.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: nf $ $Date: 2001-08-29 11:50:41 $ + * last change: $Author: nf $ $Date: 2001-08-29 13:16:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2352,12 +2352,12 @@ void Export::MergeRest( ResData *pResData, USHORT nMode ) if ( bDefine || bNextMustBeDefineEOL ) { sHead += "= \\\n"; sHead += sSpace; - sHead += "\t{\\\n\t\t"; + sHead += "\t{\\\n\t"; } else { sHead += "= \n"; sHead += sSpace; - sHead += "\t{\n\t\t"; + sHead += "\t{\n\t"; } WriteToMerged( sHead ); } @@ -2367,13 +2367,15 @@ void Export::MergeRest( ResData *pResData, USHORT nMode ) if ( !sLine.Len()) sLine = sLastListLine; - if (( nT != 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 (( nT != LIST_UIENTRIES ) && + (( sLine.Search( "{" ) == STRING_NOTFOUND ) || + ( sLine.Search( "{" ) >= sLine.Search( "\"" ))) && + (( sLine.Search( "<" ) == STRING_NOTFOUND ) || + ( sLine.Search( "<" ) >= sLine.Search( "\"" )))) + { + sLine.SearchAndReplace( "\"", "< \"" ); + } } USHORT nStart, nEnd; |