Kaydet (Commit) 3071ba2a authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz#4917 Direct-leak

Change-Id: Ia8fdd63e1944055a264549b1ff2272b02f32ef42
Reviewed-on: https://gerrit.libreoffice.org/47327Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst b21c8faf
......@@ -816,29 +816,29 @@ void LwpFrameLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart
{
if(m_pFrame)
{
XFFrame* pXFFrame = nullptr;
rtl::Reference<XFFrame> xXFFrame;
if(nEnd < nStart)
{
pXFFrame = new XFFrame();
xXFFrame.set(new XFFrame);
}
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);
//if it is a link frame, parse contents only once
if(!HasPreviousLinkLayout())
{
rtl::Reference<LwpObject> content = m_Content.obj();
if (content.is())
{
content->DoXFConvert(pXFFrame);
content->DoXFConvert(xXFFrame.get());
//set frame size according to ole size
ApplyGraphicSize(pXFFrame);
ApplyGraphicSize(xXFFrame.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