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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfribtable.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a579905319455629975c739885e9cc4ca69ba229
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Dec 9 12:23:11 2015 +0000

    protect against missing SuperTable
    
    Change-Id: I788ec28424bb638f727901b7d25e48a284ab67d0
    (cherry picked from commit 356109d4ead137ea22b358b20ed22a4bd09d35f6)
    Reviewed-on: https://gerrit.libreoffice.org/20509
    Reviewed-by: David Tardon <dtar...@redhat.com>
    Tested-by: David Tardon <dtar...@redhat.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>

diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx 
b/lotuswordpro/source/filter/lwpfribtable.cxx
index edd73da..4adb3ac 100644
--- a/lotuswordpro/source/filter/lwpfribtable.cxx
+++ b/lotuswordpro/source/filter/lwpfribtable.cxx
@@ -98,6 +98,8 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont)
 {
     XFContentContainer* pXFContentContainer = pCont;
     LwpSuperTableLayout* pSuper = GetSuperTable();
+    if (!pSuper)
+        return;
     sal_uInt8 nType = pSuper->GetRelativeType();
     LwpVirtualLayout* pContainer = pSuper->GetContainerLayout();
     if (!pContainer)

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits