Kaydet (Commit) 56b75441 authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz#4950 Direct-leak

Change-Id: I231da98d9e7f9fefc25a454cb9c8e1f95215c364
Reviewed-on: https://gerrit.libreoffice.org/47382Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e26f2f33
...@@ -1086,28 +1086,28 @@ void LwpGroupLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart ...@@ -1086,28 +1086,28 @@ void LwpGroupLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart
{ {
if(m_pFrame) if(m_pFrame)
{ {
XFFrame* pXFFrame = nullptr; rtl::Reference<XFFrame> xXFFrame;
if(nEnd < nStart) if(nEnd < nStart)
{ {
pXFFrame = new XFFrame(); xXFFrame.set(new XFFrame);
} }
else else
{ {
pXFFrame = new XFFloatFrame(nStart, nEnd, bAll); xXFFrame.set(new XFFloatFrame(nStart, nEnd, bAll));
} }
m_pFrame->Parse(pXFFrame, nStart); m_pFrame->Parse(xXFFrame.get(), nStart);
//add child frame into group //add child frame into group
LwpVirtualLayout* pLayout = dynamic_cast<LwpVirtualLayout*>(GetChildHead().obj().get()); LwpVirtualLayout* pLayout = dynamic_cast<LwpVirtualLayout*>(GetChildHead().obj().get());
while (pLayout && pLayout != this) while (pLayout && pLayout != this)
{ {
pLayout->DoXFConvert(pXFFrame); pLayout->DoXFConvert(xXFFrame.get());
pLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetNext().obj().get()); pLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetNext().obj().get());
} }
pCont ->Add(pXFFrame); pCont->Add(xXFFrame.get());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment