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 /svl/source | |
| 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 'svl/source')
| -rw-r--r-- | svl/source/items/itempool.cxx | 8 | ||||
| -rw-r--r-- | svl/source/items/itemset.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 8108a72b31c4..19eb792dc85f 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -856,7 +856,7 @@ void SfxItemPool::GetItemSurrogates(ItemSurrogates& rTarget, sal_uInt16 nWhich) rTarget = ItemSurrogates(aNewSurrogates.begin(), aNewSurrogates.end()); } -sal_uInt16 SfxItemPool::GetWhich(sal_uInt16 nSlotId, bool bDeep) const +sal_uInt16 SfxItemPool::GetWhichIDFromSlotID(sal_uInt16 nSlotId, bool bDeep) const { if (!IsSlot(nSlotId)) return nSlotId; @@ -871,7 +871,7 @@ sal_uInt16 SfxItemPool::GetWhich(sal_uInt16 nSlotId, bool bDeep) const } if (mpSecondary && bDeep) - return mpSecondary->GetWhich(nSlotId); + return mpSecondary->GetWhichIDFromSlotID(nSlotId); return nSlotId; } @@ -894,7 +894,7 @@ sal_uInt16 SfxItemPool::GetSlotId(sal_uInt16 nWhich) const } -sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const +sal_uInt16 SfxItemPool::GetTrueWhichIDFromSlotID( sal_uInt16 nSlotId, bool bDeep ) const { if (!IsSlot(nSlotId)) return 0; @@ -909,7 +909,7 @@ sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const } if (mpSecondary && bDeep) - return mpSecondary->GetTrueWhich(nSlotId); + return mpSecondary->GetTrueWhichIDFromSlotID(nSlotId); return 0; } diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 56cde0aec56c..c23a537b6227 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1504,7 +1504,7 @@ bool SfxItemSet::Set const SfxPoolItem* SfxItemSet::GetItem(sal_uInt16 nId, bool bSearchInParent) const { // evtl. Convert from SlotID to WhichId - const sal_uInt16 nWhich(GetPool()->GetWhich(nId)); + const sal_uInt16 nWhich(GetPool()->GetWhichIDFromSlotID(nId)); // Is the Item set or 'bDeep == true' available? const SfxPoolItem *pItem(nullptr); |