diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-27 20:18:08 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-01 22:21:33 +0100 |
| commit | 8699eb32236760f1b1dc4a0b2d18682ddcfcb812 (patch) | |
| tree | 4493abdfdfcb7e589bdb51b3d5a27825c4a34f05 | |
| parent | 3b9721ba491036218434cc7c4c09fc2d712cedf0 (diff) | |
guard against missing Container Layout
Change-Id: Ie43b13448a6cacd3af4822b85f06ed84a2d38ff9
(cherry picked from commit 932c74e38ca397d82d609831e79ceaef2183cf64)
(cherry picked from commit 1b2015281ee34f187fdb747db5f6223e8de63df4)
Reviewed-on: https://gerrit.libreoffice.org/20968
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 7f4fcdbda41753c7923974c0af58271e38cdabe3)
| -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 35b6a255f9ed..7162275e166e 100644 --- a/lotuswordpro/source/filter/lwptoc.cxx +++ b/lotuswordpro/source/filter/lwptoc.cxx @@ -278,7 +278,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); @@ -287,7 +290,7 @@ void LwpTocSuperLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nSt else { //add frame to the container - pCont ->Add(pXFFrame); + pCont->Add(pXFFrame); } pTableLayout->XFConvert(pTableContainer); } |