cui/source/dialogs/hltpbase.cxx | 2 +- writerfilter/source/dmapper/NumberingManager.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 1f6842a5afea1a41ef67b9ee78da9bf30c02ffff Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jul 9 10:11:58 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jul 9 14:48:28 2020 +0200 cid#1465230 Dereference null return value Change-Id: I494fc9e36324c1940dbc551c2c7d86df70f30711 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98414 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 63d3eb1738c1..f79f5644e710 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -382,7 +382,7 @@ HyperDialogEvent SvxHyperlinkTabPageBase::GetMacroEvents() const const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>( GetItemSet().GetItem (SID_HYPERLINK_GETLINK)); - return pHyperlinkItem->GetMacroEvents(); + return pHyperlinkItem ? pHyperlinkItem->GetMacroEvents() : HyperDialogEvent(); } SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable() commit c11ccaf57bad5d2aa12707abf26ae1fe8edcc4a5 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jul 9 10:10:03 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jul 9 14:48:01 2020 +0200 cid#1465231 Improper user of negative value Change-Id: I984ae1103152a396cd157c3721a3739455b95997 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98412 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index e5c813d819a5..c30a9a120bee 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -713,10 +713,10 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) break; case NS_ooxml::LN_CT_NumLvl_ilvl: //add a new level to the level vector and make it the current one - m_pCurrentDefinition->AddLevel(rVal.getString().toInt32()); + m_pCurrentDefinition->AddLevel(rVal.getString().toUInt32()); break; case NS_ooxml::LN_CT_Lvl_ilvl: - m_pCurrentDefinition->AddLevel(rVal.getString().toInt32()); + m_pCurrentDefinition->AddLevel(rVal.getString().toUInt32()); break; case NS_ooxml::LN_CT_AbstractNum_abstractNumId: { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
