diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-28 13:49:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-29 08:48:08 +0200 |
| commit | b56dab6467223accb2f7448f0ce86c85f8ef7c09 (patch) | |
| tree | 1fe3d6d766f4dcd0e6cbbab9ae1180203726673e /vcl | |
| parent | 6c1cabe677f5eb24b465dd6e316c8c66df64bb29 (diff) | |
convert PRESENTATION constants to scoped enum
Change-Id: Ic7b0b1d433456f1a27a76314a5890b9ae7f70a69
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/wrkwin.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 78d0b24951dd..3977eee0fbd4 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -36,7 +36,7 @@ void WorkWindow::ImplInitWorkWindowData() { mnIcon = 0; // Should be removed in the next top level update - now in SystemWindow - mnPresentationFlags = 0; + mnPresentationFlags = PresentationFlags::NONE; mbPresentationMode = false; mbPresentationVisible = false; mbPresentationFull = false; @@ -157,12 +157,12 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr } } -void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags ) +void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags nFlags ) { return StartPresentationMode( bPresentation, nFlags, GetScreenNumber()); } -void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplayScreen ) +void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags nFlags, sal_Int32 nDisplayScreen ) { if ( !bPresentation == !mbPresentationMode ) return; @@ -174,18 +174,18 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s mbPresentationFull = mbFullScreenMode; mnPresentationFlags = nFlags; - if ( !(mnPresentationFlags & PRESENTATION_NOFULLSCREEN) ) + if ( !(mnPresentationFlags & PresentationFlags::NoFullScreen) ) ShowFullScreenMode( true, nDisplayScreen ); if ( !mbSysChild ) { - if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS ) + if ( mnPresentationFlags & PresentationFlags::HideAllApps ) mpWindowImpl->mpFrame->SetAlwaysOnTop( true ); - if ( !(mnPresentationFlags & PRESENTATION_NOAUTOSHOW) ) + if ( !(mnPresentationFlags & PresentationFlags::NoAutoShow) ) ToTop(); mpWindowImpl->mpFrame->StartPresentation( true ); } - if ( !(mnPresentationFlags & PRESENTATION_NOAUTOSHOW) ) + if ( !(mnPresentationFlags & PresentationFlags::NoAutoShow) ) Show(); } else @@ -194,7 +194,7 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s if ( !mbSysChild ) { mpWindowImpl->mpFrame->StartPresentation( false ); - if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS ) + if ( mnPresentationFlags & PresentationFlags::HideAllApps ) mpWindowImpl->mpFrame->SetAlwaysOnTop( false ); } ShowFullScreenMode( mbPresentationFull, nDisplayScreen ); @@ -202,7 +202,7 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s mbPresentationMode = false; mbPresentationVisible = false; mbPresentationFull = false; - mnPresentationFlags = 0; + mnPresentationFlags = PresentationFlags::NONE; } } |