conver MENU_FLAG_ constants to scoped enum

Change-Id: I969d99fa8881cc89601696a2d8621905a82b147b

23 files changed, 64 insertions, 56 deletions

diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 6b4bc4c838f5..34c650c05a70 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -501,7 +501,7 @@ bool OAccessibleMenuItemComponent::IsMenuHideDisabledEntries()
 {
     if (m_pParent )
     {
-        if( m_pParent->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES)
+        if( m_pParent->GetMenuFlags() & MenuFlags::HideDisabledEntries)
         {
             return true;
         }
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 9ee4986ab015..05c2bb0b5853 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -471,7 +471,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe
     if ( m_pParent )
     {
         // create auto mnemonics
-        if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( m_pParent->GetMenuFlags() & MENU_FLAG_NOAUTOMNEMONICS ) )
+        if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( m_pParent->GetMenuFlags() & MenuFlags::NoAutoMnemonics ) )
             m_pParent->CreateAutoMnemonics();
 
         // activation key
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 1b454fcc9366..7eadd5a16952 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2231,14 +2231,14 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe
 
     PopupMenu* pMenu = m_pModifyTopLevelButton->GetPopupMenu();
     pMenu->SetMenuFlags(
-        pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
+        pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
 
     m_pModifyTopLevelButton->SetSelectHdl(
         LINK( this, SvxMenuConfigPage, MenuSelectHdl ) );
 
     PopupMenu* pEntry = m_pModifyCommandButton->GetPopupMenu();
     pEntry->SetMenuFlags(
-        pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
+        pEntry->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
 
     m_pModifyCommandButton->SetSelectHdl(
         LINK( this, SvxMenuConfigPage, EntrySelectHdl ) );
@@ -2924,7 +2924,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe
 
     PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_TOOLBAR ) );
     pMenu->SetMenuFlags(
-        pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
+        pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
 
     m_pModifyTopLevelButton->SetPopupMenu( pMenu );
     m_pModifyTopLevelButton->SetSelectHdl(
@@ -2933,7 +2933,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe
     PopupMenu* pEntry = new PopupMenu(
         CUI_RES( MODIFY_TOOLBAR_CONTENT ) );
     pEntry->SetMenuFlags(
-        pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
+        pEntry->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
 
     m_pModifyCommandButton->SetPopupMenu( pEntry );
     m_pModifyCommandButton->SetSelectHdl(
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 1d72e70e172c..f8952df4c2ba 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -866,7 +866,7 @@ int SpellDialog::InitUserDicts()
     PopupMenu* pMenu = m_pAddToDictMB->GetPopupMenu();
     assert(pMenu);
     pMenu->Clear();
-    pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+    pMenu->SetMenuFlags(MenuFlags::NoAutoMnemonics);
     sal_uInt16 nItemId = 1;     // menu items should be enumerated from 1 and not 0
     for (sal_Int32 i = 0; i < nSize; ++i)
     {
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index aaa457eee2ac..049c5a1eb256 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -773,7 +773,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack )
         PopupMenu aPopupMenu( EditResId( RID_MENU_SPELL ) );
         PopupMenu *pAutoMenu = aPopupMenu.GetPopupMenu( MN_AUTOCORR );
         PopupMenu *pInsertMenu = aPopupMenu.GetPopupMenu( MN_INSERT );  // add word to user-dictionaries
-        pInsertMenu->SetMenuFlags( MENU_FLAG_NOAUTOMNEMONICS );         //! necessary to retrieve the correct dictionary names later
+        pInsertMenu->SetMenuFlags( MenuFlags::NoAutoMnemonics );         //! necessary to retrieve the correct dictionary names later
 
         EditPaM aPaM2( aPaM );
         aPaM2.SetIndex( aPaM2.GetIndex()+1 );
@@ -846,7 +846,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack )
         if ( Application::IsAutoMnemonicEnabled() )
         {
             aPopupMenu.CreateAutoMnemonics();
-            aPopupMenu.SetMenuFlags( aPopupMenu.GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
+            aPopupMenu.SetMenuFlags( aPopupMenu.GetMenuFlags() | MenuFlags::NoAutoMnemonics );
         }
 
         // Replace suggestions...
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index e2e182700b9e..610c97062914 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -718,11 +718,11 @@ IMPL_LINK_TYPED( MenuManager, Activate, Menu *, pMenu, bool )
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         bool bShowMenuImages    = rSettings.GetUseImagesInMenus();
 
-        sal_uInt16 nFlag = pMenu->GetMenuFlags();
+        MenuFlags nFlag = pMenu->GetMenuFlags();
         if ( bDontHide )
-            nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES;
+            nFlag &= ~MenuFlags::HideDisabledEntries;
         else
-            nFlag |= MENU_FLAG_HIDEDISABLEDENTRIES;
+            nFlag |= MenuFlags::HideDisabledEntries;
         pMenu->SetMenuFlags( nFlag );
 
         if ( m_bActive )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 903b3a64eb5b..594e8bb6b534 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -739,11 +739,11 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
 
         SolarMutexGuard g;
 
-        sal_uInt16 nFlag = pMenu->GetMenuFlags();
+        MenuFlags nFlag = pMenu->GetMenuFlags();
         if ( bDontHide )
-            nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES;
+            nFlag &= ~MenuFlags::HideDisabledEntries;
         else
-            nFlag |= MENU_FLAG_HIDEDISABLEDENTRIES;
+            nFlag |= MenuFlags::HideDisabledEntries;
         pMenu->SetMenuFlags( nFlag );
 
         if ( m_bActive )
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 7f55ed11ef57..a0492af406c4 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1798,7 +1798,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
         pManagerMenu->SetDeactivateHdl( LINK( this, ToolBarManager, MenuDeactivate ) );
 
         // make sure all disabled entries will be shown
-        pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
+        pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
         ::Point aPoint( pCmdEvt->GetMousePosPixel() );
         pMenu->Execute( m_pToolBar, aPoint );
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index b2a73963e4a2..b0d26d7be4a9 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -88,11 +88,19 @@ namespace o3tl
     template<> struct typed_flags<PopupMenuFlags> : is_typed_flags<PopupMenuFlags, 0x003f> {};
 }
 
-#define MENU_FLAG_NOAUTOMNEMONICS       0x0001
-#define MENU_FLAG_HIDEDISABLEDENTRIES   0x0002
+enum class MenuFlags
+{
+    NONE                      = 0x0000,
+    NoAutoMnemonics           = 0x0001,
+    HideDisabledEntries       = 0x0002,
+    // overrides default hiding of disabled entries in popup menus
+    AlwaysShowDisabledEntries = 0x0004,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<MenuFlags> : is_typed_flags<MenuFlags, 0x0007> {};
+}
 
-// overrides default hiding of disabled entries in popup menus
-#define MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES 0x0004
 
 /// Invalid menu item id
 #define ITEMPOS_INVALID     0xFFFF
@@ -150,7 +158,7 @@ private:
 
     ImplSVEvent *       nEventId;
     sal_uInt16          mnHighlightedItemPos; // for native menus: keeps track of the highlighted item
-    sal_uInt16          nMenuFlags;
+    MenuFlags           nMenuFlags;
     sal_uInt16          nDefaultItem;       // Id of default item
     sal_uInt16          nSelectedId;
 
@@ -260,8 +268,8 @@ public:
 
     void                CreateAutoMnemonics();
 
-    void                SetMenuFlags( sal_uInt16 nFlags ) { nMenuFlags = nFlags; }
-    sal_uInt16          GetMenuFlags() const { return nMenuFlags; }
+    void                SetMenuFlags( MenuFlags nFlags ) { nMenuFlags = nFlags; }
+    MenuFlags           GetMenuFlags() const { return nMenuFlags; }
 
     sal_uInt16          GetItemCount() const;
     sal_uInt16          GetItemId(sal_uInt16 nPos) const;
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 8d29dc1b9349..09a6f2ee539a 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -78,7 +78,7 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) :
     mpEditEngine->SetRefMapMode( MapMode( MAP_PIXEL ) );
     maEdEngSize = mpEditEngine->GetPaperSize();
 
-    maPopup.SetMenuFlags( maPopup.GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
+    maPopup.SetMenuFlags( maPopup.GetMenuFlags() | MenuFlags::NoAutoMnemonics );
 
     EnableRTL( false ); // RTL
     InitFonts();
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 32bcda49cf46..01d8e419477a 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1701,7 +1701,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl)
     {
         ScPopupMenu aPopup(ScResId(RID_POPUP_CHANGES));
 
-        aPopup.SetMenuFlags(MENU_FLAG_HIDEDISABLEDENTRIES);
+        aPopup.SetMenuFlags(MenuFlags::HideDisabledEntries);
 
         SvTreeListEntry* pEntry=pTheView->GetCurEntry();
         if(pEntry!=NULL)
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 30ebd411df31..3b583113706b 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -591,7 +591,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
                 //  angezeigtes Dokument
 
                 ScPopupMenu aDocMenu;
-                aDocMenu.SetMenuFlags( aDocMenu.GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
+                aDocMenu.SetMenuFlags( aDocMenu.GetMenuFlags() | MenuFlags::NoAutoMnemonics );
                 sal_uInt16 i=0;
                 sal_uInt16 nPos=0;
                 //  geladene Dokumente
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 207f8b483a78..4a8ca07c9df3 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2475,7 +2475,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             }
 
             if( ! SvtMenuOptions().IsEntryHidingEnabled() )
-                aMenu.SetMenuFlags( aMenu.GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
+                aMenu.SetMenuFlags( aMenu.GetMenuFlags() | MenuFlags::HideDisabledEntries );
 
             sal_uInt16 nId = aMenu.Execute( this, aPos );
             pHelpWin->DoAction( nId );
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 8ec7964e64a3..ba15fd4e7deb 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -375,7 +375,7 @@ void BackingWindow::setupButton( MenuButton* pButton )
     pButton->SetControlForeground(aButtonsText);
 
     PopupMenu* pMenu = pButton->GetPopupMenu();
-    pMenu->SetMenuFlags(pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES);
+    pMenu->SetMenuFlags(pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries);
 
     pButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
     pButton->SetSelectHdl(LINK(this, BackingWindow, MenuSelectHdl));
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 6281e137b54d..782d041b7081 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -74,7 +74,7 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu )
     DBG_ASSERT( pMenu, "invalid menu" );
     if( ! SvtMenuOptions().IsEntryHidingEnabled() )
     {
-        pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
+        pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MenuFlags::HideDisabledEntries );
     }
 }
 
@@ -157,7 +157,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
         (void) bHasMoreSynonyms;
 
         pThesSubMenu = new PopupMenu;
-        pThesSubMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+        pThesSubMenu->SetMenuFlags(MenuFlags::NoAutoMnemonics);
         const size_t nNumSynonyms = aSynonyms.size();
         if (nNumSynonyms > 0)
         {
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 67c13c98b82a..121dd945dbbf 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -789,11 +789,11 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool )
     if ( pMenu )
     {
         bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled();
-        sal_uInt16 nFlag = pMenu->GetMenuFlags();
+        MenuFlags nFlag = pMenu->GetMenuFlags();
         if ( bDontHide )
-            nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES;
+            nFlag &= ~MenuFlags::HideDisabledEntries;
         else
-            nFlag |= MENU_FLAG_HIDEDISABLEDENTRIES;
+            nFlag |= MenuFlags::HideDisabledEntries;
         pMenu->SetMenuFlags( nFlag );
     }
 
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index fef618cc6668..6a5e0dcf18f4 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -26,7 +26,7 @@
 
 FontNameMenu::FontNameMenu()
 {
-    SetMenuFlags( GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
+    SetMenuFlags( GetMenuFlags() | MenuFlags::NoAutoMnemonics );
 }
 
 FontNameMenu::~FontNameMenu()
@@ -109,7 +109,7 @@ FontSizeMenu::FontSizeMenu()
 :    mpHeightAry( NULL )
 ,    mnCurHeight( 100 )
 {
-    SetMenuFlags( GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
+    SetMenuFlags( GetMenuFlags() | MenuFlags::NoAutoMnemonics );
 }
 
 FontSizeMenu::~FontSizeMenu()
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 879b1b685cf4..70ef25cffe4a 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -272,7 +272,7 @@ SwSpellPopup::SwSpellPopup(
 {
     OSL_ENSURE(m_xSpellAlt.is(), "no spelling alternatives available");
 
-    SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+    SetMenuFlags(MenuFlags::NoAutoMnemonics);
     bool bUseImagesInMenus = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
 
     m_nCheckedLanguage = LANGUAGE_NONE;
@@ -286,7 +286,7 @@ SwSpellPopup::SwSpellPopup(
     SvtLinguConfig aCfg;
 
     PopupMenu *pMenu = GetPopupMenu(MN_AUTOCORR);
-    pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+    pMenu->SetMenuFlags(MenuFlags::NoAutoMnemonics);
     bool bEnable = false;
     if( nStringCount )
     {
@@ -350,7 +350,7 @@ SwSpellPopup::SwSpellPopup(
     }
 
     pMenu = GetPopupMenu(MN_ADD_TO_DIC);
-    pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);     //! necessary to retrieve the correct dictionary name in 'Execute' below
+    pMenu->SetMenuFlags(MenuFlags::NoAutoMnemonics);     //! necessary to retrieve the correct dictionary name in 'Execute' below
     uno::Reference< linguistic2::XSearchableDictionaryList >    xDicList( SvxGetDictionaryList() );
     sal_uInt16 nItemId = MN_DICTIONARIES_START;
     if (xDicList.is())
@@ -494,7 +494,7 @@ m_aInfo16( SW_RES(IMG_INFO_16) )
         InsertItem(MN_EXPLANATION_LINK, SW_RESSTR(STR_EXPLANATION_LINK), MenuItemBits::TEXT | MenuItemBits::HELP, OString(), nPos++);
     }
 
-    SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+    SetMenuFlags(MenuFlags::NoAutoMnemonics);
 
     InsertSeparator(OString(), nPos++);
     sal_Int32 nStringCount = m_aSuggestions.getLength();
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index e6a93f27b62d..76469d7ca2b6 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -710,9 +710,9 @@ throw (css::uno::RuntimeException, std::exception)
     if ( mpMenu )
     {
         if ( bHide )
-            mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
+            mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() | MenuFlags::HideDisabledEntries );
         else
-            mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() & ~MENU_FLAG_HIDEDISABLEDENTRIES );
+            mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() & ~MenuFlags::HideDisabledEntries );
     }
 }
 
@@ -750,9 +750,9 @@ throw (css::uno::RuntimeException, std::exception)
     if ( mpMenu )
     {
         if ( !bEnable )
-            mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
+            mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() | MenuFlags::NoAutoMnemonics );
         else
-            mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() & ~MENU_FLAG_NOAUTOMNEMONICS );
+            mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() & ~MenuFlags::NoAutoMnemonics );
     }
 }
 
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 3ff87466a41f..227c7fe63cb4 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2848,9 +2848,9 @@ PopupMenu* Edit::CreatePopupMenu()
     PopupMenu* pPopup = new PopupMenu( ResId( SV_RESID_MENU_EDIT, *pResMgr ) );
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     if ( rStyleSettings.GetHideDisabledMenuItems() )
-        pPopup->SetMenuFlags( MENU_FLAG_HIDEDISABLEDENTRIES );
+        pPopup->SetMenuFlags( MenuFlags::HideDisabledEntries );
     else
