ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

cid#1448540 Dereference null return value

Browse Source 
Change-Id: I72fd7c1a38cb870d99ee085f4f511f2fb9d8d7af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152343
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2023-05-27 22:17:19 +02:00
parent fc1eb075a5
commit 20873f073a
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/source/uibase/uiview/viewtab.cxx
+11 -8
View File
@@ -2467,15 +2467,18 @@ void SwView::StateTabWin(SfxItemSet& rSet)
const SwFormatFooter& rFooter = rDesc.GetMaster().GetFooter();
bool bFooterOn = rFooter.IsActive();
rSet.Put( SfxBoolItem(SID_ATTR_PAGE_FOOTER, bFooterOn ) );
if(bFooterOn)
if (bFooterOn)
{
const SvxLRSpaceItem* rLR = rFooter.GetFooterFormat()->GetAttrSet().GetItem<SvxLRSpaceItem>(SID_ATTR_LRSPACE);
const SvxULSpaceItem* rUL = rFooter.GetFooterFormat()->GetAttrSet().GetItem<SvxULSpaceItem>(SID_ATTR_ULSPACE);
SvxLongLRSpaceItem aLR(rLR->GetLeft(), rLR->GetRight(), SID_ATTR_PAGE_FOOTER_LRMARGIN);
rSet.Put(aLR);
SvxLongULSpaceItem aUL( rUL->GetUpper(), rUL->GetLower(), SID_ATTR_PAGE_FOOTER_SPACING);
rSet.Put(aUL);
if (const SvxLRSpaceItem* rLR = rFooter.GetFooterFormat()->GetAttrSet().GetItem<SvxLRSpaceItem>(SID_ATTR_LRSPACE))
{
SvxLongLRSpaceItem aLR(rLR->GetLeft(), rLR->GetRight(), SID_ATTR_PAGE_FOOTER_LRMARGIN);
rSet.Put(aLR);
}
if (const SvxULSpaceItem* rUL = rFooter.GetFooterFormat()->GetAttrSet().GetItem<SvxULSpaceItem>(SID_ATTR_ULSPACE))
{
SvxLongULSpaceItem aUL( rUL->GetUpper(), rUL->GetLower(), SID_ATTR_PAGE_FOOTER_SPACING);
rSet.Put(aUL);
}
bool bShared = !rDesc.IsFooterShared();
bool bFirst = !rDesc.IsFirstShared(); // FIXME control changes for both header footer - tdf#100287
sal_uInt16 nLayout = (static_cast<int>(bShared)<<1) + static_cast<int>(bFirst);