[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7f4fcdbda41753c7923974c0af58271e38cdabe3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 27 20:18:08 2015 +0000

    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 at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index ce2c239..ec6cb5e 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -287,7 +287,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);
@@ -296,7 +299,7 @@ void  LwpTocSuperLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nSt
             else
             {
                 //add frame to the container
-                pCont ->Add(pXFFrame);
+                pCont->Add(pXFFrame);
             }
             pTableLayout->XFConvert(pTableContainer);
         }