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 /sd/source/ui/dlg/tpoption.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 'sd/source/ui/dlg/tpoption.cxx')
| -rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index fc123faa32b2..d80266fcef0b 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -217,7 +217,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(Window* pParent, const SfxItemSet& rInAttrs) FieldUnit eFUnit; sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); - if ( rInAttrs.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rInAttrs.GetItemState( nWhich ) >= SfxItemState::DEFAULT ) { const SfxUInt16Item& rItem = (SfxUInt16Item&)rInAttrs.Get( nWhich ); eFUnit = (FieldUnit)rItem.GetValue(); @@ -286,7 +286,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) // change metric if necessary (since TabPage is in the Dialog where // the metric is set) const SfxPoolItem* pAttr = NULL; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , false, + if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_METRIC , false, (const SfxPoolItem**)&pAttr )) { const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr; @@ -441,7 +441,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); m_pLbMetric->SetNoSelection(); - if ( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rAttrs->GetItemState( nWhich ) >= SfxItemState::DEFAULT ) { const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs->Get( nWhich ); long nFieldUnit = (long)rItem.GetValue(); @@ -458,7 +458,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) // tabulator space nWhich = GetWhich( SID_ATTR_DEFTABSTOP ); - if( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if( rAttrs->GetItemState( nWhich ) >= SfxItemState::DEFAULT ) { SfxMapUnit eUnit = rAttrs->GetPool()->GetMetric( nWhich ); const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs->Get( nWhich ); |