lotuswordpro/source/filter/lwpcelllayout.cxx | 3 +++
lotuswordpro/source/filter/lwprowlayout.cxx | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 4bc26e006dd4bde95eef706de43228679a41c4f7
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Dec 10 09:49:07 2015 +0000
guard against missing table layout
Change-Id: I4bc7a7283f63124ccb50957ea64791644e01e267
(cherry picked from commit 0c876483d278e3e5ba43e9eaf40ca713b6099703)
Reviewed-on: https://gerrit.libreoffice.org/20576
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index abe2c02..3848cb6 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -696,6 +696,9 @@ void LwpConnectedCellLayout::SetCellMap()
{
// this function is called from LwpTableLayout, so it can't be NULL
LwpTableLayout * pTableLayout = GetTableLayout();
+ if (!pTableLayout)
+ return;
+
sal_uInt16 nRowSpan = m_nRealrowspan;
for (sal_uInt16 iLoop = 0; iLoop < nRowSpan; iLoop ++)
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx
b/lotuswordpro/source/filter/lwprowlayout.cxx
index 507a849..906c09c 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -363,11 +363,14 @@ sal_uInt16 LwpRowLayout::GetCurMaxSpannedRows(sal_uInt8
nStartCol,sal_uInt8 nEnd
*/
void LwpRowLayout::ConvertCommonRow(XFTable* pXFTable,sal_uInt8
nStartCol,sal_uInt8 nEndCol)
{
+ LwpTableLayout* pTableLayout = GetParentTableLayout();
+ if (!pTableLayout)
+ return;
+
XFRow* pRow = new XFRow;
pRow->SetStyleName(m_StyleName);
XFCell * pCell = nullptr;
- LwpTableLayout* pTableLayout = GetParentTableLayout();
LwpTable* pTable = pTableLayout->GetTable();
sal_uInt8 nCellStartCol,nCellEndCol;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
