vcl/inc/unx/x11_cursors/null_curs.h | 1 - vcl/inc/unx/x11_cursors/null_mask.h | 1 - vcl/unx/generic/app/saldisp.cxx | 3 +++ vcl/unx/gtk/gtkdata.cxx | 3 +++ vcl/unx/gtk3/gtk3gtkdata.cxx | 5 ++++- 5 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit ad955de670c822c5462990ef36a35608eac88480 Author: Thorsten Behrens <[email protected]> Date: Thu Mar 1 14:57:58 2018 +0100 WaE: -Wunused-variable Change-Id: I58f012ddc2c5030b0e3e215b9cab4e89abf06c2b Reviewed-on: https://gerrit.libreoffice.org/57066 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/vcl/inc/unx/x11_cursors/null_curs.h b/vcl/inc/unx/x11_cursors/null_curs.h index d74b462cba9b..ebeee4e6ffc5 100644 --- a/vcl/inc/unx/x11_cursors/null_curs.h +++ b/vcl/inc/unx/x11_cursors/null_curs.h @@ -20,6 +20,5 @@ #define nullcurs_height 4 #define nullcurs_x_hot 2 #define nullcurs_y_hot 2 -static unsigned char nullcurs_bits[] = { 0x00, 0x00, 0x00, 0x00 }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/x11_cursors/null_mask.h b/vcl/inc/unx/x11_cursors/null_mask.h index bc23e9c9729b..71f08a94afcf 100644 --- a/vcl/inc/unx/x11_cursors/null_mask.h +++ b/vcl/inc/unx/x11_cursors/null_mask.h @@ -18,6 +18,5 @@ */ #define nullmask_width 4 #define nullmask_height 4 -static unsigned char nullmask_bits[] = { 0x00, 0x00, 0x00, 0x00 }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index dff49c8e8b7c..ddce3f81da27 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -1494,6 +1494,9 @@ KeySym SalDisplay::GetKeySym( XKeyEvent *pEvent, } // Pointer +static unsigned char nullmask_bits[] = { 0x00, 0x00, 0x00, 0x00 }; +static unsigned char nullcurs_bits[] = { 0x00, 0x00, 0x00, 0x00 }; + #define MAKE_BITMAP( name ) \ XCreateBitmapFromData( pDisp_, \ DefaultRootWindow( pDisp_ ), \ diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx index 7c9a3d1e0fbc..689fa071ce5b 100644 --- a/vcl/unx/gtk/gtkdata.cxx +++ b/vcl/unx/gtk/gtkdata.cxx @@ -245,6 +245,9 @@ GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap, &aBlack, &aWhite, nXHot, nYHot); } +static unsigned char nullmask_bits[] = { 0x00, 0x00, 0x00, 0x00 }; +static unsigned char nullcurs_bits[] = { 0x00, 0x00, 0x00, 0x00 }; + #define MAKE_CURSOR( vcl_name, name ) \ case vcl_name: \ pCursor = getFromXBM( name##curs##_bits, name##mask##_bits, \ diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index fd5b47f0b626..024dac2a5014 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -213,7 +213,10 @@ GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap, return cursor; } -#define MAKE_CURSOR( vcl_name, name ) \ +static unsigned char nullmask_bits[] = { 0x00, 0x00, 0x00, 0x00 }; +static unsigned char nullcurs_bits[] = { 0x00, 0x00, 0x00, 0x00 }; + +#define MAKE_CURSOR( vcl_name, name ) \ case vcl_name: \ pCursor = getFromXBM( name##curs##_bits, name##mask##_bits, \ name##curs_width, name##curs_height, \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
