diff options
| -rw-r--r-- | vcl/inc/vcl/wrkwin.hxx | 24 | ||||
| -rw-r--r-- | vcl/source/window/wrkwin.cxx | 16 |
2 files changed, 23 insertions, 17 deletions
diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx index e283400cd445..d151d1f12232 100644 --- a/vcl/inc/vcl/wrkwin.hxx +++ b/vcl/inc/vcl/wrkwin.hxx @@ -69,21 +69,23 @@ public: virtual sal_Bool Close(); - /** The default value of nDisplayScreen = -1 means "don't care" and - allows to backends to use any screen they like (most probably - the current one). - - NOTE: The default value cannot be 0, because 0 is a legitimate - Display Screen number. - */ - void ShowFullScreenMode( sal_Bool bFullScreenMode = sal_True, - sal_Int32 nDisplayScreen = -1 ); + void ShowFullScreenMode( sal_Bool bFullScreenMode, + sal_Int32 nDisplayScreen ); + /** + @overload Calls ShowFullScreenMode( bFullScreenMode, GetScreenNumber()). + */ + void ShowFullScreenMode( sal_Bool bFullScreenMode = sal_True ); void EndFullScreenMode() { ShowFullScreenMode( sal_False ); } sal_Bool IsFullScreenMode() const { return mbFullScreenMode; } + void StartPresentationMode( sal_Bool bPresentation, + sal_uInt16 nFlags, + sal_Int32 nDisplayScreen ); + /** + @overload Calls StartPresentationMode( bFullScreenMode, nFlags, GetScreenNumber()). + */ void StartPresentationMode( sal_Bool bPresentation = sal_True, - sal_uInt16 nFlags = 0, - sal_Int32 nDisplayScreen = 0 ); + sal_uInt16 nFlags = 0 ); void EndPresentationMode() { StartPresentationMode( sal_False ); } sal_Bool IsPresentationMode() const { return mbPresentationMode; } diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 1256f258a89f..cc5bade1a18e 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -151,17 +151,16 @@ WorkWindow::~WorkWindow() // ----------------------------------------------------------------------- +void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode ) +{ + return ShowFullScreenMode( bFullScreenMode, GetScreenNumber()); +} + void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDisplayScreen ) { if ( !mbFullScreenMode == !bFullScreenMode ) return; - if( (nDisplayScreen < -1) - || (nDisplayScreen >= static_cast<sal_Int32>(Application::GetScreenCount()) ) ) - { - nDisplayScreen = GetScreenNumber(); - } - mbFullScreenMode = bFullScreenMode != 0; if ( !mbSysChild ) { @@ -184,6 +183,11 @@ void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDispla // ----------------------------------------------------------------------- +void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags ) +{ + return StartPresentationMode( bPresentation, nFlags, GetScreenNumber()); +} + void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplayScreen ) { if ( !bPresentation == !mbPresentationMode ) |