diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-12-27 20:18:08 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-27 20:20:11 +0000 |
commit | 1b2015281ee34f187fdb747db5f6223e8de63df4 (patch) | |
tree | 65079a7f25e199c78a41f2ece521645654139493 /lotuswordpro | |
parent | 5ae038d2341e4a7f8dedb77be75efd557d01bcc9 (diff) |
guard against missing Container Layout
Change-Id: Ie43b13448a6cacd3af4822b85f06ed84a2d38ff9
(cherry picked from commit 932c74e38ca397d82d609831e79ceaef2183cf64)
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwptoc.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx index ba6d77555a81..27ab9e326bc0 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); } |