convert POPUPMENU_ constants to scoped enum

Change-Id: I4cdaf36581d1e1daa39929e621070d18a9996852

3 files changed, 10 insertions, 10 deletions

diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 9e4525690825..c77663fb8a11 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -57,7 +57,7 @@ void MenuButton::ExecuteMenu()
         Rectangle aRect( aPos, aSize );
         SetPressed( true );
         EndSelection();
-        mnCurItemId = mpMenu->Execute( this, aRect, POPUPMENU_EXECUTE_DOWN );
+        mnCurItemId = mpMenu->Execute( this, aRect, PopupMenuFlags::ExecuteDown );
         SetPressed( false );
         if ( mnCurItemId )
         {
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index f3defdd42943..d2d45d7b9d8d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2867,29 +2867,29 @@ void PopupMenu::SetSelectedEntry( sal_uInt16 nId )
 
 sal_uInt16 PopupMenu::Execute( vcl::Window* pExecWindow, const Point& rPopupPos )
 {
-    return Execute( pExecWindow, Rectangle( rPopupPos, rPopupPos ), POPUPMENU_EXECUTE_DOWN );
+    return Execute( pExecWindow, Rectangle( rPopupPos, rPopupPos ), PopupMenuFlags::ExecuteDown );
 }
 
-sal_uInt16 PopupMenu::Execute( vcl::Window* pExecWindow, const Rectangle& rRect, sal_uInt16 nFlags )
+sal_uInt16 PopupMenu::Execute( vcl::Window* pExecWindow, const Rectangle& rRect, PopupMenuFlags nFlags )
 {
     ENSURE_OR_RETURN( pExecWindow, "PopupMenu::Execute: need a non-NULL window!", 0 );
 
     FloatWinPopupFlags nPopupModeFlags = FloatWinPopupFlags::NONE;
-    if ( nFlags & POPUPMENU_EXECUTE_DOWN )
+    if ( nFlags & PopupMenuFlags::ExecuteDown )
         nPopupModeFlags = FloatWinPopupFlags::Down;
-    else if ( nFlags & POPUPMENU_EXECUTE_UP )
+    else if ( nFlags & PopupMenuFlags::ExecuteUp )
         nPopupModeFlags = FloatWinPopupFlags::Up;
-    else if ( nFlags & POPUPMENU_EXECUTE_LEFT )
+    else if ( nFlags & PopupMenuFlags::ExecuteLeft )
         nPopupModeFlags = FloatWinPopupFlags::Left;
-    else if ( nFlags & POPUPMENU_EXECUTE_RIGHT )
+    else if ( nFlags & PopupMenuFlags::ExecuteRight )
         nPopupModeFlags = FloatWinPopupFlags::Right;
     else
         nPopupModeFlags = FloatWinPopupFlags::Down;
 
-    if (nFlags & POPUPMENU_NOMOUSEUPCLOSE )                      // allow popup menus to stay open on mouse button up
+    if (nFlags & PopupMenuFlags::NoMouseUpClose )                      // allow popup menus to stay open on mouse button up
         nPopupModeFlags |= FloatWinPopupFlags::NoMouseUpClose;    // useful if the menu was opened on mousebutton down (eg toolbox configuration)
 
-    if (nFlags & POPUPMENU_NOHORZ_PLACEMENT)
+    if (nFlags & PopupMenuFlags::NoHorzPlacement)
         nPopupModeFlags |= FloatWinPopupFlags::NoHorzPlacement;
 
     return ImplExecute( pExecWindow, rRect, nPopupModeFlags, 0, false );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index d06291c46f24..f6f3dab8790f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1913,7 +1913,7 @@ void ToolBox::ImplExecuteCustomMenu()
         }
 
         sal_uInt16 uId = GetMenu()->Execute( pWin, Rectangle( ImplGetPopupPosition( aMenuRect, Size() ), Size() ),
-                                POPUPMENU_EXECUTE_DOWN | POPUPMENU_NOMOUSEUPCLOSE );
+                                PopupMenuFlags::ExecuteDown | PopupMenuFlags::NoMouseUpClose );
 
         if ( aDelData.IsDead() )
             return;