summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
Diffstat (limited to 'svl')
-rw-r--r--svl/source/items/itempool.cxx8
-rw-r--r--svl/source/items/itemset.cxx2
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);