-        pPopup->SetMenuFlags ( MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
+        pPopup->SetMenuFlags ( MenuFlags::AlwaysShowDisabledEntries );
     if ( rStyleSettings.GetAcceleratorsInContextMenus() )
     {
         pPopup->SetAccelKey( SV_MENU_EDIT_UNDO, vcl::KeyCode( KeyFuncType::UNDO ) );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index d2d45d7b9d8d..1f563b69f4f7 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -122,7 +122,7 @@ Menu::Menu()
       nTitleHeight(0),
       nEventId(0),
       mnHighlightedItemPos(ITEMPOS_INVALID),
-      nMenuFlags(0),
+      nMenuFlags(MenuFlags::NONE),
       nDefaultItem(0),
       nSelectedId(0),
       nImgOrChkPos(0),
@@ -1324,8 +1324,8 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
 
     // not allowed for menubar, as I do not know
     // whether a menu-entry will disappear or will appear
-    if (bVisible && !IsMenuBar() && (nMenuFlags & MENU_FLAG_HIDEDISABLEDENTRIES) &&
-        !(nMenuFlags & MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES))
+    if (bVisible && !IsMenuBar() && (nMenuFlags & MenuFlags::HideDisabledEntries) &&
+        !(nMenuFlags & MenuFlags::AlwaysShowDisabledEntries))
     {
         if( !pData ) // e.g. nPos == ITEMPOS_INVALID
             bVisible = false;
@@ -2953,17 +2953,17 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, Floa
     if ( !GetItemCount() )
         return 0;
 
-    // The flag MENU_FLAG_HIDEDISABLEDENTRIES is inherited.
+    // The flag MenuFlags::HideDisabledEntries is inherited.
     if ( pSFrom )
     {
-        if ( pSFrom->nMenuFlags & MENU_FLAG_HIDEDISABLEDENTRIES )
-            nMenuFlags |= MENU_FLAG_HIDEDISABLEDENTRIES;
+        if ( pSFrom->nMenuFlags & MenuFlags::HideDisabledEntries )
+            nMenuFlags |= MenuFlags::HideDisabledEntries;
         else
-            nMenuFlags &= ~MENU_FLAG_HIDEDISABLEDENTRIES;
+            nMenuFlags &= ~MenuFlags::HideDisabledEntries;
     }
     else
         // #102790# context menus shall never show disabled entries
-        nMenuFlags |= MENU_FLAG_HIDEDISABLEDENTRIES;
+        nMenuFlags |= MenuFlags::HideDisabledEntries;
 
     sal_uInt16 nVisibleEntries = ImplGetVisibleItemCount();
     if ( !nVisibleEntries )
@@ -2984,7 +2984,7 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, Floa
             ImplCallEventListeners(VCLEVENT_MENU_SUBMENUCHANGED, nPos);
         }
     }
-    else if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( nMenuFlags & MENU_FLAG_NOAUTOMNEMONICS ) )
+    else if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( nMenuFlags & MenuFlags::NoAutoMnemonics ) )
     {
         CreateAutoMnemonics();
     }
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index 699ece3e646c..6f2b2631bdef 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -48,7 +48,7 @@ struct MenuItemData
     vcl::KeyCode    aAccelKey;              // Accelerator-Key
     bool            bChecked;               // Checked
     bool            bEnabled;               // Enabled
-    bool            bVisible;               // Visible (note: this flag will not override MENU_FLAG_HIDEDISABLEDENTRIES when true)
+    bool            bVisible;               // Visible (note: this flag will not override MenuFlags::HideDisabledEntries when true)
     bool            bIsTemporary;           // Temporary inserted ('No selection possible')
     bool            bMirrorMode;
     long            nItemImageAngle;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index f6f3dab8790f..00445e64cec9 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1889,7 +1889,7 @@ void ToolBox::ImplExecuteCustomMenu()
 
         // make sure all disabled entries will be shown
         GetMenu()->SetMenuFlags(
-            GetMenu()->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
+            GetMenu()->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
 
         // toolbox might be destroyed during execute
         ImplDelData aDelData;