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 /sfx2/source/statbar | |
| 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 'sfx2/source/statbar')
| -rw-r--r-- | sfx2/source/statbar/stbitem.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 41f77ae74fd0..70e828000a4d 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -249,17 +249,17 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) svt::StatusbarController::statusChanged( rEvent ); else { - SfxItemState eState = SFX_ITEM_DISABLED; + SfxItemState eState = SfxItemState::DISABLED; SfxPoolItem* pItem = NULL; if ( rEvent.IsEnabled ) { - eState = SFX_ITEM_DEFAULT; + eState = SfxItemState::DEFAULT; uno::Type pType = rEvent.State.getValueType(); if ( pType == ::getVoidCppuType() ) { pItem = new SfxVoidItem( nSlotID ); - eState = SFX_ITEM_UNKNOWN; + eState = SfxItemState::UNKNOWN; } else if ( pType == ::getBooleanCppuType() ) { @@ -446,11 +446,11 @@ void SfxStatusBarControl::StateChanged DBG_ASSERT( pBar != 0, "setting state to dangling StatusBar" ); const SfxStringItem* pStr = PTR_CAST( SfxStringItem, pState ); - if ( eState == SFX_ITEM_DEFAULT && pStr ) + if ( eState == SfxItemState::DEFAULT && pStr ) pBar->SetItemText( nSID, pStr->GetValue() ); else { - DBG_ASSERT( eState != SFX_ITEM_DEFAULT || pState->ISA(SfxVoidItem), + DBG_ASSERT( eState != SfxItemState::DEFAULT || pState->ISA(SfxVoidItem), "wrong SfxPoolItem subclass in SfxStatusBarControl" ); pBar->SetItemText( nSID, OUString() ); } |