Kaydet (Commit) 6af63821 authored tarafından Caolán McNamara's avatar Caolán McNamara

Null dereference

Change-Id: Ifda10738a4d4d97ba62ae3fc8804638621b24686
Reviewed-on: https://gerrit.libreoffice.org/49638Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 6cb383da
...@@ -819,7 +819,8 @@ void LwpTableLayout::Read() ...@@ -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) ...@@ -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) ...@@ -1152,7 +1152,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
} }
}catch (...) { }catch (...) {
assert(false); SAL_WARN("lwp", "bad PutCellVals");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment