summaryrefslogtreecommitdiff
path: root/svl/source/items/itemprop.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svl/source/items/itemprop.cxx')
-rw-r--r--svl/source/items/itemprop.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 9b1de9e2289d..53f948455687 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -185,10 +185,10 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
// get the SfxPoolItem
const SfxPoolItem* pItem = 0;
SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem );
- if(SFX_ITEM_SET != eState && SFX_WHICH_MAX > rEntry.nWID )
+ if(SfxItemState::SET != eState && SFX_WHICH_MAX > rEntry.nWID )
pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID);
// return item values as uno::Any
- if(eState >= SFX_ITEM_DEFAULT && pItem)
+ if(eState >= SfxItemState::DEFAULT && pItem)
{
pItem->QueryValue( rAny, rEntry.nMemberId );
}
@@ -245,10 +245,10 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
const SfxPoolItem* pItem = 0;
boost::scoped_ptr<SfxPoolItem> pNewItem;
SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem );
- if(SFX_ITEM_SET != eState && SFX_WHICH_MAX > rEntry.nWID )
+ if(SfxItemState::SET != eState && SFX_WHICH_MAX > rEntry.nWID )
pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID);
//maybe there's another way to find an Item
- if(eState < SFX_ITEM_DEFAULT)
+ if(eState < SfxItemState::DEFAULT)
{
SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID);
if(FillItem(aSet, rEntry.nWID, false))
@@ -296,9 +296,9 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
// Get item state
SfxItemState eState = rSet.GetItemState( nWhich, false );
// Return item value as UnoAny
- if(eState == SFX_ITEM_DEFAULT)
+ if(eState == SfxItemState::DEFAULT)
eRet = PropertyState_DEFAULT_VALUE;
- else if(eState < SFX_ITEM_DEFAULT)
+ else if(eState < SfxItemState::DEFAULT)
eRet = PropertyState_AMBIGUOUS_VALUE;
return eRet;
}
@@ -319,9 +319,9 @@ PropertyState SfxItemPropertySet::getPropertyState(const OUString& rName, cons
// Get item state
SfxItemState eState = rSet.GetItemState(nWhich, false);
// Return item value as UnoAny
- if(eState == SFX_ITEM_DEFAULT)
+ if(eState == SfxItemState::DEFAULT)
eRet = PropertyState_DEFAULT_VALUE;
- else if(eState < SFX_ITEM_DEFAULT)
+ else if(eState < SfxItemState::DEFAULT)
eRet = PropertyState_AMBIGUOUS_VALUE;
return eRet;
}