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>

4 files changed, 21 insertions, 21 deletions

diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index c480adfcb7eb..f7e3d0d3a1a0 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1028,7 +1028,7 @@ SfxItemSet SmTextForwarder::GetParaAttribs( sal_Int32 nPara ) const
     sal_uInt16 nWhich = EE_PARA_START;
     while( nWhich <= EE_PARA_END )
     {
-        if( aSet.GetItemState( nWhich, true ) != SFX_ITEM_SET )
+        if( aSet.GetItemState( nWhich, true ) != SfxItemState::SET )
         {
             if( pEditEngine->HasParaAttrib( nPara, nWhich ) )
                 aSet.Put( pEditEngine->GetParaAttrib( nPara, nWhich ) );
@@ -1118,12 +1118,12 @@ static SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ES
 
     const SfxPoolItem*  pLastItem = NULL;
 
-    SfxItemState eState = SFX_ITEM_DEFAULT;
+    SfxItemState eState = SfxItemState::DEFAULT;
 
     // check all paragraphs inside the selection
     for( sal_Int32 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
     {
-        SfxItemState eParaState = SFX_ITEM_DEFAULT;
+        SfxItemState eParaState = SfxItemState::DEFAULT;
 
         // calculate start and endpos for this paragraph
         sal_Int32 nPos = 0;
@@ -1163,7 +1163,7 @@ static SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ES
             {
                 // ... and its different to this one than the state is dont care
                 if( *pParaItem != *(i->pAttr) )
-                    return SFX_ITEM_DONTCARE;
+                    return SfxItemState::DONTCARE;
             }
             else
             {
@@ -1182,17 +1182,17 @@ static SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ES
         if( !bEmpty && !bGaps && nLastEnd < ( nEndPos - 1 ) )
             bGaps = true;
         if( bEmpty )
-            eParaState = SFX_ITEM_DEFAULT;
+            eParaState = SfxItemState::DEFAULT;
         else if( bGaps )
-            eParaState = SFX_ITEM_DONTCARE;
+            eParaState = SfxItemState::DONTCARE;
         else
-            eParaState = SFX_ITEM_SET;
+            eParaState = SfxItemState::SET;
 
         // if we already found an item check if we found the same
         if( pLastItem )
         {
             if( (pParaItem == NULL) || (*pLastItem != *pParaItem) )
-                return SFX_ITEM_DONTCARE;
+                return SfxItemState::DONTCARE;
         }
         else
         {
@@ -1206,7 +1206,7 @@ static SfxItemState GetSvxEditEngineItemState( EditEngine& rEditEngine, const ES
 
 SfxItemState SmTextForwarder::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
 {
-    SfxItemState nState = SFX_ITEM_DISABLED;
+    SfxItemState nState = SfxItemState::DISABLED;
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
         nState = GetSvxEditEngineItemState( *pEditEngine, rSel, nWhich );
@@ -1215,7 +1215,7 @@ SfxItemState SmTextForwarder::GetItemState( const ESelection& rSel, sal_uInt16 n
 
 SfxItemState SmTextForwarder::GetItemState( sal_Int32 nPara, sal_uInt16 nWhich ) const
 {
-    SfxItemState nState = SFX_ITEM_DISABLED;
+    SfxItemState nState = SfxItemState::DISABLED;
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
     {
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index 4756e8277721..e8643fdd5999 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -52,31 +52,31 @@ void SmConfig::ItemSetToConfig(const SfxItemSet &rSet)
 
     sal_uInt16 nU16;
     bool bVal;
-    if (rSet.GetItemState(SID_PRINTSIZE, true, &pItem) == SFX_ITEM_SET)
+    if (rSet.GetItemState(SID_PRINTSIZE, true, &pItem) == SfxItemState::SET)
     {   nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
         SetPrintSize( (SmPrintSize) nU16 );
     }
-    if (rSet.GetItemState(SID_PRINTZOOM, true, &pItem) == SFX_ITEM_SET)
+    if (rSet.GetItemState(SID_PRINTZOOM, true, &pItem) == SfxItemState::SET)
     {   nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
         SetPrintZoomFactor( nU16 );
     }
-    if (rSet.GetItemState(SID_PRINTTITLE, true, &pItem) == SFX_ITEM_SET)
+    if (rSet.GetItemState(SID_PRINTTITLE, true, &pItem) == SfxItemState::SET)
     {   bVal = ((const SfxBoolItem *) pItem)->GetValue();
         SetPrintTitle( bVal );
     }
-    if (rSet.GetItemState(SID_PRINTTEXT, true, &pItem) == SFX_ITEM_SET)
+    if (rSet.GetItemState(SID_PRINTTEXT, true, &pItem) == SfxItemState::SET)
     {   bVal = ((const SfxBoolItem *) pItem)->GetValue();
         SetPrintFormulaText( bVal );
     }
-    if (rSet.GetItemState(SID_PRINTFRAME, true, &pItem) == SFX_ITEM_SET)
+    if (rSet.GetItemState(SID_PRINTFRAME, true, &pItem) == SfxItemState::SET)
     {   bVal = ((const SfxBoolItem *) pItem)->GetValue();
         SetPrintFrame( bVal );
     }
-    if (rSet.GetItemState(SID_AUTOREDRAW, true, &pItem) == SFX_ITEM_SET)
+    if (rSet.GetItemState(SID_AUTOREDRAW, true, &pItem) == SfxItemState::SET)
     {   bVal = ((const SfxBoolItem *) pItem)->GetValue();
         SetAutoRedraw( bVal );
     }
-    if (rSet.GetItemState(SID_NO_RIGHT_SPACES, true, &pItem) == SFX_ITEM_SET)
+    if (rSet.GetItemState(SID_NO_RIGHT_SPACES, true, &pItem) == SfxItemState::SET)
     {   bVal = ((const SfxBoolItem *) pItem)->GetValue();
         if (IsIgnoreSpacesRight() != bVal)
         {
@@ -86,7 +86,7 @@ void SmConfig::ItemSetToConfig(const SfxItemSet &rSet)
             Broadcast(SfxSimpleHint(HINT_FORMATCHANGED));
         }
     }
-    if (rSet.GetItemState(SID_SAVE_ONLY_USED_SYMBOLS, true, &pItem) == SFX_ITEM_SET)
+    if (rSet.GetItemState(SID_SAVE_ONLY_USED_SYMBOLS, true, &pItem) == SfxItemState::SET)
     {   bVal = ((const SfxBoolItem *) pItem)->GetValue();
         SetSaveOnlyUsedSymbols( bVal );
     }
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index d4b06a448551..b110cc33acbe 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1111,7 +1111,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
                 sal_uInt16 nId = rReq.GetSlot(), nCnt = 1;
                 const SfxItemSet* pArgs = rReq.GetArgs();
                 const SfxPoolItem* pItem;
-                if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem ))
+                if( pArgs && SfxItemState::SET == pArgs->GetItemState( nId, false, &pItem ))
                     nCnt = ((SfxUInt16Item*)pItem)->GetValue();
 
                 bool (::svl::IUndoManager:: *fnDo)();
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a03e497f22c3..5da9f2908755 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1509,7 +1509,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
 
             bool  bVal;
             if ( pArgs &&
-                 SFX_ITEM_SET == pArgs->GetItemState( SID_FORMULACURSOR, false, &pItem))
+                 SfxItemState::SET == pArgs->GetItemState( SID_FORMULACURSOR, false, &pItem))
                 bVal = ((SfxBoolItem *) pItem)->GetValue();
             else
                 bVal = !pp->GetConfig()->IsShowFormulaCursor();
@@ -1806,7 +1806,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
             const SfxItemSet *pArgs = rReq.GetArgs();
             const SfxPoolItem* pItem;
 
-            if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem ) )
+            if ( pArgs && SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem ) )
             {
                 const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue();
                 aGraphic.SetZoom( nCurrentZoom );