lotuswordpro/source/filter/lwptablelayout.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 063488d1a0e530c74eac0ba0079811276a77a214
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Dec 10 10:06:58 2015 +0000
guard against missing table container
Change-Id: I11f6381374c7fc12374cd5089e581ddc777005e2
(cherry picked from commit c732a1ae8cc0cc94bfeddba243657a0b9e52a0f9)
Reviewed-on: https://gerrit.libreoffice.org/20581
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index e2edf49..ecf37c4 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -719,7 +719,7 @@ void LwpTableLayout::RegisterStyle()
// If the table is not "with paragraph above" placement, create an frame
style
// by supertable layout
if ( LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType
- && !pSuper->GetContainerLayout()->IsCell())
+ && (!pSuper->GetContainerLayout() ||
!pSuper->GetContainerLayout()->IsCell()) )
{
//with para above
// pSuper->ApplyBackColor(pTableStyle);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
