diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-21 12:48:36 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-05 20:32:52 -0500 |
| commit | 3472060f08317a615abce293a136f1a358e506c3 (patch) | |
| tree | 1a76f0a239c51af840150a153d310d23940ac83f /sfx2 | |
| parent | f372a783d7c3f35b6411e6c7a0b648f73d5248e1 (diff) | |
convert MENUBAR_MODE constants to scoped enum
Change-Id: Ie4cda46d02e82cca1710603cfb3af379c702d9d7
(cherry picked from commit 5b248f1348260f953686b20621255aece57358fe)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/backingcomp.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 5c0b6ff6d0d6..cf02dd9489ba 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -410,7 +410,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f if (pParent && pParent->IsFullScreenMode()) { pParent->ShowFullScreenMode(false); - pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL); + pParent->SetMenuBarMode(MenuBarMode::Normal); } // create the menu bar for the backing component diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index fc8dbae2d294..8119842b38a6 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2913,7 +2913,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) } } pWork->ShowFullScreenMode( bNewFullScreenMode ); - pWork->SetMenuBarMode( bNewFullScreenMode ? MENUBAR_MODE_HIDE : MENUBAR_MODE_NORMAL ); + pWork->SetMenuBarMode( bNewFullScreenMode ? MenuBarMode::Hide : MenuBarMode::Normal ); GetFrame().GetWorkWindow_Impl()->SetFullScreen_Impl( bNewFullScreenMode ); if ( !pItem ) rReq.AppendItem( SfxBoolItem( SID_WIN_FULLSCREEN, bNewFullScreenMode ) ); |