diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-02-10 17:22:47 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-11 22:24:07 +0100 |
commit | 093e8c083d666001eef9dd423f832ab29dbb60b5 (patch) | |
tree | b6ce9ce30026106eedf0e89dbf3db583a6e1bde8 /lotuswordpro | |
parent | 0428340f9ce0f033391ceb23c6f3aecad981c950 (diff) |
ofz: leak
Change-Id: I15789e62c9fcdf518906a7e11e133fdd5d8ee62c
Reviewed-on: https://gerrit.libreoffice.org/49563
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwpfribtable.cxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwppara.cxx | 23 |
2 files changed, 14 insertions, 15 deletions
diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx index f675fd77e5d1..0bfa7d6b7485 100644 --- a/lotuswordpro/source/filter/lwpfribtable.cxx +++ b/lotuswordpro/source/filter/lwpfribtable.cxx @@ -87,10 +87,10 @@ void LwpFribTable::RegisterNewStyle() m_StyleName = pOldStyle->GetStyleName(); else { - XFParaStyle* pParaStyle = new XFParaStyle; - *pParaStyle = *pOldStyle; + std::unique_ptr<XFParaStyle> xParaStyle(new XFParaStyle); + *xParaStyle = *pOldStyle; XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - m_StyleName = pXFStyleManager->AddStyle(pParaStyle).m_pStyle->GetStyleName(); + m_StyleName = pXFStyleManager->AddStyle(xParaStyle.release()).m_pStyle->GetStyleName(); } } } diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index 56d3100d7c14..b078e3a054d0 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -255,9 +255,8 @@ void LwpPara::XFConvert(XFContentContainer* pCont) AddBreakBefore(pCont); //Create an XFPara for this VO_PARA - XFParagraph *pPara = new XFParagraph; - rtl::Reference<XFContentContainer> xHolder(pPara); - pPara->SetStyleName(m_StyleName); + rtl::Reference<XFParagraph> xPara(new XFParagraph); + xPara->SetStyleName(m_StyleName); if(!m_SectionStyleName.isEmpty()) { @@ -272,7 +271,7 @@ void LwpPara::XFConvert(XFContentContainer* pCont) rtl::Reference<XFContentContainer> xListItem = AddBulletList(m_xXFContainer.get()); if (xListItem) { - xListItem->Add(pPara); + xListItem->Add(xPara.get()); } } else if (m_xXFContainer) @@ -283,10 +282,10 @@ void LwpPara::XFConvert(XFContentContainer* pCont) pBulletStyleMgr->SetCurrentSilverBullet(LwpObjectID()); pBulletStyleMgr->SetContinueFlag(false); } - m_xXFContainer->Add(pPara); + m_xXFContainer->Add(xPara.get()); } - m_Fribs.SetXFPara(pPara); + m_Fribs.SetXFPara(xPara.get()); m_Fribs.XFConvert(); if (m_pBreaks && m_xXFContainer) @@ -308,14 +307,14 @@ void LwpPara::RegisterMasterPage(XFParaStyle const * pBaseStyle) } //register master page style - XFParaStyle* pOverStyle = new XFParaStyle(); - *pOverStyle = *pBaseStyle; - pOverStyle->SetStyleName( ""); - pOverStyle->SetMasterPage(pLayout->GetStyleName()); + std::unique_ptr<XFParaStyle> xOverStyle(new XFParaStyle); + *xOverStyle = *pBaseStyle; + xOverStyle->SetStyleName( ""); + xOverStyle->SetMasterPage(pLayout->GetStyleName()); if (!m_ParentStyleName.isEmpty()) - pOverStyle->SetParentStyleName(m_ParentStyleName); + xOverStyle->SetParentStyleName(m_ParentStyleName); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - m_StyleName = pXFStyleManager->AddStyle(pOverStyle).m_pStyle->GetStyleName(); + m_StyleName = pXFStyleManager->AddStyle(xOverStyle.release()).m_pStyle->GetStyleName(); } } /** |