diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 17:46:53 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 17:47:21 +0200 |
commit | 608a67ac73a14a563c5f7692d4ca5de28777f290 (patch) | |
tree | 74bb9b5ebd32135090057b594a1046fc7ece15a0 /lotuswordpro/source/filter/lwpgrfobj.cxx | |
parent | Dead code (diff) | |
download | core-608a67ac73a14a563c5f7692d4ca5de28777f290.tar.gz core-608a67ac73a14a563c5f7692d4ca5de28777f290.zip |
Fix memory leaks, by refcounting XFContent
Change-Id: I8c94c63230eec13bf22043ff07f9f480a0463111
Diffstat (limited to 'lotuswordpro/source/filter/lwpgrfobj.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpgrfobj.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 6e884626aaf7..7ec84d640ec5 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -197,15 +197,15 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) { if ((m_sServerContextFormat[1]=='s'&&m_sServerContextFormat[2]=='d'&&m_sServerContextFormat[3]=='w')) { - std::vector <XFFrame*>::iterator iter; + std::vector< rtl::Reference<XFFrame> >::iterator iter; for (iter = m_vXFDrawObjects.begin(); iter != m_vXFDrawObjects.end(); ++iter) { - pCont->Add(*iter); + pCont->Add(iter->get()); } } else if (this->IsGrafFormatValid()) { - XFImage* pImage = static_cast<XFImage*>(m_vXFDrawObjects.front()); + XFImage* pImage = static_cast<XFImage*>(m_vXFDrawObjects.front().get()); if (m_bIsLinked) { @@ -438,7 +438,7 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData) */ void LwpGraphicObject::CreateGrafObject() { - XFImage* pImage = new XFImage(); + rtl::Reference<XFImage> pImage = new XFImage(); // set image processing styles XFImageStyle* pImageStyle = new XFImageStyle(); @@ -660,7 +660,7 @@ void LwpGraphicObject::CreateGrafObject() } // insert image object into array - m_vXFDrawObjects.push_back(pImage); + m_vXFDrawObjects.push_back(pImage.get()); } |