diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-14 15:28:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-15 10:05:02 +0200 |
| commit | d93915b2aeabbde90b7eb539116b9be49e0d1a5c (patch) | |
| tree | 0d28a83b9c4633b979c46d8ce6b6054748fa8d13 /framework | |
| parent | 4f4cff08aac32db6fa580423b5fde661c8b0743a (diff) | |
conver MENU_FLAG_ constants to scoped enum
Change-Id: I969d99fa8881cc89601696a2d8621905a82b147b
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/menumanager.cxx | 6 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 6 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
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 ); |