From f9190ae607a5766a087b8ed5d7ac29ec8a3272c9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 26 Jul 2019 09:22:53 +0100 Subject: cid#1448362 silence Dereference null return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6b24a10bb2cd67d9750702a43d15162fb5347d76 Reviewed-on: https://gerrit.libreoffice.org/76366 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/source/ui/func/fupage.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sd/source/ui/func/fupage.cxx') diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index ac3512ad5165..ae543ff9464f 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -370,7 +370,9 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, SfxRequest& rReq) } // if the background for this page was set to invisible, the background-object has to be deleted, too. - if( ( pTempSet->GetItem( XATTR_FILLSTYLE )->GetValue() == drawing::FillStyle_NONE ) || + const XFillStyleItem* pTempFillStyleItem = pTempSet->GetItem(XATTR_FILLSTYLE); + assert(pTempFillStyleItem); + if( ( pTempFillStyleItem->GetValue() == drawing::FillStyle_NONE ) || ( ( pTempSet->GetItemState( XATTR_FILLSTYLE ) == SfxItemState::DEFAULT ) && ( aMergedAttr.GetItem( XATTR_FILLSTYLE )->GetValue() == drawing::FillStyle_NONE ) ) ) mbPageBckgrdDeleted = true; -- cgit