make presentation spanning all screens work (bnc#758138)

This reverts an API "improvement" from 6ee5dfa150d408179e20a5525ff7ec46649e0e58
that tried to use -1 as the current screen/display but failed. The check
for nDisplayScreen being in range broke all-screens (which is
represented as last_screen+1 value, which is broken in its own way, as e.g.
the screen count can change). The same way -1 as the default value is broken,
as everywhere else invalid invalid screen number means spanning all screens.
The extra overloads without a default value should take care of that.

Change-Id: Ie118038eacacebc007c25860732d5904ad0de2b9

1 files changed, 10 insertions, 6 deletions

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 )