diff options
| -rw-r--r-- | lotuswordpro/inc/lwpbookmarkmgr.hxx | 4 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/lwpbookmarkmgr.cxx | 29 |
2 files changed, 15 insertions, 18 deletions
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(); } |