commit a97bf2e3bc43a709eb72bdc695f96aeecf1174b1
author Zolnai Tamás <zolnaitamas2000@gmail.com> Sun Dec 23 03:51:17 2012 +0100
committer Andras Timar <atimar@suse.com> Wed Dec 26 11:13:09 2012 +0100
tree 523bb026970e40bb08bbf47470059fb1e33ec1ac
parent 19accd583bea496e0f1ccbbb2669edd17fc1db8b

fdo#58673 Generate the same keyid for pots as for merge

Change-Id: I65c71d22570c62c84d359b12aa5375016be1f69a

l10ntools/source/po.cxx

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;
}