diff options
| author | Armin Le Grand (allotropia) <armin.le.grand.extern@allotropia.de> | 2024-02-18 19:17:48 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2024-02-18 21:37:52 +0100 |
| commit | cebbd5795d6256fb346ac8d70c15daceca48c554 (patch) | |
| tree | 40e5c20c2728c67a64f1156b1ca6099e4d16a081 /sw/source/ui/misc | |
| parent | d367142731f09c7be03ce1707e3aeab3c55b4f21 (diff) | |
ITEM: Rename for more control over SlotID usages
Change-Id: I51585f1c15984a066262023184f668662853d20f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163556
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'sw/source/ui/misc')
| -rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 14eec4b21be1..0316f6251eaa 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -262,21 +262,21 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) auto const & rSize = rSet.Get( RES_FRM_SIZE ); m_lMaxHeight = rSize.GetHeight(); - if( const SvxSetItem* pHeaderSetItem = rSet.GetItemIfSet( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_HEADERSET), false ) ) + if( const SvxSetItem* pHeaderSetItem = rSet.GetItemIfSet( rSet.GetPool()->GetWhichIDFromSlotID( SID_ATTR_PAGE_HEADERSET), false ) ) { const SfxItemSet& rHeaderSet = pHeaderSetItem->GetItemSet(); const SfxBoolItem& rHeaderOn = - rHeaderSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_ON ) ); + rHeaderSet.Get( rSet.GetPool()->GetWhichIDFromSlotID( SID_ATTR_PAGE_ON ) ); if ( rHeaderOn.GetValue() ) { const SvxSizeItem& rSizeItem = - rHeaderSet.Get(rSet.GetPool()->GetWhich(SID_ATTR_PAGE_SIZE)); + rHeaderSet.Get(rSet.GetPool()->GetWhichIDFromSlotID(SID_ATTR_PAGE_SIZE)); m_lMaxHeight -= rSizeItem.GetSize().Height(); } } - if( const SvxSetItem* pFooterSetItem = rSet.GetItemIfSet( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_FOOTERSET), + if( const SvxSetItem* pFooterSetItem = rSet.GetItemIfSet( rSet.GetPool()->GetWhichIDFromSlotID( SID_ATTR_PAGE_FOOTERSET), false ) ) { const SfxItemSet& rFooterSet = pFooterSetItem->GetItemSet(); @@ -285,7 +285,7 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) if ( rFooterOn.GetValue() ) { const SvxSizeItem& rSizeItem = - rFooterSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_SIZE ) ); + rFooterSet.Get( rSet.GetPool()->GetWhichIDFromSlotID( SID_ATTR_PAGE_SIZE ) ); m_lMaxHeight -= rSizeItem.GetSize().Height(); } } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 3eef17523c51..d50b4a93b172 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -285,12 +285,12 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) { const SfxItemSet& rExtraSet = pItem->GetItemSet(); const SfxBoolItem& rOn = - rExtraSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_PAGE_ON ) ); + rExtraSet.Get( rSet.GetPool()->GetWhichIDFromSlotID( SID_ATTR_PAGE_ON ) ); if ( rOn.GetValue() ) { const SvxSizeItem& rSizeItem = - rExtraSet.Get(rSet.GetPool()->GetWhich(SID_ATTR_PAGE_SIZE)); + rExtraSet.Get(rSet.GetPool()->GetWhichIDFromSlotID(SID_ATTR_PAGE_SIZE)); nDistanceUL += rSizeItem.GetSize().Height(); } } |