summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-14 15:28:57 +0200
committerNoel Grandin <noel@peralex.com>2015-05-15 10:05:02 +0200
commitd93915b2aeabbde90b7eb539116b9be49e0d1a5c (patch)
tree0d28a83b9c4633b979c46d8ce6b6054748fa8d13 /sfx2
parent4f4cff08aac32db6fa580423b5fde661c8b0743a (diff)
conver MENU_FLAG_ constants to scoped enum
Change-Id: I969d99fa8881cc89601696a2d8621905a82b147b
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx2
-rw-r--r--sfx2/source/dialog/backingwindow.cxx2
-rw-r--r--sfx2/source/menu/mnumgr.cxx4
-rw-r--r--sfx2/source/menu/virtmenu.cxx6
4 files changed, 7 insertions, 7 deletions
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 );
}