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 /cui/source/tabpages/numfmt.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 'cui/source/tabpages/numfmt.cxx')
| -rw-r--r-- | cui/source/tabpages/numfmt.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 1577c2a8c1e8..ebf1a03f6f6d 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -410,7 +410,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) SfxItemState eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),true,&pItem); - if(eState==SFX_ITEM_SET) + if(eState==SfxItemState::SET) { const SfxBoolItem* pBoolLangItem = (const SfxBoolItem*) GetItem( *rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE); @@ -428,7 +428,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_INFO ),true,&pItem); - if(eState==SFX_ITEM_SET) + if(eState==SfxItemState::SET) { if(pNumItem==NULL) { @@ -448,7 +448,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ONE_AREA )); - if(eState==SFX_ITEM_SET) + if(eState==SfxItemState::SET) { const SfxBoolItem* pBoolItem = (const SfxBoolItem*) GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA); @@ -461,7 +461,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE ) ); - if ( eState == SFX_ITEM_SET ) + if ( eState == SfxItemState::SET ) { const SfxBoolItem* pBoolItem = (const SfxBoolItem*) GetItem( *rSet, SID_ATTR_NUMBERFORMAT_SOURCE ); @@ -485,7 +485,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ) ); - if ( SFX_ITEM_DONTCARE != eState ) + if ( SfxItemState::DONTCARE != eState ) pValFmtAttr = (const SfxUInt32Item*) GetItem( *rSet, SID_ATTR_NUMBERFORMAT_VALUE ); @@ -570,7 +570,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) SetCategory(nCatLbSelPos ); } eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ADD_AUTO ) ); - if(SFX_ITEM_SET == eState) + if(SfxItemState::SET == eState) pAutoEntryAttr = (const SfxBoolItem*) GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ADD_AUTO ); // no_NO is an alias for nb_NO and normally isn't listed, we need it for @@ -748,7 +748,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) { rCoreAttrs->Put( SfxUInt32Item( nWhich, nCurKey ) ); } - else if(SFX_ITEM_DEFAULT == eItemState) + else if(SfxItemState::DEFAULT == eItemState) { rCoreAttrs->ClearItem( nWhich ); } @@ -795,7 +795,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) rCoreAttrs->Put( SfxBoolItem( _nWhich, m_pCbSourceFormat->IsChecked() ) ); if ( !bDataChanged ) bDataChanged = (bOld != m_pCbSourceFormat->IsChecked() || - _eItemState != SFX_ITEM_SET); + _eItemState != SfxItemState::SET); } // FillItemSet is only called on OK, here we can notify the |