convert SfxPopupWindowType to enum class

Change-Id: I03813103d648c5745beab740403c7912cdff2756

20 files changed, 32 insertions, 32 deletions

diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index f2950b97ac9d..fac2961b8455 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -63,8 +63,8 @@ TbxControls::TbxControls( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
 SfxPopupWindowType TbxControls::GetPopupWindowType() const
 {
     if( nLastSlot == USHRT_MAX )
-        return SFX_POPUPWINDOW_ONCLICK;
-    return SFX_POPUPWINDOW_ONTIMEOUT;
+        return SfxPopupWindowType::ONCLICK;
+    return SfxPopupWindowType::ONTIMEOUT;
 }
 
 void TbxControls::StateChanged( sal_uInt16 nSID, SfxItemState eState,
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index f0fbfdb68db5..e6d538874fb8 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -65,14 +65,14 @@ struct SfxTbxCtrlFactory
 
 
 
-enum SfxPopupWindowType
+enum class SfxPopupWindowType
 {
-    SFX_POPUPWINDOW_NONE,
-    SFX_POPUPWINDOW_ONCLICK,
-    SFX_POPUPWINDOW_ONTIMEOUT,
-    SFX_POPUPWINDOW_ONCLICKANDMOVE,
-    SFX_POPUPWINDOW_ONTIMEOUTANDMOVE,
-    SFX_POPUPWINDOW_CONTEXTMENU
+    NONE,
+    ONCLICK,
+    ONTIMEOUT,
+    ONCLICKANDMOVE,
+    ONTIMEOUTANDMOVE,
+    CONTEXTMENU
 };
 
 
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 4030b74d2e5f..32b06bbb8d90 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -95,7 +95,7 @@ SfxPopupWindow* ScTbxInsertCtrl::CreatePopupWindow()
 
 SfxPopupWindowType ScTbxInsertCtrl::GetPopupWindowType() const
 {
-    return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
+    return nLastSlotId ? SfxPopupWindowType::ONTIMEOUT : SfxPopupWindowType::ONCLICK;
 }
 
 void ScTbxInsertCtrl::Select( bool /* bMod1 */ )
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index e2e3d7bf95c6..cbf40156aa4b 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -53,7 +53,7 @@ SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
 
 SfxPopupWindowType SdTbxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUT;
+    return SfxPopupWindowType::ONTIMEOUT;
 }
 
 /**
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 4c49cb942aa4..027d4406adf8 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -976,7 +976,7 @@ void SfxToolBoxControl::Click()
 
 SfxPopupWindowType SfxToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_NONE;
+    return SfxPopupWindowType::NONE;
 }
 
 
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index a1bad6d9b352..b287aac60a5a 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -97,7 +97,7 @@ void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState,
 // when one wants to create a popup window
 SfxPopupWindowType SvxTbxCtlCustomShapes::GetPopupWindowType() const
 {
-    return( m_aCommand.isEmpty() ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT);
+    return( m_aCommand.isEmpty() ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT);
 }
 
 // Here is the window created
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index f72ad7ce9b8b..3c3e8f72eabb 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -198,7 +198,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
 
 SfxPopupWindowType SvxFmTbxCtlConfig::GetPopupWindowType() const
 {
-    return( nLastSlot == 0 ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT );
+    return( nLastSlot == 0 ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT );
 }
 
 
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 352dcb0cb651..e0ec2724c305 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -110,7 +110,7 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow()
 
 SfxPopupWindowType SvxClipBoardControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUT;
+    return SfxPopupWindowType::ONTIMEOUT;
 }
 
 
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 345aed32fb29..5b1329178b9a 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -39,7 +39,7 @@ ParaLineSpacingPopup::~ParaLineSpacingPopup()
 
 SfxPopupWindowType ParaLineSpacingPopup::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUT;
+    return SfxPopupWindowType::ONTIMEOUT;
 }
 
 SfxPopupWindow* ParaLineSpacingPopup::CreatePopupWindow()
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index a2b6085481ef..c4df8a50e66a 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -273,7 +273,7 @@ FontWorkShapeTypeControl::~FontWorkShapeTypeControl()
 
 SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK; //( aLastAction.getLength() == 0 ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT );
+    return SfxPopupWindowType::ONCLICK; //( aLastAction.getLength() == 0 ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT );
 }
 
 
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index a670e09d7fde..e42c3ce13f79 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -446,7 +446,7 @@ void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState,
 
 SfxPopupWindowType SvxGrafFilterToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return SfxPopupWindowType::ONCLICK;
 }
 
 SfxPopupWindow* SvxGrafFilterToolBoxControl::CreatePopupWindow()
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 7fd2388ed6fe..53ed61eb72e2 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -717,7 +717,7 @@ SvxTableToolBoxControl::~SvxTableToolBoxControl()
 
 SfxPopupWindowType SvxTableToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUTANDMOVE;
+    return SfxPopupWindowType::ONTIMEOUTANDMOVE;
 }
 
 
@@ -782,7 +782,7 @@ SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl()
 
 SfxPopupWindowType SvxColumnsToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUTANDMOVE;
+    return SfxPopupWindowType::ONTIMEOUTANDMOVE;
 }
 
 
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 66512d5352fb..f65d68ff4daf 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -153,7 +153,7 @@ SfxPopupWindow* SvxListBoxControl::CreatePopupWindow()
 
 SfxPopupWindowType SvxListBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUT;
+    return SfxPopupWindowType::ONTIMEOUT;
 }
 
 
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 56fd6a670f6d..bee2f93e3def 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -619,7 +619,7 @@ SvxLineEndToolBoxControl::~SvxLineEndToolBoxControl()
 
 SfxPopupWindowType SvxLineEndToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return SfxPopupWindowType::ONCLICK;
 }
 
 
diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index d186f5582f2d..c04c79b0de14 100644
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -54,7 +54,7 @@ SfxPopupWindow* SvxSubToolBoxControl::CreatePopupWindow()
 
 SfxPopupWindowType  SvxSubToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return SfxPopupWindowType::ONCLICK;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index ff96a359b0cd..e66a10c36a02 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2492,7 +2492,7 @@ SvxColorToolBoxControl::~SvxColorToolBoxControl()
 
 SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUT;
+    return SfxPopupWindowType::ONTIMEOUT;
 }
 
 SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
@@ -2670,7 +2670,7 @@ SvxFrameToolBoxControl::SvxFrameToolBoxControl(
 
 SfxPopupWindowType SvxFrameToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return SfxPopupWindowType::ONCLICK;
 }
 
 SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow()
@@ -2712,7 +2712,7 @@ SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
 
 SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return SfxPopupWindowType::ONCLICK;
 }
 
 SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 2e4e0f20156e..41571ee9699a 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -52,7 +52,7 @@ SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTb
 
 SfxPopupWindowType SvxTbxCtlAlign::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return SfxPopupWindowType::ONCLICK;
 }
 
 /*
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 541b2e0f31cb..6280e1fce9f8 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -70,7 +70,7 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
 
 SfxPopupWindowType SvxTbxCtlDraw::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return SfxPopupWindowType::ONCLICK;
 }
 
 
diff --git a/sw/source/uibase/ribbar/tblctrl.cxx b/sw/source/uibase/ribbar/tblctrl.cxx
index c19406277d36..b56e892c0da4 100644
--- a/sw/source/uibase/ribbar/tblctrl.cxx
+++ b/sw/source/uibase/ribbar/tblctrl.cxx
@@ -49,7 +49,7 @@ SfxPopupWindow* SwTableOptimizeCtrl::CreatePopupWindow()
 
 SfxPopupWindowType  SwTableOptimizeCtrl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONCLICK;
+    return SfxPopupWindowType::ONCLICK;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 09ee4a3dd3bf..7cbb8b9fdbbb 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -135,7 +135,7 @@ SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
 
 SfxPopupWindowType  SwTbxInsertCtrl::GetPopupWindowType() const
 {
-    return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
+    return nLastSlotId ? SfxPopupWindowType::ONTIMEOUT : SfxPopupWindowType::ONCLICK;
 }
 
 void SwTbxInsertCtrl::Select( sal_uInt16 /*nSelectModifier*/ )
@@ -224,7 +224,7 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 
 SfxPopupWindowType SwTbxAutoTextCtrl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUT;
+    return SfxPopupWindowType::ONTIMEOUT;
 }
 
 void SwTbxAutoTextCtrl::StateChanged( sal_uInt16,
@@ -321,7 +321,7 @@ SfxPopupWindow* SwTbxFieldCtrl::CreatePopupWindow()
 
 SfxPopupWindowType SwTbxFieldCtrl::GetPopupWindowType() const
 {
-    return SFX_POPUPWINDOW_ONTIMEOUT;
+    return SfxPopupWindowType::ONTIMEOUT;
 }
 
 void SwTbxFieldCtrl::StateChanged( sal_uInt16,