diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-01-15 01:24:38 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-16 09:28:29 +0000 |
| commit | 955b18d41866508dd0d69704991c03d7d9479e5d (patch) | |
| tree | 12864d0282a53ba66059bb558d4f72561e979200 /vcl/source/window | |
| parent | 8d151e0e55e1945bc5f633dc916372a3ea27a16d (diff) | |
vcl: second part of fix for fdo#43458 - get xrandr / y positioning right
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/wrkwin.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 08af25cd0891..822f97953de8 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -178,15 +178,15 @@ WorkWindow::~WorkWindow() // ----------------------------------------------------------------------- -void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDisplay ) +void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDisplayScreen ) { if ( !mbFullScreenMode == !bFullScreenMode ) return; - if( (nDisplay < 0) - || (nDisplay >= static_cast<sal_Int32>(Application::GetScreenCount()) ) ) + if( (nDisplayScreen < 0) + || (nDisplayScreen >= static_cast<sal_Int32>(Application::GetScreenCount()) ) ) { - nDisplay = GetScreenNumber(); + nDisplayScreen = GetScreenNumber(); } mbFullScreenMode = bFullScreenMode != 0; @@ -205,13 +205,13 @@ void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDispla } mpWindowImpl->mpFrameWindow->mpWindowImpl->mbWaitSystemResize = sal_True; - ImplGetFrame()->ShowFullScreen( bFullScreenMode, nDisplay ); + ImplGetFrame()->ShowFullScreen( bFullScreenMode, nDisplayScreen ); } } // ----------------------------------------------------------------------- -void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplay ) +void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplayScreen ) { if ( !bPresentation == !mbPresentationMode ) return; @@ -224,7 +224,7 @@ void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlag mnPresentationFlags = nFlags; if ( !(mnPresentationFlags & PRESENTATION_NOFULLSCREEN) ) - ShowFullScreenMode( sal_True, nDisplay ); + ShowFullScreenMode( sal_True, nDisplayScreen ); if ( !mbSysChild ) { if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS ) @@ -246,7 +246,7 @@ void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlag if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS ) mpWindowImpl->mpFrame->SetAlwaysOnTop( sal_False ); } - ShowFullScreenMode( mbPresentationFull, nDisplay ); + ShowFullScreenMode( mbPresentationFull, nDisplayScreen ); mbPresentationMode = sal_False; mbPresentationVisible = sal_False; |