[Libreoffice-commits] core.git: include/vcl vcl/source

[Noel Grandin]

 include/vcl/wrkwin.hxx       |    2 +-
 vcl/source/window/wrkwin.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5c6c6ebd121a50b293e015d0aa6c0f1e4dc416ae
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed May 23 10:36:58 2018 +0200

    Revert "vcl: StartPresentationMode should be using a sal_uInt32.."
    
    This reverts commit 9321c560943330fbc76dacfebff67bd740fbc95b.
    
    This is just plain wrong. Both the call sites and the function that this
    method in turn calls want to use sal_Int32. It doesn't seem to cause any
    actual problems, but that's probably just lucky.
    
    Change-Id: Id77867094b9c7c209edd8b575c9203aee6515ff3
    Reviewed-on: https://gerrit.libreoffice.org/54691
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index e062a6c48090..89f240eea9b2 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -84,7 +84,7 @@ public:
 
     void            StartPresentationMode( bool   bPresentation,
                                            PresentationFlags nFlags,
-                                           sal_uInt32  nDisplayScreen );
+                                           sal_Int32  nDisplayScreen );
     /**
      @overload void StartPresentationMode( PresentationFlags nFlags, sal_uInt32 nDisplayScreen)
     */
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 7352f215a1b3..39d8395e7af8 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -160,7 +160,7 @@ void WorkWindow::StartPresentationMode( PresentationFlags nFlags )
     return StartPresentationMode( false/*bPresentation*/, nFlags, GetScreenNumber());
 }
 
-void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags nFlags, sal_uInt32 nDisplayScreen )
+void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags nFlags, sal_Int32 nDisplayScreen )
 {
     if ( !bPresentation == !mbPresentationMode )
         return;