convert SfxSlotFilterState to scoped enum

Change-Id: I424a1c71429078f8f83f8f0138c6e12567628ef8

include/sfx2/dispatch.hxx

@@ -67,12 +67,12 @@ namespace o3tl
     template<> struct typed_flags<SfxDispatcherPopFlags> : is_typed_flags<SfxDispatcherPopFlags, 0x07> {};
 }
 
-enum SfxSlotFilterState
+enum class SfxSlotFilterState
 {
-    SFX_SLOT_FILTER_DISABLED,
-    SFX_SLOT_FILTER_ENABLED,
+    DISABLED,
+    ENABLED,
     // enabled even if ReadOnlyDoc
-    SFX_SLOT_FILTER_ENABLED_READONLY,
+    ENABLED_READONLY,
 };
 
 
@@ -168,7 +168,7 @@ public:
     void                Flush();
     void                Lock( bool bLock );
     bool                IsLocked( sal_uInt16 nSID = 0 ) const;
-    void                SetSlotFilter( SfxSlotFilterState nEnable = SFX_SLOT_FILTER_DISABLED,
+    void                SetSlotFilter( SfxSlotFilterState nEnable = SfxSlotFilterState::DISABLED,
                                        sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 );
 
     void                HideUI( bool bHide = true );

sd/source/ui/docshell/docshell.cxx

@@ -389,7 +389,7 @@ void DrawDocShell::ApplySlotFilter() const
             SfxDispatcher* pDispatcher = pTestViewShell->GetViewFrame()->GetDispatcher();
 
             if( mpFilterSIDs )
-                pDispatcher->SetSlotFilter( mbFilterEnable ? SFX_SLOT_FILTER_ENABLED : SFX_SLOT_FILTER_DISABLED, mnFilterCount, mpFilterSIDs );
+                pDispatcher->SetSlotFilter( mbFilterEnable ? SfxSlotFilterState::ENABLED : SfxSlotFilterState::DISABLED, mnFilterCount, mpFilterSIDs );
             else
                 pDispatcher->SetSlotFilter();
 

sd/source/ui/slideshow/slideshowimpl.cxx

@@ -2669,7 +2669,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception)
                 if( pDispatcher )
                 {
                     // filter all forbbiden slots
-                    pDispatcher->SetSlotFilter( SFX_SLOT_FILTER_ENABLED, sizeof(pAllowed) / sizeof(sal_uInt16), pAllowed );
+                    pDispatcher->SetSlotFilter( SfxSlotFilterState::ENABLED, sizeof(pAllowed) / sizeof(sal_uInt16), pAllowed );
                 }
 
                 if( getBindings() )

sfx2/source/control/dispatch.cxx

@@ -321,7 +321,7 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
     xImp->bQuiet = false;
     xImp->bModal = false;
     xImp->pInCallAliveFlag = 0;
-    xImp->nFilterEnabling = SFX_SLOT_FILTER_DISABLED;
+    xImp->nFilterEnabling = SfxSlotFilterState::DISABLED;
     xImp->nFilterCount = 0;
     xImp->pFilterSIDs = 0;
     xImp->nDisableFlags = 0;
@@ -1626,20 +1626,20 @@ SfxSlotFilterState SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID )
     // no filter?
     if ( 0 == xImp->nFilterCount )
         // => all SIDs allowed
-        return SFX_SLOT_FILTER_ENABLED;
+        return SfxSlotFilterState::ENABLED;
 
     // search
     bool bFound = 0 != bsearch( &nSID, xImp->pFilterSIDs, xImp->nFilterCount,
                                 sizeof(sal_uInt16), SfxCompareSIDs_Impl );
 
     // even if ReadOnlyDoc
-    if ( SFX_SLOT_FILTER_ENABLED_READONLY == xImp->nFilterEnabling )
-        return bFound ? SFX_SLOT_FILTER_ENABLED_READONLY : SFX_SLOT_FILTER_ENABLED;
+    if ( SfxSlotFilterState::ENABLED_READONLY == xImp->nFilterEnabling )
+        return bFound ? SfxSlotFilterState::ENABLED_READONLY : SfxSlotFilterState::ENABLED;
     // Otherwise after Negative/Positive Filter
-    else if ( SFX_SLOT_FILTER_ENABLED == xImp->nFilterEnabling )
-        return bFound ? SFX_SLOT_FILTER_ENABLED : SFX_SLOT_FILTER_DISABLED;
+    else if ( SfxSlotFilterState::ENABLED == xImp->nFilterEnabling )
+        return bFound ? SfxSlotFilterState::ENABLED : SfxSlotFilterState::DISABLED;
     else
-        return bFound ? SFX_SLOT_FILTER_DISABLED : SFX_SLOT_FILTER_ENABLED;
+        return bFound ? SfxSlotFilterState::DISABLED : SfxSlotFilterState::ENABLED;
 }
 
 /** This helper method searches for the <Slot-Server> which currently serves
@@ -1706,11 +1706,11 @@ bool SfxDispatcher::_FindServer(sal_uInt16 nSlot, SfxSlotServer& rServer, bool b
     }
 
     // SID check against set filter
-    SfxSlotFilterState nSlotEnableMode = SFX_SLOT_FILTER_DISABLED;
+    SfxSlotFilterState nSlotEnableMode = SfxSlotFilterState::DISABLED;
     if ( xImp->pFrame )
     {
         nSlotEnableMode = IsSlotEnabledByFilter_Impl( nSlot );
-        if ( SFX_SLOT_FILTER_DISABLED == nSlotEnableMode )
+        if ( SfxSlotFilterState::DISABLED == nSlotEnableMode )
             return false;
     }
 
@@ -1728,7 +1728,7 @@ bool SfxDispatcher::_FindServer(sal_uInt16 nSlot, SfxSlotServer& rServer, bool b
             return false;
     }
 
-    bool bReadOnly = ( SFX_SLOT_FILTER_ENABLED_READONLY != nSlotEnableMode && xImp->bReadOnly );
+    bool bReadOnly = ( SfxSlotFilterState::ENABLED_READONLY != nSlotEnableMode && xImp->bReadOnly );
 
     // search through all the shells of the chained dispatchers
     // from top to bottom

sw/source/uibase/uiview/view.cxx

@@ -602,7 +602,7 @@ void SwView::_CheckReadonlyState()
         }
         if ( SfxItemState::DISABLED == eStateRO )
         {
-            rDis.SetSlotFilter( SFX_SLOT_FILTER_ENABLED_READONLY, sizeof(aROIds)/sizeof(sal_uInt16), aROIds );
+            rDis.SetSlotFilter( SfxSlotFilterState::ENABLED_READONLY, sizeof(aROIds)/sizeof(sal_uInt16), aROIds );
             bChgd = true;
         }
     }
@@ -617,7 +617,7 @@ void SwView::_CheckReadonlyState()
                 qsort( (void*)aAllProtIds, sizeof(aAllProtIds)/sizeof(sal_uInt16), sizeof(sal_uInt16), lcl_CmpIds );
                 bAllProtFirst = false;
             }
-            rDis.SetSlotFilter( SFX_SLOT_FILTER_ENABLED_READONLY,
+            rDis.SetSlotFilter( SfxSlotFilterState::ENABLED_READONLY,
                                 sizeof(aAllProtIds)/sizeof(sal_uInt16),
                                 aAllProtIds );
             bChgd = true;