sw/source/ui/misc/glossary.cxx | 6 +++---
sw/source/ui/misc/num.cxx | 5 ++---
sw/source/ui/misc/pgfnote.cxx | 16 +++++++---------
sw/source/ui/misc/pggrid.cxx | 7 +++----
sw/source/ui/misc/titlepage.cxx | 7 +++----
5 files changed, 18 insertions(+), 23 deletions(-)
New commits:
commit d07cb9eccd7ae0a24e352906578d5c514ff3bc1d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Mar 9 16:51:29 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Mar 9 18:21:05 2022 +0100
use SfxItemSet::GetItemIfSet in sw/.../ui/misc
Change-Id: Icf83de0ca3f0bef20d73f65d0d540a222f1edbe2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131260
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 5a798c9958d5..293861d880c1 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -545,14 +545,14 @@ IMPL_LINK(SwGlossaryDlg, MenuHdl, const OString&,
rItemIdent, void)
aSet.Put( aItem );
aSet.Put( SwMacroAssignDlg::AddEvents( MACASSGN_AUTOTEXT ) );
- const SfxPoolItem* pItem;
+ const SvxMacroItem* pMacroItem;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractDialog>
pMacroDlg(pFact->CreateEventConfigDialog(m_xDialog.get(), aSet,
m_pShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface()
));
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK &&
- SfxItemState::SET == pMacroDlg->GetOutputItemSet()->GetItemState(
RES_FRMMACRO, false, &pItem ) )
+ (pMacroItem = pMacroDlg->GetOutputItemSet()->GetItemIfSet(
RES_FRMMACRO, false )) )
{
- const SvxMacroTableDtor& rTable = static_cast<const
SvxMacroItem*>(pItem)->GetMacroTable();
+ const SvxMacroTableDtor& rTable = pMacroItem->GetMacroTable();
m_pGlossaryHdl->SetMacros( m_xShortNameEdit->get_text(),
rTable.Get(
SvMacroItemId::SwStartInsGlossary ),
rTable.Get(
SvMacroItemId::SwEndInsGlossary ) );
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index df91dd6e6096..b41e15b150af 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -390,14 +390,13 @@ bool SwNumPositionTabPage::FillItemSet( SfxItemSet* rSet )
void SwNumPositionTabPage::Reset( const SfxItemSet* rSet )
{
- const SfxPoolItem* pItem;
if (pOutlineDlg)
{
pSaveNum = pOutlineDlg->GetNumRule();
m_xLevelLB->set_selection_mode(SelectionMode::Single);
}
- else if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_ACT_NUMBER,
false, &pItem))
- pSaveNum = const_cast<SwUINumRuleItem*>(static_cast<const
SwUINumRuleItem*>(pItem))->GetNumRule();
+ else if(const SwUINumRuleItem* pNumberItem =
rSet->GetItemIfSet(FN_PARAM_ACT_NUMBER, false))
+ pSaveNum = const_cast<SwUINumRuleItem*>(pNumberItem)->GetNumRule();
nActNumLvl = SwOutlineTabDialog::GetActNumLevel();
sal_uInt16 nMask = 1;
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 786d8028f97a..fa94ea19e2bd 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -262,10 +262,9 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet)
auto const & rSize = rSet.Get( RES_FRM_SIZE );
lMaxHeight = rSize.GetHeight();
- const SfxPoolItem* pItem;
- if( SfxItemState::SET == rSet.GetItemState( rSet.GetPool()->GetWhich(
SID_ATTR_PAGE_HEADERSET), false, &pItem ) )
+ if( const SvxSetItem* pHeaderSetItem = rSet.GetItemIfSet(
rSet.GetPool()->GetWhich( SID_ATTR_PAGE_HEADERSET), false ) )
{
- const SfxItemSet& rHeaderSet = static_cast<const
SvxSetItem*>(pItem)->GetItemSet();
+ const SfxItemSet& rHeaderSet = pHeaderSetItem->GetItemSet();
const SfxBoolItem& rHeaderOn =
rHeaderSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_ON ) );
@@ -277,10 +276,10 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet)
}
}
- if( SfxItemState::SET == rSet.GetItemState( rSet.GetPool()->GetWhich(
SID_ATTR_PAGE_FOOTERSET),
- false, &pItem ) )
+ if( const SvxSetItem* pFooterSetItem = rSet.GetItemIfSet(
rSet.GetPool()->GetWhich( SID_ATTR_PAGE_FOOTERSET),
+ false ) )
{
- const SfxItemSet& rFooterSet = static_cast<const
SvxSetItem*>(pItem)->GetItemSet();
+ const SfxItemSet& rFooterSet = pFooterSetItem->GetItemSet();
const SfxBoolItem& rFooterOn = rFooterSet.Get( SID_ATTR_PAGE_ON );
if ( rFooterOn.GetValue() )
@@ -291,10 +290,9 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet)
}
}
- if ( rSet.GetItemState( RES_UL_SPACE , false ) == SfxItemState::SET )
+ if ( const SvxULSpaceItem* pSpaceItem = rSet.GetItemIfSet( RES_UL_SPACE ,
false ) )
{
- const SvxULSpaceItem &rUL = rSet.Get( RES_UL_SPACE );
- lMaxHeight -= rUL.GetUpper() + rUL.GetLower();
+ lMaxHeight -= pSpaceItem->GetUpper() + pSpaceItem->GetLower();
}
lMaxHeight *= 8;
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index c06f5e91c2fe..2d3dc8351f21 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -275,12 +275,11 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet&
rSet)
sal_Int32 nDistanceLR = rLRSpace.GetLeft() + rLRSpace.GetRight();
sal_Int32 nDistanceUL = rULSpace.GetUpper() + rULSpace.GetLower();
- for( sal_Int32 nId : { SID_ATTR_PAGE_HEADERSET, SID_ATTR_PAGE_FOOTERSET })
+ for( const TypedWhichId<SvxSetItem> & nId : { SID_ATTR_PAGE_HEADERSET,
SID_ATTR_PAGE_FOOTERSET })
{
- const SfxPoolItem* pItem;
- if( SfxItemState::SET == rSet.GetItemState( nId, false, &pItem ) )
+ if( const SvxSetItem* pItem = rSet.GetItemIfSet( nId, false ) )
{
- const SfxItemSet& rExtraSet = static_cast<const
SvxSetItem*>(pItem)->GetItemSet();
+ const SfxItemSet& rExtraSet = pItem->GetItemSet();
const SfxBoolItem& rOn =
rExtraSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_ON ) );
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index c943b014ce2d..3d9195730598 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -25,14 +25,13 @@ namespace
SfxItemSetFixed<RES_PAGEDESC, RES_PAGEDESC> aSet(rSh.GetAttrPool());
if (rSh.GetCurAttr(aSet))
{
- const SfxPoolItem* pItem(nullptr);
- if (SfxItemState::SET == aSet.GetItemState( RES_PAGEDESC, true,
&pItem ) && pItem)
+ if (const SwFormatPageDesc* pDescItem = aSet.GetItemIfSet(
RES_PAGEDESC ))
{
- ::std::optional<sal_uInt16> oNumOffset = static_cast<const
SwFormatPageDesc *>(pItem)->GetNumOffset();
+ ::std::optional<sal_uInt16> oNumOffset =
pDescItem->GetNumOffset();
if (oNumOffset)
rPageNo = *oNumOffset;
if (ppPageFormatDesc)
- ppPageFormatDesc->reset(static_cast<const SwFormatPageDesc
*>(pItem->Clone()));
+ ppPageFormatDesc->reset(static_cast<const SwFormatPageDesc
*>(pDescItem->Clone()));
bRet = true;
}
}
