[Libreoffice-commits] .: l10ntools/source

[Libreoffice Gerrit user]

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

New commits:
commit cd8948d1fd4430bc4186b3525eaec7d531da3fb2
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Dec 9 18:38:42 2012 +0100

    Make sure all list item is stored
    
    Change-Id: Idf73871086dd7a3be7371506c034ec7af48d1642

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 471ac10..8fb78e3 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1473,6 +1473,13 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
                 pResData->sGId = pResData->sGId + rtl::OString('.');
             pResData->sGId = pResData->sGId + sOldId;
             nTyp = STRING_TYP_TEXT;
+            if (rLangIndex == "en-US")
+            {
+                aOrigListItems.insert(
+                    std::pair<OString,OString>(
+                        pResData->sId + pResData->sGId + pResData->sResTyp,
+                        rText.copy(nStart+1,nEnd-nStart-1)));
+            }
         }
         break;
         case STRING_TYP_TEXT :
@@ -1531,7 +1538,6 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
     }
 
     PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
-    const OString sKey = pResData->sId + pResData->sGId + pResData->sResTyp;
     pResData->sId = sOldId;
     pResData->sGId = sOldGId;
     pResData->sResTyp = sOldTyp;
@@ -1549,9 +1555,6 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
         return sal_False; // no data found
     }
 
-    if (rLangIndex == "en-US")
-        aOrigListItems.insert(std::pair<OString,OString>(sKey,rText.copy(nStart+1,nEnd-nStart-1)));
-
     if (Export::isSourceLanguage(rLangIndex))
         return sal_False;