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

[Noel Grandin (via logerrit)]

 include/vcl/window.hxx |    5 ++---
 vcl/inc/salframe.hxx   |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 5c6db303f5b7692c8e0e4bed5fa42a1303b71e7c
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Mon May 3 20:43:54 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue May 4 08:40:36 2021 +0200

    sal_uLong->sal_Int32 in PointerState
    
    Change-Id: I5b3ea673d1b89d6584ad4e4cc5ada927791eeb29
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115048
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 4675d4254b30..ce93f06598a6 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_WINDOW_HXX
 #define INCLUDED_VCL_WINDOW_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/outdev.hxx>
 #include <tools/link.hxx>
@@ -851,8 +850,8 @@ public:
 
     struct PointerState
     {
-        sal_uLong   mnState;    // the button state
-        Point   maPos;      // mouse position in output coordinates
+        sal_Int32 mnState;    // the button state
+        Point     maPos;      // mouse position in output coordinates
     };
     PointerState                        GetPointerState();
     bool                                IsMouseOver() const;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index f79ae07ce9a8..20eab00d7989 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -222,8 +222,8 @@ public:
     // get current modifier, button mask and mouse position
     struct SalPointerState
     {
-        sal_uLong   mnState;
-        Point   maPos;      // in frame coordinates
+        sal_Int32 mnState;
+        Point     maPos;      // in frame coordinates
     };
 
     virtual SalPointerState GetPointerState() = 0;