summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-10 09:24:14 +0000
committerMichael Stahl <mstahl@redhat.com>2015-12-10 15:16:44 +0000
commitd4efdf7dd445ab532c3ddefbf68c648bdc0f4e00 (patch)
tree13f9dcc27fbb820ea94b612d9e1671a094edd70e
parentbee28cc24a864f6953dcda65df53e34fbc10cb6e (diff)
protect against missing Table Layout
Change-Id: Ie7f4cd2b411eb678642ea859d261b1b672752d94 (cherry picked from commit 08fe513b89ea5102a3a233ee0bac472dc8e6b219) Reviewed-on: https://gerrit.libreoffice.org/20568 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/lwpcelllayout.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 3f9632a9c62f..9fba0a192e35 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -121,8 +121,9 @@ LwpTable * LwpCellLayout::GetTable()
*/
void LwpCellLayout::SetCellMap()
{
- // this function is called from LwpTableLayout, so it can't be NULL
- GetTableLayout()->SetWordProCellMap(crowid, ccolid, this);
+ LwpTableLayout * pTableLayout = GetTableLayout();
+ if (pTableLayout)
+ pTableLayout->SetWordProCellMap(crowid, ccolid, this);
}
/**
* @short Get actual width of this cell layout