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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 64fdc60c947c96b81a8edbdfcc6405a8f3a139ef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 13 16:22:35 2015 +0000

    guard against no container layout
    
    Change-Id: If615c68bfaf145d81dab96b05e7b903c1a6b03cf
    (cherry picked from commit c6a2df4061de028eb9d7fb752051ecb9f1621fef)

diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 4857e94..c92171e 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -243,6 +243,9 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
     // add TOC content
     LwpSuperTableLayout::XFConvert(pToc);
 
+    if (!GetContainerLayout())
+        return;
+
     // if current TOC is located in a cell, we must add a frame between upper level container and TOC
     if ( !GetContainerLayout()->IsCell() )
     {