convert SFX_TOOLBOX_ constants to scoped enum

and move them to a more logical header

Change-Id: I56956969d3067d66ccdadd53cd5630409de16cd8

4 files changed, 23 insertions, 12 deletions

diff --git a/include/sfx2/imgmgr.hxx b/include/sfx2/imgmgr.hxx
index 779885212d43..c65f19d3d24c 100644
--- a/include/sfx2/imgmgr.hxx
+++ b/include/sfx2/imgmgr.hxx
@@ -21,14 +21,28 @@
 #define INCLUDED_SFX2_IMGMGR_HXX
 
 #include <sal/config.h>
-#include <sfx2/dllapi.h>
-
 #include <sal/types.h>
+#include <o3tl/typed_flags_set.hxx>
+#include <sfx2/dllapi.h>
 #include <vcl/image.hxx>
 
+
 class ToolBox;
 class SfxModule;
 class SfxImageManager_Impl;
+
+enum class SfxToolboxFlags
+{
+    CHANGESYMBOLSET     = 0x01,
+    CHANGEOUTSTYLE      = 0x02,
+    ALL                 = CHANGESYMBOLSET | CHANGEOUTSTYLE,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<SfxToolboxFlags> : is_typed_flags<SfxToolboxFlags, 0x03> {};
+}
+
+
 class SFX2_DLLPUBLIC SfxImageManager
 {
     SfxImageManager_Impl* pImp;
@@ -39,7 +53,7 @@ public:
     SfxImageManager(SfxModule& rModule);
     ~SfxImageManager();
 
-    void            RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags=0xFFFF);
+    void            RegisterToolBox( ToolBox *pBox, SfxToolboxFlags nFlags=SfxToolboxFlags::ALL);
     void            ReleaseToolBox( ToolBox *pBox );
 
     Image           GetImage( sal_uInt16 nId, bool bLarge ) const;
diff --git a/include/svtools/imgdef.hxx b/include/svtools/imgdef.hxx
index 0b27801c89c0..cd9c6d9e15d5 100644
--- a/include/svtools/imgdef.hxx
+++ b/include/svtools/imgdef.hxx
@@ -27,9 +27,6 @@ enum SfxSymbolsSize
     SFX_SYMBOLS_SIZE_AUTO
 };
 
-#define SFX_TOOLBOX_CHANGESYMBOLSET     0x0001
-#define SFX_TOOLBOX_CHANGEOUTSTYLE      0x0002
-
 #endif // INCLUDED_SVTOOLS_IMGDEF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index befb3c36d9aa..46708f60a27a 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -45,8 +45,8 @@ const sal_uInt32 IMAGELIST_COUNT = 4; // small, small-hi, large, large-hi
 
 struct ToolBoxInf_Impl
 {
-    ToolBox* pToolBox;
-    sal_uInt16   nFlags;
+    ToolBox*        pToolBox;
+    SfxToolboxFlags nFlags;
 };
 
 class SfxImageManager_Impl
@@ -167,7 +167,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
         for ( sal_uInt32 n=0; n < m_aToolBoxes.size(); n++ )
         {
             ToolBoxInf_Impl *pInf = m_aToolBoxes[n];
-            if ( pInf->nFlags & SFX_TOOLBOX_CHANGESYMBOLSET )
+            if ( pInf->nFlags & SfxToolboxFlags::CHANGESYMBOLSET )
             {
                 ToolBox *pBox       = pInf->pToolBox;
                 sal_uInt16  nCount      = pBox->GetItemCount();
@@ -300,7 +300,7 @@ Image SfxImageManager::SeekImage( sal_uInt16 nId ) const
     return SeekImage( nId, bLarge );
 }
 
-void SfxImageManager::RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags )
+void SfxImageManager::RegisterToolBox( ToolBox *pBox, SfxToolboxFlags nFlags )
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index c89a0628ade0..2d7c6c7903da 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -803,8 +803,8 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     if ( pCreateView )
         StartListening(*pCreateView);
     SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
-    pImgMan->RegisterToolBox(&aContentToolBox, SFX_TOOLBOX_CHANGEOUTSTYLE);
-    pImgMan->RegisterToolBox(&aGlobalToolBox, SFX_TOOLBOX_CHANGEOUTSTYLE);
+    pImgMan->RegisterToolBox(&aContentToolBox, SfxToolboxFlags::CHANGEOUTSTYLE);
+    pImgMan->RegisterToolBox(&aGlobalToolBox, SfxToolboxFlags::CHANGEOUTSTYLE);
 
     aContentToolBox.SetItemBits( FN_CREATE_NAVIGATION, aContentToolBox.GetItemBits( FN_CREATE_NAVIGATION ) | ToolBoxItemBits::DROPDOWNONLY );
     aContentToolBox.SetItemBits( FN_DROP_REGION, aContentToolBox.GetItemBits( FN_DROP_REGION ) | ToolBoxItemBits::DROPDOWNONLY );