[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source
Caolán McNamara
caolanm at redhat.com
Thu Dec 10 07:17:11 PST 2015
lotuswordpro/source/filter/lwpcelllayout.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit d4efdf7dd445ab532c3ddefbf68c648bdc0f4e00
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 10 09:24:14 2015 +0000
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 at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 3f9632a..9fba0a1 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
More information about the Libreoffice-commits
mailing list