summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/source/export.cxx19
1 files changed, 11 insertions, 8 deletions
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 38cd3ed5eb3f..ced58e3c473a 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1156,16 +1156,19 @@ void Export::MergeRest( ResData *pResData )
}
MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
- OString sText;
- bool bText = pEntrys && pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, true );
- if( bText && !sText.isEmpty())
+ if( pEntrys )
{
- ConvertMergeContent( sText );
- sLine =
- sLine.copy( 0 , sLine.indexOf('"') ) +
- sText +
- sLine.copy( sLine.lastIndexOf('"') + 1 );
+ OString sText;
+ pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, false );
+ if( !sText.isEmpty())
+ {
+ ConvertMergeContent( sText );
+ sLine =
+ sLine.copy( 0 , sLine.indexOf('"') ) +
+ sText +
+ sLine.copy( sLine.lastIndexOf('"') + 1 );
+ }
}
OString sText1( "\t" );