diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-10 17:53:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-12 06:08:32 +0000 |
| commit | ea733ab5b632109d28bb8f1dc37116340b26229b (patch) | |
| tree | 78a5c4d6cad5d6f2c58a89745ba0af130ef0e188 /svx/source/svdraw/svdibrow.cxx | |
| parent | cc3294e127a6aedb8f6da5741ac9063da1cc2135 (diff) | |
Turn SfxItemState into a C++11 scoped enumeration
...to gain further confidence in the claim "that none of the existing
code tries to uses combinations of these enum values"
(d92602c5b13d0a60439d86c5a033d124178726ca "more fixes for SfxItemState")
Change-Id: I987922d945e8738e38adfde83b869adf3ff35b13
Reviewed-on: https://gerrit.libreoffice.org/11384
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source/svdraw/svdibrow.cxx')
| -rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 70e30e67dbfd..18f354a0f240 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -95,7 +95,7 @@ public: public: ImpItemListRow() - : eState(SFX_ITEM_UNKNOWN), + : eState(SfxItemState::UNKNOWN), nWhichId(0), pType(NULL), eItemType(ITEM_DONTKNOW), @@ -320,12 +320,12 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con { switch (pEntry->eState) { - case SFX_ITEM_UNKNOWN : sRet = "Unknown"; break; - case SFX_ITEM_DISABLED: sRet = "Disabled"; break; - case SFX_ITEM_DONTCARE: sRet = "DontCare"; break; - case SFX_ITEM_SET : sRet = "Set"; break; - case SFX_ITEM_DEFAULT : sRet = "Default"; break; - case SFX_ITEM_READONLY: sRet = "ReadOnly"; break; + case SfxItemState::UNKNOWN : sRet = "Unknown"; break; + case SfxItemState::DISABLED: sRet = "Disabled"; break; + case SfxItemState::DONTCARE: sRet = "DontCare"; break; + case SfxItemState::SET : sRet = "Set"; break; + case SfxItemState::DEFAULT : sRet = "Default"; break; + case SfxItemState::READONLY: sRet = "ReadOnly"; break; } // switch } break; case ITEMBROWSER_TYPECOL_ID: sRet = pEntry->GetItemTypeStr(); break; @@ -589,10 +589,10 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntP bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) { SfxItemState eState=rSet.GetItemState(nWhich,true,&rpItem); - if (eState==SFX_ITEM_DEFAULT) { + if (eState==SfxItemState::DEFAULT) { rpItem=&rSet.Get(nWhich); } - return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL; + return (eState==SfxItemState::DEFAULT || eState==SfxItemState::SET) && rpItem!=NULL; } bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) @@ -922,10 +922,10 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem SfxItemState eState=pSet->GetItemState(nWhich); if (p2ndSet!=NULL) { SfxItemState e2ndState=p2ndSet->GetItemState(nWhich); - if (eState==SFX_ITEM_DEFAULT) eState=SFX_ITEM_DISABLED; - else if (e2ndState==SFX_ITEM_DEFAULT) eState=SFX_ITEM_DEFAULT; + if (eState==SfxItemState::DEFAULT) eState=SfxItemState::DISABLED; + else if (e2ndState==SfxItemState::DEFAULT) eState=SfxItemState::DEFAULT; } - if (eState!=SFX_ITEM_DISABLED) { + if (eState!=SfxItemState::DISABLED) { const SfxPoolItem& rItem=pSet->Get(nWhich); sal_uInt16 nIndent=0; if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) { |