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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpbookmarkmgr.cxx |   29 +++++++++++---------------
 lotuswordpro/source/filter/lwpbookmarkmgr.hxx |    4 +--
 2 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 919ff229ff33b0b23b30ee963e9f96f46fe9e1a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 22 10:35:18 2018 +0000

    ofz#7063 ensure lifecycle
    
    Change-Id: I18d62bc3bd409ca65c85ea47e8d5b3930481edf9
    Reviewed-on: https://gerrit.libreoffice.org/51734
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
index bfec019fbfd4..19586f4cbe7c 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();
 }
 
diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.hxx b/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
index 6f471b7302b1..509a75ce7a91 100644
--- a/lotuswordpro/source/filter/lwpbookmarkmgr.hxx
+++ b/lotuswordpro/source/filter/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