diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2014-12-28 12:53:40 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-12-28 16:23:10 +0000 |
| commit | 06fac18f2379516fc4902d7a417951cb0ccd9e76 (patch) | |
| tree | 83451bd30d898a37033abe4a024de50a3f04abb0 | |
| parent | 8ef3727ea2cab81605913b866d8eaef341f26b00 (diff) | |
fdo#87754: duplicated strings in an ItemList are not translated
Change-Id: I72c6e234ff999a6dbed48cc62fe7d39aeb798f35
(cherry picked from commit 1471103be04a1bcf18002b5ddc7c9c0744655b2b)
Reviewed-on: https://gerrit.libreoffice.org/13682
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | l10ntools/source/export.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 3d0096d1b775..4586087ce396 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -1155,16 +1155,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" ); |