mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Null dereference

Browse Source 
Change-Id: Ifda10738a4d4d97ba62ae3fc8804638621b24686
Reviewed-on: https://gerrit.libreoffice.org/49638
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2018-02-13 11:46:02 +00:00
parent 6cb383da1b
commit 6af6382184
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lotuswordpro/source/filter/lwptablelayout.cxx
View File

@@ -819,7 +819,8 @@ void LwpTableLayout::Read()
*/ */
void LwpTableLayout::XFConvert(XFContentContainer* pCont) void LwpTableLayout::XFConvert(XFContentContainer* pCont)
{ {
if (!m_pXFTable)
throw std::runtime_error("missing table");
pCont->Add(m_pXFTable.get()); pCont->Add(m_pXFTable.get());
} }
/** /**
@@ -1141,8 +1142,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
} }
else else
{ {
//Hidden cell would not be in cellsmap throw std::runtime_error("Hidden cell would not be in cellsmap");
assert(false);
} }
} }
pCellList = dynamic_cast<LwpCellList*>(pCellList->GetNextID().obj().get()); pCellList = dynamic_cast<LwpCellList*>(pCellList->GetNextID().obj().get());
@@ -1152,7 +1152,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
} }
}catch (...) { }catch (...) {
assert(false); SAL_WARN("lwp", "bad PutCellVals");
} }
} }