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>

1 files changed, 6 insertions, 6 deletions

diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 4585686cc3e3..251d905e9f29 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -69,7 +69,7 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet&
 
     const SfxPoolItem* pItem;
     SfxObjectShell* pObjSh;
-    if(SFX_ITEM_SET == rAttr.GetItemState(SID_HTML_MODE, false, &pItem) ||
+    if(SfxItemState::SET == rAttr.GetItemState(SID_HTML_MODE, false, &pItem) ||
         ( 0 != ( pObjSh = SfxObjectShell::Current()) &&
           0 != (pItem = pObjSh->GetItem(SID_HTML_MODE))))
     {
@@ -165,7 +165,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
     SfxItemState eItemState = rSet->GetItemState( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) );
 
     sal_Int16 nOutlineLv;
-    if( eItemState >= SFX_ITEM_DEFAULT )
+    if( eItemState >= SfxItemState::DEFAULT )
     {
         nOutlineLv = ((const SfxUInt16Item &)rSet->Get( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) )).GetValue();
         m_pOutlineLvLB->SelectEntryPos( nOutlineLv ) ;
@@ -178,7 +178,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
 
     eItemState = rSet->GetItemState( GetWhich(SID_ATTR_PARA_NUMRULE) );
 
-    if( eItemState >= SFX_ITEM_DEFAULT )
+    if( eItemState >= SfxItemState::DEFAULT )
     {
         OUString aStyle = ((const SfxStringItem &)rSet->Get( GetWhich(SID_ATTR_PARA_NUMRULE) )).GetValue();
         if(aStyle.isEmpty())
@@ -204,7 +204,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
     m_pNumberStyleLB->SaveValue();
 
     eItemState = rSet->GetItemState( FN_NUMBER_NEWSTART );
-    if(eItemState > SFX_ITEM_DEFAULT )
+    if(eItemState > SfxItemState::DEFAULT )
     {
         bCurNumrule = true;
         const SfxBoolItem& rStart = (const SfxBoolItem&)rSet->Get(FN_NUMBER_NEWSTART);
@@ -219,7 +219,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
     m_pNewStartCB->SaveValue();
 
     eItemState = rSet->GetItemState( FN_NUMBER_NEWSTART_AT);
-    if( eItemState > SFX_ITEM_DEFAULT )
+    if( eItemState > SfxItemState::DEFAULT )
     {
         const sal_uInt16 nNewStart = ((const SfxUInt16Item&)rSet->Get(FN_NUMBER_NEWSTART_AT)).GetValue();
         const bool bNotMax = USHRT_MAX != nNewStart;
@@ -233,7 +233,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet* rSet )
     m_pNewStartNF->SaveValue();
     m_pNewStartNumberCB->SaveValue();
     StyleHdl_Impl(m_pNumberStyleLB);
-    if( SFX_ITEM_DEFAULT <= rSet->GetItemState(RES_LINENUMBER))
+    if( SfxItemState::DEFAULT <= rSet->GetItemState(RES_LINENUMBER))
     {
         SwFmtLineNumber& rNum = (SwFmtLineNumber&)rSet->Get(RES_LINENUMBER);
         sal_uLong nStartValue = rNum.GetStartValue();