From 6af638218496e6af93b3a0cf7f17768421e96903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 13 Feb 2018 11:46:02 +0000 Subject: [PATCH] Null dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifda10738a4d4d97ba62ae3fc8804638621b24686 Reviewed-on: https://gerrit.libreoffice.org/49638 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- lotuswordpro/source/filter/lwptablelayout.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 9da4852c1398..78d166574959 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -819,7 +819,8 @@ void LwpTableLayout::Read() */ void LwpTableLayout::XFConvert(XFContentContainer* pCont) { - + if (!m_pXFTable) + throw std::runtime_error("missing table"); pCont->Add(m_pXFTable.get()); } /** @@ -1141,8 +1142,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID) } else { - //Hidden cell would not be in cellsmap - assert(false); + throw std::runtime_error("Hidden cell would not be in cellsmap"); } } pCellList = dynamic_cast(pCellList->GetNextID().obj().get()); @@ -1152,7 +1152,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID) } }catch (...) { - assert(false); + SAL_WARN("lwp", "bad PutCellVals"); } }