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

[Stephan Bergmann (via logerrit)]

 include/vcl/sysdata.hxx                  |    3 +--
 vcl/unx/generic/gdi/cairo_xlib_cairo.hxx |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0c765dedffa2c0ee9e6daeb54d8d477b71a56e61
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Nov 1 21:55:18 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Nov 2 10:05:29 2020 +0100

    Better types for SystemGraphicsData::hDrawable, cairo::X11SysData::hDrawable
    
    Both apparently only hold X11 Drawable values.  But include/vcl/sysdata.hxx does
    not include the X11 include files that would define Drawable, so use sal_uIntPtr
    there, which is also used for other similar SystemEnvData and SystemParentData
    aWindow members there.
    
    Change-Id: Ia136ad1937e2009eb409c3ef8cc41dc81bd338a4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105156
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index a792296581e9..3abf92b55640 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_SYSDATA_HXX
 
 #include <sal/types.h>
-#include <tools/long.hxx>
 
 #ifdef MACOSX
 // predeclare the native classes to avoid header/include problems
@@ -138,7 +137,7 @@ struct SystemGraphicsData
     CGContextRef    rCGContext;     // CoreGraphics graphic context
 #elif defined( UNX )
     void*           pDisplay;       // the relevant display connection
-    tools::Long            hDrawable;      // a drawable
+    sal_uIntPtr     hDrawable;      // a drawable
     void*           pVisual;        // the visual in use
     int             nScreen;        // the current screen of the drawable
     void*           pXRenderFormat; // render format for drawable
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index d578d7b14852..398522c1594d 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -38,7 +38,7 @@ namespace cairo {
         explicit X11SysData( const SystemEnvData& );
 
         void*   pDisplay;       // the relevant display connection
-        tools::Long    hDrawable;      // a drawable
+        Drawable hDrawable;     // a drawable
         void*   pVisual;        // the visual in use
         int nScreen;        // the current screen of the drawable
         void*   pRenderFormat;  // render format for drawable