[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - l10ntools/source

[Zolnai Tamás]

 l10ntools/source/export.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 4774b2f0e6a0e895d1e63256147eaff59efd0eda
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Dec 28 12:53:40 2014 +0100

    fdo#87754: duplicated strings in an ItemList are not translated
    
    Change-Id: I72c6e234ff999a6dbed48cc62fe7d39aeb798f35
    (cherry picked from commit 1471103be04a1bcf18002b5ddc7c9c0744655b2b)
    Reviewed-on: https://gerrit.libreoffice.org/13680
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 38cd3ed..ced58e3 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" );