summaryrefslogtreecommitdiff
path: root/lotuswordpro/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-10 09:24:14 +0000
committerAndras Timar <andras.timar@collabora.com>2015-12-10 16:14:42 +0100
commit4e90b438937d18ea37b4d10c52fa0803893fd869 (patch)
treefc64998ad6da6e8d549660d952738f2fb1d71cbb /lotuswordpro/source
parent9069b159c9a17a9b33634038f5786211019586d5 (diff)
protect against missing Table Layout
Change-Id: Ie7f4cd2b411eb678642ea859d261b1b672752d94 (cherry picked from commit 08fe513b89ea5102a3a233ee0bac472dc8e6b219) Reviewed-on: https://gerrit.libreoffice.org/20567 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 78e612e265a4b7853ed7be9ed015cff6f64154e5)
Diffstat (limited to 'lotuswordpro/source')
-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 6b27d73667fd..a587ec91febe 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