Change-Id: I01c7ebf10831a27eaab55c2082cbe0a0f28bda1f
This commit is contained in:
Caolán McNamara 2017-03-02 11:51:30 +00:00
parent 7d2ec4c013
commit d6ac6475a5

View File

@ -381,25 +381,25 @@ void LwpSuperTableLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 n
{
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, static_cast<sal_uInt16>(nStart));
m_pFrame->Parse(xXFFrame.get(), static_cast<sal_uInt16>(nStart));
//parse table, and add table to frame
LwpTableLayout * pTableLayout = GetTableLayout();
if (pTableLayout)
{
pTableLayout->XFConvert(pXFFrame);
pTableLayout->XFConvert(xXFFrame.get());
}
//add frame to the container
pCont ->Add(pXFFrame);
pCont->Add(xXFFrame.get());
}
}