lotuswordpro/source/filter/lwpcelllayout.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 78e612e265a4b7853ed7be9ed015cff6f64154e5
Author: Caolán McNamara <caol...@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/20567
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 6b27d73..a587ec9 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
