lotuswordpro/source/filter/lwpcelllayout.cxx | 4 +++- lotuswordpro/source/filter/lwprowlayout.cxx | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit b88037b6c893ca93abb120cfda76f52ac0147ee4 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Dec 10 09:49:07 2015 +0000 guard against missing table layout (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> (cherry picked from commit 4bc26e006dd4bde95eef706de43228679a41c4f7) Change-Id: I4bc7a7283f63124ccb50957ea64791644e01e267 Reviewed-on: https://gerrit.libreoffice.org/20578 Reviewed-by: David Tardon <dtar...@redhat.com> Tested-by: David Tardon <dtar...@redhat.com> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index 39717cd..3f9632a 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -695,8 +695,10 @@ LwpConnectedCellLayout::~LwpConnectedCellLayout() */ 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 e7bae0f..1f8265e 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -366,11 +366,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 = NULL; - LwpTableLayout* pTableLayout = GetParentTableLayout(); + XFCell * pCell = nullptr; 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