[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - vcl/inc

[Matthias Seidel (via logerrit)]

 vcl/inc/unx/x11_cursors/ase_mask.h  |    1 +
 vcl/inc/unx/x11_cursors/null_curs.h |   10 +++++-----
 vcl/inc/unx/x11_cursors/null_mask.h |   10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 22838948d7f1682bc8f892ba02c489edd617f269
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Mon Apr 29 15:55:38 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Mon Apr 29 15:55:38 2019 +0000

    Fixed error introduced in my last commit.

diff --git a/vcl/inc/unx/x11_cursors/null_curs.h b/vcl/inc/unx/x11_cursors/null_curs.h
index f99e0543e691..13ed507f74c6 100644
--- a/vcl/inc/unx/x11_cursors/null_curs.h
+++ b/vcl/inc/unx/x11_cursors/null_curs.h
@@ -20,9 +20,9 @@
  *************************************************************/
 
 
-#define null_curs_width 4
-#define null_curs_height 4
-#define null_curs_x_hot 2
-#define null_curs_y_hot 2
+#define nullcurs_width 4
+#define nullcurs_height 4
+#define nullcurs_x_hot 2
+#define nullcurs_y_hot 2
 
-static const unsigned char null_curs_bits[] = {0x00,0x00};
+static const unsigned char nullcurs_bits[] = {0x00,0x00};
diff --git a/vcl/inc/unx/x11_cursors/null_mask.h b/vcl/inc/unx/x11_cursors/null_mask.h
index ea648d54026f..5e4d6841e104 100644
--- a/vcl/inc/unx/x11_cursors/null_mask.h
+++ b/vcl/inc/unx/x11_cursors/null_mask.h
@@ -20,9 +20,9 @@
  *************************************************************/
 
 
-#define null_mask_width 4
-#define null_mask_height 4
-#define null_mask_x_hot 2
-#define null_mask_y_hot 2
+#define nullmask_width 4
+#define nullmask_height 4
+#define nullmask_x_hot 2
+#define nullmask_y_hot 2
 
-static const unsigned char null_mask_bits[] = {0x00,0x00};
+static const unsigned char nullmask_bits[] = {0x00,0x00};
commit 9ac6e891a23c99f06794473e43d24ddc3ce9a3a6
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Mon Apr 29 15:49:19 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Mon Apr 29 15:49:19 2019 +0000

    Fixed missing line

diff --git a/vcl/inc/unx/x11_cursors/ase_mask.h b/vcl/inc/unx/x11_cursors/ase_mask.h
index 9c2a3c2e7e63..e1610cdc983f 100644
--- a/vcl/inc/unx/x11_cursors/ase_mask.h
+++ b/vcl/inc/unx/x11_cursors/ase_mask.h
@@ -57,3 +57,4 @@ static const unsigned char ase_mask_bits[] = {
     0x00,0x00,0x00,0x00,
     0x00,0x00,0x00,0x00,
     0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00};