commit 717e0853dce50c33b61ea8541d24186e40e84c73
author Caolán McNamara <caolanm@redhat.com> Thu Mar 22 10:35:18 2018 +0000
committer Michael Stahl <Michael.Stahl@cib.de> Wed Apr 04 17:04:27 2018 +0200
tree 49546a1c5bb24558a066ec6fc46d7637d43a0486
parent 30f57a9e59fd35e872ae9d8ddd7b319e467abb74

ofz#7063 ensure lifecycle

Change-Id: I18d62bc3bd409ca65c85ea47e8d5b3930481edf9
Reviewed-on: https://gerrit.libreoffice.org/51732
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

lotuswordpro/inc/lwpbookmarkmgr.hxx

diff --git a/lotuswordpro/inc/lwpbookmarkmgr.hxx b/lotuswordpro/inc/lwpbookmarkmgr.hxx
index 08ea7e3..926d4e3 100644
--- a/lotuswordpro/inc/lwpbookmarkmgr.hxx
+++ b/lotuswordpro/inc/lwpbookmarkmgr.hxx
@@ -75,8 +75,8 @@ public:
    ~LwpBookmarkMgr();
    LwpBookmarkMgr();
private:
    std::map<OUString,XFBookmarkStart*> m_MapStart;
    std::map<OUString,XFBookmarkEnd*> m_MapEnd;
    std::map<OUString, rtl::Reference<XFBookmarkStart>> m_MapStart;
    std::map<OUString, rtl::Reference<XFBookmarkEnd>> m_MapEnd;
};

#endif

lotuswordpro/source/filter/lwpbookmarkmgr.cxx

diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
index fdfed20..3ce1ef0 100644
--- a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
+++ b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
@@ -57,44 +57,41 @@

void LwpBookmarkMgr::AddXFBookmarkStart(const OUString& sName,XFBookmarkStart* pMark)
{
    std::map<OUString,XFBookmarkStart*>::iterator iter;
    iter = m_MapStart.find(sName);
    auto iter = m_MapStart.find(sName);
    if (iter == m_MapStart.end())//not find
    {
        m_MapStart[sName] = pMark;
    }
    else //have exist the same bookmark name
    {
        XFBookmarkStart* pFind = iter->second;
        OUString totalName = pFind->GetDivision() + ":";
        totalName += pFind->GetName();
        pFind->SetName(totalName);
        m_MapStart[totalName] = pFind;
        auto xFind = iter->second;
        OUString totalName = xFind->GetDivision() + ":";
        totalName += xFind->GetName();
        xFind->SetName(totalName);
        m_MapStart[totalName] = xFind;
        m_MapStart[sName] = pMark;
    }
}
void LwpBookmarkMgr::AddXFBookmarkEnd(const OUString& sName,XFBookmarkEnd* pMark)
{
    std::map<OUString,XFBookmarkEnd*>::iterator iter;
    iter = m_MapEnd.find(sName);
    auto iter = m_MapEnd.find(sName);
    if (iter == m_MapEnd.end())//not find
    {
        m_MapEnd[sName] = pMark;
    }
    else //have exist the same bookmark name
    {
        XFBookmarkEnd* pFind = iter->second;
        OUString totalName = pFind->GetDivision() + ":";
        totalName += pFind->GetName();
        pFind->SetName(totalName);
        m_MapEnd[totalName] = pFind;
        auto xFind = iter->second;
        OUString totalName = xFind->GetDivision() + ":";
        totalName += xFind->GetName();
        xFind->SetName(totalName);
        m_MapEnd[totalName] = xFind;
        m_MapEnd[sName] = pMark;
    }
}
bool LwpBookmarkMgr::FindBookmark(const OUString& sName)
{
    std::map<OUString,XFBookmarkStart*>::iterator iter;
    iter = m_MapStart.find(sName);
    auto iter = m_MapStart.find(sName);
    return iter != m_MapStart.end();
}