summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-10 10:06:58 +0000
committerMichael Stahl <mstahl@redhat.com>2015-12-10 15:14:53 +0000
commit063488d1a0e530c74eac0ba0079811276a77a214 (patch)
tree3efab7018e5707201179c4e066012ea7a36ab2f0
parentprotect against missing Ruby Marker (diff)
downloadcore-063488d1a0e530c74eac0ba0079811276a77a214.tar.gz
core-063488d1a0e530c74eac0ba0079811276a77a214.zip
guard against missing table container
Change-Id: I11f6381374c7fc12374cd5089e581ddc777005e2 (cherry picked from commit c732a1ae8cc0cc94bfeddba243657a0b9e52a0f9) Reviewed-on: https://gerrit.libreoffice.org/20581 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--lotuswordpro/source/filter/lwptablelayout.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index e2edf492bda4..ecf37c44a5c1 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);