diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-08 10:20:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-08 14:00:37 +0200 |
| commit | 98fa826a51a67d278c7c81f728c35753ffefe1b5 (patch) | |
| tree | d81d489b43e483734684371de231e9bff312ec44 /sfx2/source/control/bindings.cxx | |
| parent | e137c4028ce5ceb2bbf988f47875e6b5e2c9764f (diff) | |
convert SfxSlotKind to scoped enum
Change-Id: I742e83bd455bc0efa4ad5a34575d3255c3a9a16f
Diffstat (limited to 'sfx2/source/control/bindings.cxx')
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 843169fb91e7..c1d7e5f837a4 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1181,7 +1181,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell { SfxItemPool &rPool = pShell->GetPool(); - if ( SFX_KIND_ENUM == pSlot->GetKind() ) + if ( SfxSlotKind::Enum == pSlot->GetKind() ) { // for Enum-Slots, the Master has to be executed with the value // of the enums @@ -1191,7 +1191,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell aReq.AppendItem( SfxAllEnumItem( rPool.GetWhich(nSlotId), pSlot->GetValue() ) ); pDispatcher->_Execute( *pShell, *pRealSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD ); } - else if ( SFX_KIND_ATTR == pSlot->GetKind() ) + else if ( SfxSlotKind::Attribute == pSlot->GetKind() ) { // Which value has to be mapped for Attribute slots const sal_uInt16 nSlotId = pSlot->GetSlotId(); @@ -1339,7 +1339,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl // get the status method, which is served by the pCache SfxStateFunc pFnc = nullptr; const SfxInterface *pInterface = pShell->GetInterface(); - if ( SFX_KIND_ENUM == pMsgSvr->GetSlot()->GetKind() ) + if ( SfxSlotKind::Enum == pMsgSvr->GetSlot()->GetKind() ) { pRealSlot = pInterface->GetRealSlot(pMsgSvr->GetSlot()); pCache = GetStateCache( pRealSlot->GetSlotId() ); @@ -1451,7 +1451,7 @@ void SfxBindings::UpdateControllers_Impl SfxItemState eState // state of item ) { - DBG_ASSERT( !rFound.pSlot || SFX_KIND_ENUM != rFound.pSlot->GetKind(), + DBG_ASSERT( !rFound.pSlot || SfxSlotKind::Enum != rFound.pSlot->GetKind(), "direct update of enum slot isn't allowed" ); SfxStateCache* pCache = rFound.pCache; @@ -1498,7 +1498,7 @@ void SfxBindings::UpdateControllers_Impl for ( const SfxSlot *pSlave = pFirstSlave; pSlave; pSlave = pSlave->GetNextSlot() ) { DBG_ASSERT(pSlave, "Wrong SlaveSlot binding!"); - DBG_ASSERT(SFX_KIND_ENUM == pSlave->GetKind(),"non enum slaves aren't allowed"); + DBG_ASSERT(SfxSlotKind::Enum == pSlave->GetKind(),"non enum slaves aren't allowed"); DBG_ASSERT(pSlave->GetMasterSlotId() == pSlot->GetSlotId(),"Wrong MasterSlot!"); // Binding exist for function ? |