summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-10 10:06:58 +0000
committerAndras Timar <andras.timar@collabora.com>2016-03-01 22:17:14 +0100
commita4fafa7a6fed51d6eaad5170fe0c4ed16e9cae6d (patch)
treef9214228e489a5a5f62b33f08f991b0c3e184650
parentf5a8ff1353cc09950ba4bfb1b41fb245e99a7c03 (diff)
guard against missing table container
Change-Id: I11f6381374c7fc12374cd5089e581ddc777005e2 (cherry picked from commit c732a1ae8cc0cc94bfeddba243657a0b9e52a0f9) Reviewed-on: https://gerrit.libreoffice.org/20580 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b54e5c8154edaae9b553cfa7d3c0141c1d4ccce1)
-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 90897ad92c37..8c5b7fa6c861 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);