summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/cuicharmap.cxx2
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx8
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx6
-rw-r--r--svx/source/sidebar/nbdtmg.cxx4
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx2
-rw-r--r--svx/source/styles/CommonStylePreviewRenderer.cxx2
-rw-r--r--svx/source/tbxctrls/linewidthctrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
-rw-r--r--svx/source/unodraw/unopool.cxx10
10 files changed, 20 insertions, 20 deletions
diff --git a/svx/source/dialog/cuicharmap.cxx b/svx/source/dialog/cuicharmap.cxx
index 430bf250fdcd..8eba24f4ace0 100644
--- a/svx/source/dialog/cuicharmap.cxx
+++ b/svx/source/dialog/cuicharmap.cxx
@@ -349,7 +349,7 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph)
const SfxItemPool* pPool = m_xOutputSet->GetPool();
m_xOutputSet->Put( SfxStringItem( SID_CHARMAP, sGlyph ) );
m_xOutputSet->Put( SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(),
- aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
+ aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), pPool->GetWhichIDFromSlotID(SID_ATTR_CHAR_FONT) ) );
m_xOutputSet->Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName() ) );
m_xOutputSet->Put( SfxInt32Item( SID_ATTR_CHAR, cChar ) );
}
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 534f8129d2c2..b0723c8e65c1 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -431,7 +431,7 @@ void FontPrevWin_Impl::ScaleFontWidth(vcl::RenderContext const & rOutDev)
static bool GetWhich (const SfxItemSet& rSet, sal_uInt16 nSlot, sal_uInt16& rWhich)
{
- rWhich = rSet.GetPool()->GetWhich(nSlot);
+ rWhich = rSet.GetPool()->GetWhichIDFromSlotID(nSlot);
return rSet.GetItemState(rWhich) >= SfxItemState::DEFAULT;
}
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b5451643f6c8..4482774a2482 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -232,7 +232,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
for ( size_t i = 0; i < size(); ++i )
if ( IsInvalidItem( (*this)[i].pItemPtr ) )
- rSet.InvalidateItem( pPool->GetWhich( (*this)[i].nSlot ) );
+ rSet.InvalidateItem( pPool->GetWhichIDFromSlotID( (*this)[i].nSlot ) );
else
rSet.Put( *(*this)[i].pItemPtr );
return rSet;
@@ -1971,7 +1971,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, weld::Button&, void)
aSet.MergeRange(SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL);
- sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
+ sal_uInt16 nBrushWhich = pSh->GetPool().GetWhichIDFromSlotID(SID_ATTR_BRUSH);
aSet.MergeRange(nBrushWhich, nBrushWhich);
aSet.MergeRange(XATTR_FILL_FIRST, XATTR_FILL_LAST);
@@ -1992,8 +1992,8 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, weld::Button&, void)
pReplaceList->Get( aSet );
}
aSet.DisableItem(SID_ATTR_PARA_MODEL);
- aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_PAGEBREAK));
- aSet.DisableItem(rPool.GetWhich(SID_ATTR_PARA_KEEP));
+ aSet.DisableItem(rPool.GetWhichIDFromSlotID(SID_ATTR_PARA_PAGEBREAK));
+ aSet.DisableItem(rPool.GetWhichIDFromSlotID(SID_ATTR_PARA_KEEP));
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 8520e74cc41f..33915ccf936d 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -350,7 +350,7 @@ namespace svx
void lcl_translateUnoStateToItem( SfxSlotId _nSlot, const Any& _rUnoState, SfxItemSet& _rSet )
{
- WhichId nWhich = _rSet.GetPool()->GetWhich( _nSlot );
+ WhichId nWhich = _rSet.GetPool()->GetWhichIDFromSlotID( _nSlot );
if ( !_rUnoState.hasValue() )
{
if ( ( _nSlot != SID_CUT )
@@ -586,7 +586,7 @@ namespace svx
}
}
- WhichId nWhich = rPool.GetWhich( nSlotId );
+ WhichId nWhich = rPool.GetWhichIDFromSlotID( nSlotId );
bool bIsInPool = rPool.IsInRange( nWhich );
if ( bIsInPool )
{
@@ -823,7 +823,7 @@ namespace svx
SfxItemSet aToggled( *_rReq.GetArgs() );
lcl_translateUnoStateToItem( nSlot, aFeaturePos->second->getFeatureState(), aToggled );
- WhichId nWhich = aToggled.GetPool()->GetWhich( nSlot );
+ WhichId nWhich = aToggled.GetPool()->GetWhichIDFromSlotID( nSlot );
const SfxPoolItem* pItem = aToggled.GetItem( nWhich );
if ( ( SID_ATTR_CHAR_UNDERLINE == nSlot ) || ( SID_ATTR_CHAR_OVERLINE == nSlot ) )
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 52fa87c9fe7c..b8c8bccfc19c 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -165,13 +165,13 @@ void NBOTypeMgrBase::SetItems(const SfxItemSet* pArg) {
SfxItemState eState = pSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
if(eState == SfxItemState::SET)
{
- eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
+ eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhichIDFromSlotID(SID_ATTR_NUMBERING_RULE));
} else {
//sd use different sid for numbering rule
eState = pSet->GetItemState(EE_PARA_NUMBULLET, false, &pItem);
if(eState == SfxItemState::SET)
{
- eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(EE_PARA_NUMBULLET));
+ eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhichIDFromSlotID(EE_PARA_NUMBULLET));
}
}
}
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 28eb699d2d25..866f2edbeebe 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -216,7 +216,7 @@ IMPL_LINK_NOARG(TextCharacterSpacingControl, KerningModifyHdl, weld::MetricSpinB
MapUnit TextCharacterSpacingControl::GetCoreMetric()
{
SfxItemPool &rPool = SfxGetpApp()->GetPool();
- sal_uInt16 nWhich = rPool.GetWhich(SID_ATTR_CHAR_KERNING);
+ sal_uInt16 nWhich = rPool.GetWhichIDFromSlotID(SID_ATTR_CHAR_KERNING);
return rPool.GetMetric(nWhich);
}
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index c6c0bd1c7059..b517b4437811 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -62,7 +62,7 @@ CommonStylePreviewRenderer::~CommonStylePreviewRenderer()
static bool GetWhich(const SfxItemSet& rSet, sal_uInt16 nSlot, sal_uInt16& rWhich)
{
- rWhich = rSet.GetPool()->GetWhich(nSlot);
+ rWhich = rSet.GetPool()->GetWhichIDFromSlotID(nSlot);
return rSet.GetItemState(rWhich) >= SfxItemState::DEFAULT;
}
diff --git a/svx/source/tbxctrls/linewidthctrl.cxx b/svx/source/tbxctrls/linewidthctrl.cxx
index 166f4bb451c9..a28c11cbd1c8 100644
--- a/svx/source/tbxctrls/linewidthctrl.cxx
+++ b/svx/source/tbxctrls/linewidthctrl.cxx
@@ -86,7 +86,7 @@ MapUnit SvxLineWidthToolBoxControl::GetCoreMetric()
{
SfxObjectShell* pSh = SfxObjectShell::Current();
SfxItemPool& rPool = pSh ? pSh->GetPool() : SfxGetpApp()->GetPool();
- sal_uInt16 nWhich = rPool.GetWhich(SID_ATTR_LINE_WIDTH);
+ sal_uInt16 nWhich = rPool.GetWhichIDFromSlotID(SID_ATTR_LINE_WIDTH);
return rPool.GetMetric(nWhich);
}
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d3f89aad706c..a07a1b752d5d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1300,7 +1300,7 @@ void SvxStyleBox_Base::UserDrawEntry(vcl::RenderContext& rRenderContext, const t
static bool GetWhich(const SfxItemSet& rSet, sal_uInt16 nSlot, sal_uInt16& rWhich)
{
- rWhich = rSet.GetPool()->GetWhich(nSlot);
+ rWhich = rSet.GetPool()->GetWhichIDFromSlotID(nSlot);
return rSet.GetItemState(rWhich) >= SfxItemState::DEFAULT;
}
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 82b362f991eb..c3ab804e1a5c 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -104,7 +104,7 @@ void SvxUnoDrawPool::getAny( SfxItemPool const * pPool, const comphelper::Proper
// Assure, that ID is a Which-ID (it could be a Slot-ID.)
// Thus, convert handle to Which-ID.
- pPool->GetUserOrPoolDefaultItem( pPool->GetWhich( static_cast<sal_uInt16>(pEntry->mnHandle) ) ).QueryValue( rValue, nMemberId );
+ pPool->GetUserOrPoolDefaultItem( pPool->GetWhichIDFromSlotID( static_cast<sal_uInt16>(pEntry->mnHandle) ) ).QueryValue( rValue, nMemberId );
}
}
@@ -137,7 +137,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
// Assure, that ID is a Which-ID (it could be a Slot-ID.)
// Thus, convert handle to Which-ID.
- const sal_uInt16 nWhich = pPool->GetWhich( static_cast<sal_uInt16>(pEntry->mnHandle) );
+ const sal_uInt16 nWhich = pPool->GetWhichIDFromSlotID( static_cast<sal_uInt16>(pEntry->mnHandle) );
switch( nWhich )
{
case OWN_ATTR_FILLBMP_MODE:
@@ -214,7 +214,7 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp
{
//Assure, that ID is a Which-ID (it could be a Slot-ID.)
// Thus, convert handle to Which-ID.
- const sal_uInt16 nWhich = pPool->GetWhich( static_cast<sal_uInt16>((*ppEntries)->mnHandle) );
+ const sal_uInt16 nWhich = pPool->GetWhichIDFromSlotID( static_cast<sal_uInt16>((*ppEntries)->mnHandle) );
switch( nWhich )
{
@@ -278,7 +278,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
// Assure, that ID is a Which-ID (it could be a Slot-ID.)
// Thus, convert handle to Which-ID.
- const sal_uInt16 nWhich = pPool->GetWhich( static_cast<sal_uInt16>(pEntry->mnHandle) );
+ const sal_uInt16 nWhich = pPool->GetWhichIDFromSlotID( static_cast<sal_uInt16>(pEntry->mnHandle) );
if ( pPool && pPool != mpDefaultsPool.get() )
{
// use method <ResetUserDefaultItem(..)> instead of using probably incompatible item pool <mpDefaultsPool>.
@@ -293,7 +293,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry
// using probably incompatible item pool <mpDefaultsPool>
uno::Any aAny;
SfxItemPool* pPool = getModelPool( true );
- const sal_uInt16 nWhich = pPool->GetWhich( static_cast<sal_uInt16>(pEntry->mnHandle) );
+ const sal_uInt16 nWhich = pPool->GetWhichIDFromSlotID( static_cast<sal_uInt16>(pEntry->mnHandle) );
const SfxPoolItem *pItem = pPool->GetUserDefaultItem ( nWhich );
if (pItem)
{
generated by cgit (git 2.34.1) at 2024-12-23 09:18:44 +0000