From 4829542997ddd3f32a834b460a077bbe2ffbdf95 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 22 Mar 2018 10:35:18 +0000
Subject: ofz#7063 ensure lifecycle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I18d62bc3bd409ca65c85ea47e8d5b3930481edf9
Reviewed-on: https://gerrit.libreoffice.org/51731
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 lotuswordpro/inc/lwpbookmarkmgr.hxx           |  4 ++--
 lotuswordpro/source/filter/lwpbookmarkmgr.cxx | 29 ++++++++++++---------------
 2 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'lotuswordpro')

diff --git a/lotuswordpro/inc/lwpbookmarkmgr.hxx b/lotuswordpro/inc/lwpbookmarkmgr.hxx
index 08ea7e35c803..926d4e391934 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
diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx
index fdfed20edf6c..3ce1ef05355e 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();
 }
 
-- 
cgit v1.2.3