From 539189a56045ae23cfaf2f4aaf20a00117d42dc6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 9 Jul 2020 10:15:35 +0100 Subject: cid#1448540 Dereference null return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic5692d2bf5be11881792d7dbfb00b11af927b5e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98416 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sw/source/uibase/uiview/viewtab.cxx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'sw') diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index b7f6e02dcc09..33dc8c268a3c 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -2416,14 +2416,17 @@ void SwView::StateTabWin(SfxItemSet& rSet) rSet.Put( SfxBoolItem(SID_ATTR_PAGE_HEADER, bHeaderOn ) ); if(bHeaderOn) { - const SvxLRSpaceItem* rLR = static_cast( + const SvxLRSpaceItem* pLR = static_cast( rHeader.GetHeaderFormat()->GetAttrSet().GetItem(SID_ATTR_LRSPACE)); - const SvxULSpaceItem* rUL = static_cast( + const SvxULSpaceItem* pUL = static_cast( rHeader.GetHeaderFormat()->GetAttrSet().GetItem(SID_ATTR_ULSPACE)); - SvxLongLRSpaceItem aLR(rLR->GetLeft(), rLR->GetRight(), SID_ATTR_PAGE_HEADER_LRMARGIN); - rSet.Put(aLR); - SvxLongULSpaceItem aUL( rUL->GetUpper(), rUL->GetLower(), SID_ATTR_PAGE_HEADER_SPACING); - rSet.Put(aUL); + if (pLR && pUL) + { + SvxLongLRSpaceItem aLR(pLR->GetLeft(), pLR->GetRight(), SID_ATTR_PAGE_HEADER_LRMARGIN); + rSet.Put(aLR); + SvxLongULSpaceItem aUL( pUL->GetUpper(), pUL->GetLower(), SID_ATTR_PAGE_HEADER_SPACING); + rSet.Put(aUL); + } bool bShared = !rDesc.IsHeaderShared(); bool bFirst = !rDesc.IsFirstShared(); // FIXME control changes for both header footer - tdf#100287 -- cgit