sc/source/ui/view/drawvie3.cxx | 6 ++++-- sd/source/ui/view/drviews7.cxx | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit e1042be85252483dc33efb0f35ac267ac24ecf67 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Jul 22 11:33:19 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Jul 22 16:25:39 2019 +0200 cid#1448269 Dereference null return value Change-Id: Ief2dfb8a87030d992a867a7a9014d3787e201831 Reviewed-on: https://gerrit.libreoffice.org/76111 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 801a70d2042a..f69c566021f2 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1698,7 +1698,11 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet ) rSet.Put(aPageItem); const SfxItemSet &rPageAttr = pPage->getSdrPageProperties().GetItemSet(); - drawing::FillStyle eXFS = rPageAttr.GetItem( XATTR_FILLSTYLE )->GetValue(); + const XFillStyleItem* pFillStyle = rPageAttr.GetItem(XATTR_FILLSTYLE); + if (!pFillStyle) + return; + + drawing::FillStyle eXFS = pFillStyle->GetValue(); XFillStyleItem aFillStyleItem( eXFS ); aFillStyleItem.SetWhich( SID_ATTR_PAGE_FILLSTYLE ); rSet.Put(aFillStyleItem); commit 11a99e0efebe621691aa54ab07844aa22a2ad283 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Jul 22 11:47:19 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Jul 22 16:25:26 2019 +0200 cid#1448325 Dereference after null check Change-Id: I7ca6b442f9aadaeb6debe7806e30693aa06b90ff Reviewed-on: https://gerrit.libreoffice.org/76114 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index a1b02bdc265f..0753335864b7 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -101,10 +101,12 @@ void ScDrawView::SetCellAnchored(bool bResizeWithCell) EndUndo(); if ( pViewData ) + { pViewData->GetDocShell()->SetDrawModified(); - // Set the anchor object. - AddCustomHdl(); + // Set the anchor object. + AddCustomHdl(); + } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits