summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/engine3d/float3d.cxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx2
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx2
-rw-r--r--svx/source/sdr/properties/itemsettools.cxx2
-rw-r--r--svx/source/svdraw/svdedtv1.cxx6
-rw-r--r--svx/source/svdraw/svdetc.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx2
-rw-r--r--svx/source/svdraw/svdundo.cxx4
-rw-r--r--svx/source/table/tablecontroller.cxx5
12 files changed, 17 insertions, 16 deletions
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 266b1e135db1..0c0b8eeb8d85 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -1650,7 +1650,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
while(nWhich)
{
- SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, false);
+ SfxItemState eState = aIter.GetItemState(false);
if(SfxItemState::DONTCARE == eState)
rAttrs.InvalidateItem(nWhich);
else if(SfxItemState::SET == eState)
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index b7407d641d44..a6bcaf40da65 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -53,7 +53,7 @@ namespace sdr::properties
while(nWhich)
{
- if(SfxItemState::SET == rStyle.GetItemState(nWhich))
+ if(SfxItemState::SET == aIter.GetItemState())
{
mxItemSet->ClearItem(nWhich);
}
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 91a2edbfebc0..fa52924585c5 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -178,7 +178,7 @@ namespace sdr::properties
while(nWhich)
{
const SfxPoolItem* pPoolItem;
- if(SfxItemState::SET == rSet.GetItemState(nWhich, false, &pPoolItem))
+ if(SfxItemState::SET == aWhichIter.GetItemState(false, &pPoolItem))
{
if(AllowItemChange(nWhich, pPoolItem))
{
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index a0887cc15aee..c156db33e029 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -85,7 +85,7 @@ namespace sdr::properties
// and always equal.
if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST)
{
- if(SfxItemState::DONTCARE == rSet.GetItemState(nWhich, false))
+ if(SfxItemState::DONTCARE == aIter.GetItemState(false))
{
mxItemSet->InvalidateItem(nWhich);
}
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 00f689515c4c..6ec522aa36b9 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -77,7 +77,7 @@ namespace sdr::properties
while(nWhich)
{
- if(SfxItemState::DONTCARE == rSet.GetItemState(nWhich, false))
+ if(SfxItemState::DONTCARE == aIter.GetItemState(false))
{
mxItemSet->InvalidateItem(nWhich);
}
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index 3bc0deee38a7..11431d367d12 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -70,7 +70,7 @@ namespace sdr::properties
while(nWhich)
{
- if(SfxItemState::SET == rSet.GetItemState(nWhich, false, &pItem))
+ if(SfxItemState::SET == aIter.GetItemState(false, &pItem))
{
if(pItem->HasMetrics())
{
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 2ec1bd1cf1d5..371584bd891a 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -925,12 +925,12 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) con
{
if(!bOnlyHardAttr)
{
- if(SfxItemState::DONTCARE == rSet.GetItemState(nWhich, false))
+ if(SfxItemState::DONTCARE == aIter.GetItemState(false))
rAttr.InvalidateItem(nWhich);
else
rAttr.MergeValue(rSet.Get(nWhich), true);
}
- else if(SfxItemState::SET == rSet.GetItemState(nWhich, false))
+ else if(SfxItemState::SET == aIter.GetItemState(false))
{
const SfxPoolItem& rItem = rSet.Get(nWhich);
rAttr.MergeValue(rItem, true);
@@ -1103,7 +1103,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll)
sal_uInt16 nWhich = aIter.FirstWhich();
while(!bPossibleGeomChange && nWhich)
{
- SfxItemState eState = rAttr.GetItemState(nWhich);
+ SfxItemState eState = aIter.GetItemState();
if(eState == SfxItemState::SET)
{
if((nWhich >= SDRATTR_TEXT_MINFRAMEHEIGHT && nWhich <= SDRATTR_TEXT_CONTOURFRAME)
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 929d59e09f4a..154bd3c7b084 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -368,7 +368,7 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl
// For bInklDefaults, the entire Which range is decisive,
// in other cases only the set items are.
// Disabled and DontCare are regarded as holes in the Which range.
- SfxItemState eState=rSet.GetItemState(nWhich);
+ SfxItemState eState=aIter.GetItemState();
if ((eState==SfxItemState::DEFAULT && bInklDefaults) || eState==SfxItemState::SET) {
if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=false;
else bHas=true;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index bb28a23a558e..f5218c997ca6 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1636,7 +1636,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe
while(nWhich)
{
- if(SfxItemState::SET == pSourceSet->GetItemState(nWhich, false, &pPoolItem))
+ if(SfxItemState::SET == aWhichIter.GetItemState(false, &pPoolItem))
{
std::unique_ptr<SfxPoolItem> pResultItem;
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 7843d52d49c1..f403ddd578ac 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -970,7 +970,7 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRe
SfxWhichIter aIter(pStyleSheet->GetItemSet());
sal_uInt16 nWhich=aIter.FirstWhich();
while (nWhich!=0) {
- if (pStyleSheet->GetItemSet().GetItemState(nWhich)==SfxItemState::SET) {
+ if (aIter.GetItemState()==SfxItemState::SET) {
maDefaultAttr.ClearItem(nWhich);
}
nWhich=aIter.NextWhich();
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index bd2ff6d8c1f9..15c690427363 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -364,7 +364,7 @@ void SdrUndoAttrObj::Undo()
while(nWhich)
{
- if(SfxItemState::SET != moUndoSet->GetItemState(nWhich, false))
+ if(SfxItemState::SET != aIter.GetItemState(false))
{
pObj->ClearMergedItem(nWhich);
}
@@ -445,7 +445,7 @@ void SdrUndoAttrObj::Redo()
while(nWhich)
{
- if(SfxItemState::SET != moRedoSet->GetItemState(nWhich, false))
+ if(SfxItemState::SET != aIter.GetItemState(false))
{
pObj->ClearMergedItem(nWhich);
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 8ef76acd377e..ef7401489c1d 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2422,14 +2422,15 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl
sal_uInt16 nWhich(aIter.FirstWhich());
while(nWhich)
{
+ SfxItemState nState = aIter.GetItemState(false);
if(!bOnlyHardAttr)
{
- if(SfxItemState::DONTCARE == rSet.GetItemState(nWhich, false))
+ if(SfxItemState::DONTCARE == nState)
rAttr.InvalidateItem(nWhich);
else
rAttr.MergeValue(rSet.Get(nWhich), true);
}
- else if(SfxItemState::SET == rSet.GetItemState(nWhich, false))
+ else if(SfxItemState::SET == nState)
{
const SfxPoolItem& rItem = rSet.Get(nWhich);
rAttr.MergeValue(rItem, true);
generated by cgit (git 2.34.1) at 2024-05-21 09:01:07 +0000