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

[Libreoffice Gerrit user]

 l10ntools/source/po.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a97bf2e3bc43a709eb72bdc695f96aeecf1174b1
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Dec 23 03:51:17 2012 +0100

    fdo#58673 Generate the same keyid for pots as for merge
    
    Change-Id: I65c71d22570c62c84d359b12aa5375016be1f69a

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index cdc2c98..06530a3 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -432,14 +432,14 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType)
     /*Default case is unneeded because the type of eType has
       only three element*/
     }
-    m_pGenPo->setExtractCom(
-        ( !vParts[HELPTEXT].isEmpty() ?  vParts[HELPTEXT] + "\n" : OString( "" )) +
-        lcl_GenKeyId(
-            vParts[SOURCEFILE] + sMsgCtxt + vParts[eType] ) );
     m_pGenPo->setMsgCtxt(sMsgCtxt);
     m_pGenPo->setMsgId(
         lcl_UnEscapeSDFText(
             vParts[eType],vParts[SOURCEFILE].endsWith(".xhp")));
+    m_pGenPo->setExtractCom(
+        ( !vParts[HELPTEXT].isEmpty() ?  vParts[HELPTEXT] + "\n" : OString( "" )) +
+        lcl_GenKeyId(
+            m_pGenPo->getReference() + sMsgCtxt + m_pGenPo->getMsgId() ) );
     m_bIsInitialized = true;
 }