lotuswordpro/source/filter/lwptoc.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 932c74e38ca397d82d609831e79ceaef2183cf64
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Dec 27 20:18:08 2015 +0000
guard against missing Container Layout
Change-Id: Ie43b13448a6cacd3af4822b85f06ed84a2d38ff9
diff --git a/lotuswordpro/source/filter/lwptoc.cxx
b/lotuswordpro/source/filter/lwptoc.cxx
index ba6d775..27ab9e3 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -282,7 +282,10 @@ void
LwpTocSuperLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nSt
XFContentContainer * pTableContainer = pXFFrame;
// if *this is a TOCSuperTableLayout and it's located in a cell
// add the frame to upper level and add TOCSuperTableLayout into
the frame
- if ( GetContainerLayout()->IsCell() )
+ rtl::Reference<LwpVirtualLayout> xContainer(GetContainerLayout());
+ if (!xContainer.is())
+ return;
+ if (xContainer->IsCell())
{
pTableContainer = pCont; // TOC contain table directly
pXFFrame->Add(pCont);
@@ -291,7 +294,7 @@ void LwpTocSuperLayout::XFConvertFrame(XFContentContainer*
pCont, sal_Int32 nSt
else
{
//add frame to the container
- pCont ->Add(pXFFrame);
+ pCont->Add(pXFFrame);
}
pTableLayout->XFConvert(pTableContainer);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
