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/mnuctrls | |
| 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/mnuctrls')
| -rw-r--r-- | svx/source/mnuctrls/SmartTagCtl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/mnuctrls/clipboardctl.cxx | 6 | ||||
| -rw-r--r-- | svx/source/mnuctrls/fntctl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/mnuctrls/fntszctl.cxx | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 78a2ffb9999c..5dc91c703b07 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -138,9 +138,9 @@ void SvxSmartTagsControl::FillMenu() void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - mrParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); + mrParent.EnableItem( GetId(), SfxItemState::DISABLED != eState ); - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { const SvxSmartTagItem* pSmartTagItem = PTR_CAST( SvxSmartTagItem, pState ); if ( 0 != pSmartTagItem ) diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index ecd4c5303c41..fec5d11d2aed 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -119,7 +119,7 @@ void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID ) { DELETEZ( pClipboardFmtItem ); - if ( eState >= SFX_ITEM_DEFAULT ) + if ( eState >= SfxItemState::DEFAULT ) { pClipboardFmtItem = pState->Clone(); GetToolBox().SetItemBits( GetId(), GetToolBox().GetItemBits( GetId() ) | TIB_DROPDOWN ); @@ -131,8 +131,8 @@ void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co else { // enable the item as a whole - bDisabled = (GetItemState(pState) == SFX_ITEM_DISABLED); - GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SFX_ITEM_DISABLED) ); + bDisabled = (GetItemState(pState) == SfxItemState::DISABLED); + GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) ); } } diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 8a36eb685a1c..6ef5157b5cbf 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -93,9 +93,9 @@ void SvxFontMenuControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); + rParent.EnableItem( GetId(), SfxItemState::DISABLED != eState ); - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { if ( !pMenu->GetItemCount() ) FillMenu(); diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 1b17c56ebb68..dae879db0e1f 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -80,9 +80,9 @@ void SvxFontSizeMenuControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); + rParent.EnableItem( GetId(), SfxItemState::DISABLED != eState ); - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { if ( pState->ISA(SvxFontHeightItem) ) { |