remove the remaining unused mouse cursors

which are not used by us directly or aliases of published awt constants Change-Id: Ic4f009715d71a2f986b8ef8d64b4b2e64986bf3b
author: Caolán McNamara <caolanm@redhat.com> 2017-04-14 09:33:21 +0100
committer: Caolán McNamara <caolanm@redhat.com> 2017-04-14 10:27:04 +0100
commit: 32f34f0d1be9ea2c80772ba386b1df3a5a42d86d (patch)
tree: 47f373fec0a07b192d3e8adb2f41fed967c873bc
parent: 185bb1b6bb792d9d18b4934eacdda48cb551e355 (diff)
28 files changed, 20 insertions, 347 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 608d2bbc9ac4..5c3bcd0a4526 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -243,9 +243,7 @@ static const std::map <PointerStyle, OString> aPointerMap {
     { PointerStyle::NotAllowed, "not-allowed" },
     // DrawLine through DrawCaption
     // Chart, Detective, PivotCol, PivotRow, PivotField, Chain, ChainNotAllowed
-    // TimeEventMove, TimeEventSize
     // AutoScrollN through AutoScrollNSWE
-    // Airbrush
     { PointerStyle::TextVertical, "vertical-text" }
     // Pivot Delete, TabSelectS through TabSelectSW
     // PaintBrush, HideWhiteSpace, ShowWhiteSpace
diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index be95dfa81792..e2ae0238e301 100644
--- a/include/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
@@ -96,30 +96,26 @@ enum class PointerStyle
     PivotField         = css::awt::SystemPointer::PIVOT_FIELD,
     Chain              = css::awt::SystemPointer::CHAIN,
     ChainNotAllowed    = css::awt::SystemPointer::CHAIN_NOTALLOWED,
-    TimeEventMove      = 72,
-    TimeEventSize      = 73,
-    AutoScrollN        = 74,
-    AutoScrollS        = 75,
-    AutoScrollW        = 76,
-    AutoScrollE        = 77,
-    AutoScrollNW       = 78,
-    AutoScrollNE       = 79,
-    AutoScrollSW       = 80,
-    AutoScrollSE       = 81,
-    AutoScrollNS       = 82,
-    AutoScrollWE       = 83,
-    AutoScrollNSWE     = 84,
-    Airbrush           = 85,
-    TextVertical       = 86,
-    PivotDelete        = 87,
-    TabSelectS         = 88,
-    TabSelectE         = 89,
-    TabSelectSE        = 90,
-    TabSelectW         = 91,
-    TabSelectSW        = 92,
-    Paintbrush         = 93,
-    HideWhitespace     = 94,
-    ShowWhitespace     = 95,
+    AutoScrollN,
+    AutoScrollS,
+    AutoScrollW,
+    AutoScrollE,
+    AutoScrollNW,
+    AutoScrollNE,
+    AutoScrollSW,
+    AutoScrollSE,
+    AutoScrollNS,
+    AutoScrollWE,
+    AutoScrollNSWE,
+    TextVertical,
+    PivotDelete,
+    TabSelectS,
+    TabSelectE,
+    TabSelectSE,
+    TabSelectW,
+    TabSelectSW,
+    HideWhitespace,
+    ShowWhitespace,
     LAST               = ShowWhitespace,
 };
 
diff --git a/vcl/Package_osxres.mk b/vcl/Package_osxres.mk
index 224853f25993..10451fec779e 100644
--- a/vcl/Package_osxres.mk
+++ b/vcl/Package_osxres.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\
     MainMenu.nib/classes.nib \
     MainMenu.nib/info.nib \
     MainMenu.nib/keyedobjects.nib \
-    cursors/airbrush.png \
     cursors/ase.png \
     cursors/asn.png \
     cursors/asne.png \
@@ -72,15 +71,12 @@ $(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\
     cursors/pivotdel.png \
     cursors/pivotfld.png \
     cursors/pivotrow.png \
-    cursors/pntbrsh.png \
     cursors/rotate.png \
     cursors/tblsele.png \
     cursors/tblsels.png \
     cursors/tblselse.png \
     cursors/tblselsw.png \
     cursors/tblselw.png \
-    cursors/timemove.png \
-    cursors/timesize.png \
     cursors/vshear.png \
     cursors/vtext.png \
 ))
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index b3ad34fd63f6..f7195b432ae2 100644
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
     vcl/win/src/dpolygon.cur \
     vcl/win/src/movedlnk.cur \
     vcl/win/src/salsrc.rc \
-    vcl/win/src/airbrush.cur \
     vcl/win/src/copyf.cur \
     vcl/win/src/drect.cur \
     vcl/win/src/movef.cur \
@@ -66,10 +65,8 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
     vcl/win/src/asnw.cur \
     vcl/win/src/darc.cur \
     vcl/win/src/nullptr.cur \
-    vcl/win/src/timemove.cur \
     vcl/win/src/ass.cur \
     vcl/win/src/dbezier.cur \
-    vcl/win/src/timesize.cur \
     vcl/win/src/asse.cur \
     vcl/win/src/dcapt.cur \
     vcl/win/src/vshear.cur \
@@ -92,7 +89,6 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
     vcl/win/src/vtext.cur \
     vcl/win/src/chainnot.cur \
     vcl/win/src/dfree.cur \
-    vcl/win/src/pntbrsh.cur \
     vcl/win/src/chart.cur \
     vcl/win/src/dline.cur \
     vcl/win/src/movebw.cur \
diff --git a/vcl/inc/unx/x11_cursors/airbrush_curs.h b/vcl/inc/unx/x11_cursors/airbrush_curs.h
deleted file mode 100644
index 038e56ebbac4..000000000000
--- a/vcl/inc/unx/x11_cursors/airbrush_curs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define airbrush_curs_width 32
-#define airbrush_curs_height 32
-#define airbrush_curs_x_hot 5
-#define airbrush_curs_y_hot 22
-static unsigned char airbrush_curs_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
- 0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
- 0xcc,0x07,0x00,0x00,0xb4,0x03,0x00,0x00,0x10,0x01,0x00,0x00,0x88,0x00,0x00,
- 0x00,0x44,0x00,0x00,0x00,0x62,0x60,0x00,0x00,0x91,0x10,0x00,0x80,0x88,0x10,
- 0x00,0x40,0x04,0x09,0x00,0x40,0x02,0x06,0x00,0xa0,0x01,0x00,0x00,0x60,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/airbrush_mask.h b/vcl/inc/unx/x11_cursors/airbrush_mask.h
deleted file mode 100644
index cc92822251c5..000000000000
--- a/vcl/inc/unx/x11_cursors/airbrush_mask.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define airbrush_mask_width 32
-#define airbrush_mask_height 32
-#define airbrush_mask_x_hot 5
-#define airbrush_mask_y_hot 22
-static unsigned char airbrush_mask_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
- 0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
- 0xcc,0x07,0x00,0x00,0xf4,0x03,0x00,0x00,0xf0,0x01,0x00,0x00,0xf8,0x00,0x00,
- 0x00,0x7c,0x00,0x00,0x00,0x7e,0x60,0x00,0x00,0x9f,0x10,0x00,0x80,0x8f,0x10,
- 0x00,0xc0,0x07,0x09,0x00,0xc0,0x03,0x06,0x00,0xe0,0x01,0x00,0x00,0x60,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/paintbrush_curs.h b/vcl/inc/unx/x11_cursors/paintbrush_curs.h
deleted file mode 100644
index fdaa4225d6f2..000000000000
--- a/vcl/inc/unx/x11_cursors/paintbrush_curs.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define paintbrush_curs_width 16
-#define paintbrush_curs_height 16
-#define paintbrush_curs_x_hot 0
-#define paintbrush_curs_y_hot 10
-static unsigned char paintbrush_curs_bits[] = {
-   0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x90, 0x80, 0xcb, 0x60, 0x64,
-   0x90, 0x34, 0x08, 0x19, 0x06, 0x22, 0x11, 0x24, 0x09, 0x18, 0x46, 0x14,
-   0x24, 0x0a, 0x18, 0x05, 0x90, 0x02, 0xe0, 0x01 };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/paintbrush_mask.h b/vcl/inc/unx/x11_cursors/paintbrush_mask.h
deleted file mode 100644
index 8304dfbfbab3..000000000000
--- a/vcl/inc/unx/x11_cursors/paintbrush_mask.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define paintbrush_mask_width 16
-#define paintbrush_mask_height 16
-static unsigned char paintbrush_mask_bits[] = {
-   0x00, 0x80, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xf0, 0x80, 0xfb, 0xe0, 0x7f,
-   0xf0, 0x3f, 0xf8, 0x1f, 0xfe, 0x3f, 0xff, 0x3f, 0xff, 0x1f, 0xfe, 0x1f,
-   0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01 };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/salcursors.h b/vcl/inc/unx/x11_cursors/salcursors.h
index 627352f9ef4c..5ab22720ef5f 100644
--- a/vcl/inc/unx/x11_cursors/salcursors.h
+++ b/vcl/inc/unx/x11_cursors/salcursors.h
@@ -104,11 +104,6 @@
 #include "unx/x11_cursors/chainnot_curs.h"
 #include "unx/x11_cursors/chainnot_mask.h"
 
-#include "unx/x11_cursors/timemove_curs.h"
-#include "unx/x11_cursors/timemove_mask.h"
-#include "unx/x11_cursors/timesize_curs.h"
-#include "unx/x11_cursors/timesize_mask.h"
-
 #include "unx/x11_cursors/ase_curs.h"
 #include "unx/x11_cursors/ase_mask.h"
 #include "unx/x11_cursors/asn_curs.h"
@@ -134,8 +129,6 @@
 #include "unx/x11_cursors/null_curs.h"
 #include "unx/x11_cursors/null_mask.h"
 
-#include "unx/x11_cursors/airbrush_curs.h"
-#include "unx/x11_cursors/airbrush_mask.h"
 #include "unx/x11_cursors/fill_curs.h"
 #include "unx/x11_cursors/fill_mask.h"
 #include "unx/x11_cursors/vertcurs_curs.h"
@@ -150,8 +143,6 @@
 #include "unx/x11_cursors/tblselw_mask.h"
 #include "unx/x11_cursors/tblselsw_curs.h"
 #include "unx/x11_cursors/tblselsw_mask.h"
-#include "unx/x11_cursors/paintbrush_curs.h"
-#include "unx/x11_cursors/paintbrush_mask.h"
 #include "unx/x11_cursors/wshide_curs.h"
 #include "unx/x11_cursors/wshide_mask.h"
 #include "unx/x11_cursors/wsshow_curs.h"
diff --git a/vcl/inc/unx/x11_cursors/timemove_curs.h b/vcl/inc/unx/x11_cursors/timemove_curs.h
deleted file mode 100644
index 835781f1b5d8..000000000000
--- a/vcl/inc/unx/x11_cursors/timemove_curs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define timemove_curs_width 32
-#define timemove_curs_height 32
-#define timemove_curs_x_hot 16
-#define timemove_curs_y_hot 16
-static unsigned char timemove_curs_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,
- 0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0xff,0xff,0x01,
- 0x00,0x01,0x01,0x01,0x00,0x01,0x01,0x01,0x00,0x01,0x01,0x01,0x00,0xff,0xff,
- 0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0xc0,
- 0x07,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/timemove_mask.h b/vcl/inc/unx/x11_cursors/timemove_mask.h
deleted file mode 100644
index 966c2852009e..000000000000
--- a/vcl/inc/unx/x11_cursors/timemove_mask.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define timemove_mask_width 32
-#define timemove_mask_height 32
-#define timemove_mask_x_hot 16
-#define timemove_mask_y_hot 16
-static unsigned char timemove_mask_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,
- 0xc0,0x07,0x00,0x00,0x80,0x03,0x00,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,
- 0x03,0x80,0xff,0xff,0x03,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,
- 0x0f,0x00,0x00,0xc0,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/timesize_curs.h b/vcl/inc/unx/x11_cursors/timesize_curs.h
deleted file mode 100644
index 6a1076640537..000000000000
--- a/vcl/inc/unx/x11_cursors/timesize_curs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define timesize_curs_width 32
-#define timesize_curs_height 32
-#define timesize_curs_x_hot 16
-#define timesize_curs_y_hot 16
-static unsigned char timesize_curs_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
- 0x01,0x01,0x01,0x00,0x81,0x03,0x01,0x00,0xc1,0x07,0x01,0x00,0x01,0x01,0x01,
- 0x00,0x01,0x01,0x01,0x00,0x01,0x01,0x01,0x00,0xff,0xff,0x01,0x00,0x00,0x01,
- 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0xc0,0x07,0x00,0x00,0x80,
- 0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/timesize_mask.h b/vcl/inc/unx/x11_cursors/timesize_mask.h
deleted file mode 100644
index 857c09fcdb13..000000000000
--- a/vcl/inc/unx/x11_cursors/timesize_mask.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define timesize_mask_width 32
-#define timesize_mask_height 32
-#define timesize_mask_x_hot 16
-#define timesize_mask_y_hot 16
-static unsigned char timesize_mask_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
- 0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,
- 0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,
- 0x03,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,0xc0,
- 0x07,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index e1d85b0f0a85..092a24b5225b 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -63,8 +63,6 @@
 #define SAL_RESID_POINTER_PIVOT_FIELD               10054
 #define SAL_RESID_POINTER_CHAIN                     10055
 #define SAL_RESID_POINTER_CHAIN_NOTALLOWED          10056
-#define SAL_RESID_POINTER_TIMEEVENT_MOVE            10057
-#define SAL_RESID_POINTER_TIMEEVENT_SIZE            10058
 #define SAL_RESID_POINTER_AUTOSCROLL_N              10059
 #define SAL_RESID_POINTER_AUTOSCROLL_S              10060
 #define SAL_RESID_POINTER_AUTOSCROLL_W              10061
@@ -76,7 +74,6 @@
 #define SAL_RESID_POINTER_AUTOSCROLL_NS             10067
 #define SAL_RESID_POINTER_AUTOSCROLL_WE             10068
 #define SAL_RESID_POINTER_AUTOSCROLL_NSWE           10069
-#define SAL_RESID_POINTER_AIRBRUSH                  10070
 #define SAL_RESID_POINTER_TEXT_VERTICAL             10071
 #define SAL_RESID_POINTER_PIVOT_DELETE              10072
 #define SAL_RESID_POINTER_TAB_SELECT_S              10073
@@ -84,7 +81,6 @@
 #define SAL_RESID_POINTER_TAB_SELECT_SE             10075
 #define SAL_RESID_POINTER_TAB_SELECT_W              10076
 #define SAL_RESID_POINTER_TAB_SELECT_SW             10077
-#define SAL_RESID_POINTER_PAINTBRUSH                10078
 #define SAL_RESID_POINTER_HIDEWHITESPACE            10079
 #define SAL_RESID_POINTER_SHOWWHITESPACE            10080
 
diff --git a/vcl/osx/res/cursors/airbrush.png b/vcl/osx/res/cursors/airbrush.png
deleted file mode 100644
index 7ec780c4f9f9..000000000000
--- a/vcl/osx/res/cursors/airbrush.png
+++ /dev/null
diff --git a/vcl/osx/res/cursors/pntbrsh.png b/vcl/osx/res/cursors/pntbrsh.png
deleted file mode 100644
index ec8d799f66c2..000000000000
--- a/vcl/osx/res/cursors/pntbrsh.png
+++ /dev/null
diff --git a/vcl/osx/res/cursors/timemove.png b/vcl/osx/res/cursors/timemove.png
deleted file mode 100644
index 3dae038a2011..000000000000
--- a/vcl/osx/res/cursors/timemove.png
+++ /dev/null
diff --git a/vcl/osx/res/cursors/timesize.png b/vcl/osx/res/cursors/timesize.png
deleted file mode 100644
index 22178c9b8d0e..000000000000
--- a/vcl/osx/res/cursors/timesize.png
+++ /dev/null
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 549e1cf882b8..de139319e8bd 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -185,8 +185,6 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
 { "pivotfld", { 8, 7 } }, //PointerStyle::PivotField
 { "chain", { 0, 2 } }, //PointerStyle::Chain
 { "chainnot", { 2, 2 } }, //PointerStyle::ChainNotAllowed
-{ "timemove", { 16, 16 } }, //PointerStyle::TimeEventMove
-{ "timesize", { 16, 17 } }, //PointerStyle::TimeEventSize
 { "asn", { 16, 12 } }, //PointerStyle::AutoScrollN
 { "ass", { 15, 19 } }, //PointerStyle::AutoScrollS
 { "asw", { 12, 15 } }, //PointerStyle::AutoScrollW
@@ -198,7 +196,6 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
 { "asns", { 15, 15 } }, //PointerStyle::AutoScrollNS
 { "aswe", { 15, 15 } }, //PointerStyle::AutoScrollWE
 { "asnswe", { 15, 15 } }, //PointerStyle::AutoScrollNSWE
-{ "airbrush", { 5, 22 } }, //PointerStyle::Airbrush
 { "vtext", { 15, 15 } }, //PointerStyle::TextVertical
 { "pivotdel", { 18, 15 } }, //PointerStyle::PivotDelete
 { "tblsels", { 15, 30 } }, //PointerStyle::TabSelectS
@@ -206,7 +203,6 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
 { "tblselse", { 30, 30 } }, //PointerStyle::TabSelectSE
 { "tblselw", { 1, 16 } }, //PointerStyle::TabSelectW
 { "tblselsw", { 1, 30 } }, //PointerStyle::TabSelectSW
-{ "pntbrsh", { 9, 16 } }, //PointerStyle::Paintbrush
 { "wshide", { 16, 16 } }, //PointerStyle::HideWhitespace
 { "wsshow", { 16, 16 } } //PointerStyle::ShowWhitespace
 };
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 80c28f90fe76..3372fa54dae4 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1771,12 +1771,6 @@ Cursor SalDisplay::GetPointer( PointerStyle ePointerStyle )
         case PointerStyle::ChainNotAllowed:
             MAKE_CURSOR( chainnot_ );
             break;
-        case PointerStyle::TimeEventMove:
-            MAKE_CURSOR( timemove_ );
-            break;
-        case PointerStyle::TimeEventSize:
-            MAKE_CURSOR( timesize_ );
-            break;
         case PointerStyle::AutoScrollN:
             MAKE_CURSOR(asn_ );
             break;
@@ -1810,9 +1804,6 @@ Cursor SalDisplay::GetPointer( PointerStyle ePointerStyle )
         case PointerStyle::AutoScrollNSWE:
             MAKE_CURSOR( asnswe_ );
             break;
-        case PointerStyle::Airbrush:
-            MAKE_CURSOR( airbrush_ );
-            break;
         case PointerStyle::TextVertical:
             MAKE_CURSOR( vertcurs_ );
             break;
@@ -1834,11 +1825,6 @@ Cursor SalDisplay::GetPointer( PointerStyle ePointerStyle )
             MAKE_CURSOR( tblselsw_ );
             break;
 
-        // #i20119# Paintbrush tool
-        case PointerStyle::Paintbrush:
-            MAKE_CURSOR( paintbrush_ );
-            break;
-
         case PointerStyle::HideWhitespace:
             MAKE_CURSOR( hidewhitespace_ );
             break;
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index 0a3429717f51..966d0b779c9d 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -349,8 +349,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
             MAKE_CURSOR( PointerStyle::PivotDelete, pivotdel_ );
             MAKE_CURSOR( PointerStyle::Chain, chain_ );
             MAKE_CURSOR( PointerStyle::ChainNotAllowed, chainnot_ );
-            MAKE_CURSOR( PointerStyle::TimeEventMove, timemove_ );
-            MAKE_CURSOR( PointerStyle::TimeEventSize, timesize_ );
             MAKE_CURSOR( PointerStyle::AutoScrollN, asn_ );
             MAKE_CURSOR( PointerStyle::AutoScrollS, ass_ );
             MAKE_CURSOR( PointerStyle::AutoScrollW, asw_ );
@@ -362,7 +360,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
             MAKE_CURSOR( PointerStyle::AutoScrollNS, asns_ );
             MAKE_CURSOR( PointerStyle::AutoScrollWE, aswe_ );
             MAKE_CURSOR( PointerStyle::AutoScrollNSWE, asnswe_ );
-            MAKE_CURSOR( PointerStyle::Airbrush, airbrush_ );
             MAKE_CURSOR( PointerStyle::TextVertical, vertcurs_ );
 
             // #i32329#
@@ -372,9 +369,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
             MAKE_CURSOR( PointerStyle::TabSelectW, tblselw_ );
             MAKE_CURSOR( PointerStyle::TabSelectSW, tblselsw_ );
 
-            // #i20119#
-            MAKE_CURSOR( PointerStyle::Paintbrush, paintbrush_ );
-
             MAKE_CURSOR( PointerStyle::HideWhitespace, hidewhitespace_ );
             MAKE_CURSOR( PointerStyle::ShowWhitespace, showwhitespace_ );
 
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 12311ad1289e..40d46705a9a5 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -312,8 +312,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
             MAKE_CURSOR( PointerStyle::PivotDelete, pivotdel_ );
             MAKE_CURSOR( PointerStyle::Chain, chain_ );
             MAKE_CURSOR( PointerStyle::ChainNotAllowed, chainnot_ );
-            MAKE_CURSOR( PointerStyle::TimeEventMove, timemove_ );
-            MAKE_CURSOR( PointerStyle::TimeEventSize, timesize_ );
             MAKE_CURSOR( PointerStyle::AutoScrollN, asn_ );
             MAKE_CURSOR( PointerStyle::AutoScrollS, ass_ );
             MAKE_CURSOR( PointerStyle::AutoScrollW, asw_ );
@@ -325,7 +323,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
             MAKE_CURSOR( PointerStyle::AutoScrollNS, asns_ );
             MAKE_CURSOR( PointerStyle::AutoScrollWE, aswe_ );
             MAKE_CURSOR( PointerStyle::AutoScrollNSWE, asnswe_ );
-            MAKE_CURSOR( PointerStyle::Airbrush, airbrush_ );
             MAKE_CURSOR( PointerStyle::TextVertical, vertcurs_ );
 
             // #i32329#
@@ -335,9 +332,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
             MAKE_CURSOR( PointerStyle::TabSelectW, tblselw_ );
             MAKE_CURSOR( PointerStyle::TabSelectSW, tblselsw_ );
 
-            // #i20119#
-            MAKE_CURSOR( PointerStyle::Paintbrush, paintbrush_ );
-
             MAKE_CURSOR( PointerStyle::HideWhitespace, hidewhitespace_ );
             MAKE_CURSOR( PointerStyle::ShowWhitespace, showwhitespace_ );
 
diff --git a/vcl/win/src/airbrush.cur b/vcl/win/src/airbrush.cur
deleted file mode 100644
index f6a684e6fcbd..000000000000
--- a/vcl/win/src/airbrush.cur
+++ /dev/null
diff --git a/vcl/win/src/pntbrsh.cur b/vcl/win/src/pntbrsh.cur
deleted file mode 100644
index 517d114237c1..000000000000
--- a/vcl/win/src/pntbrsh.cur
+++ /dev/null
diff --git a/vcl/win/src/salsrc.rc b/vcl/win/src/salsrc.rc
index c45935c59594..a4c5cf574e6a 100644
--- a/vcl/win/src/salsrc.rc
+++ b/vcl/win/src/salsrc.rc
@@ -62,8 +62,6 @@ SAL_RESID_POINTER_PIVOT_FIELD           CURSOR          pivotfld.cur
 SAL_RESID_POINTER_PIVOT_DELETE          CURSOR          pivotdel.cur
 SAL_RESID_POINTER_CHAIN                 CURSOR          chain.cur
 SAL_RESID_POINTER_CHAIN_NOTALLOWED      CURSOR          chainnot.cur
-SAL_RESID_POINTER_TIMEEVENT_MOVE        CURSOR          timemove.cur
-SAL_RESID_POINTER_TIMEEVENT_SIZE        CURSOR          timesize.cur
 SAL_RESID_POINTER_AUTOSCROLL_N          CURSOR          asn.cur
 SAL_RESID_POINTER_AUTOSCROLL_S          CURSOR          ass.cur
 SAL_RESID_POINTER_AUTOSCROLL_W          CURSOR          asw.cur
@@ -75,14 +73,12 @@ SAL_RESID_POINTER_AUTOSCROLL_SE         CURSOR          asse.cur
 SAL_RESID_POINTER_AUTOSCROLL_NS         CURSOR          asns.cur
 SAL_RESID_POINTER_AUTOSCROLL_WE         CURSOR          aswe.cur
 SAL_RESID_POINTER_AUTOSCROLL_NSWE       CURSOR          asnswe.cur
-SAL_RESID_POINTER_AIRBRUSH              CURSOR          airbrush.cur
 SAL_RESID_POINTER_TEXT_VERTICAL         CURSOR          vtext.cur
 SAL_RESID_POINTER_TAB_SELECT_S          CURSOR          tblsels.cur
 SAL_RESID_POINTER_TAB_SELECT_E          CURSOR          tblsele.cur
 SAL_RESID_POINTER_TAB_SELECT_SE         CURSOR          tblselse.cur
 SAL_RESID_POINTER_TAB_SELECT_W          CURSOR          tblselw.cur
 SAL_RESID_POINTER_TAB_SELECT_SW         CURSOR          tblselsw.cur
-SAL_RESID_POINTER_PAINTBRUSH            CURSOR          pntbrsh.cur
 SAL_RESID_POINTER_HIDEWHITESPACE        CURSOR          wshide.cur
 SAL_RESID_POINTER_SHOWWHITESPACE        CURSOR          wsshow.cur
 
diff --git a/vcl/win/src/timemove.cur b/vcl/win/src/timemove.cur
deleted file mode 100644
index 319b6edc5774..000000000000
--- a/vcl/win/src/timemove.cur
+++ /dev/null
diff --git a/vcl/win/src/timesize.cur b/vcl/win/src/timesize.cur
deleted file mode 100644
index 1ec23de05b71..000000000000
--- a/vcl/win/src/timesize.cur
+++ /dev/null
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 6d3f99bf3e5b..1a12c416a21c 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2117,8 +2117,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
     { nullptr, nullptr, SAL_RESID_POINTER_PIVOT_FIELD },        // POINTER_PIVOT_FIELD
     { nullptr, nullptr, SAL_RESID_POINTER_CHAIN },              // POINTER_CHAIN
     { nullptr, nullptr, SAL_RESID_POINTER_CHAIN_NOTALLOWED },   // POINTER_CHAIN_NOTALLOWED
-    { nullptr, nullptr, SAL_RESID_POINTER_TIMEEVENT_MOVE },     // POINTER_TIMEEVENT_MOVE
-    { nullptr, nullptr, SAL_RESID_POINTER_TIMEEVENT_SIZE },     // POINTER_TIMEEVENT_SIZE
     { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_N },       // POINTER_AUTOSCROLL_N
     { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_S },       // POINTER_AUTOSCROLL_S
     { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_W },       // POINTER_AUTOSCROLL_W
@@ -2130,7 +2128,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
     { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_NS },      // POINTER_AUTOSCROLL_NS
     { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_WE },      // POINTER_AUTOSCROLL_WE
     { nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_NSWE },    // POINTER_AUTOSCROLL_NSWE
-    { nullptr, nullptr, SAL_RESID_POINTER_AIRBRUSH },           // POINTER_AIRBRUSH
     { nullptr, nullptr, SAL_RESID_POINTER_TEXT_VERTICAL },      // POINTER_TEXT_VERTICAL
     { nullptr, nullptr, SAL_RESID_POINTER_PIVOT_DELETE },       // POINTER_PIVOT_DELETE
 
@@ -2141,9 +2138,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
     { nullptr, nullptr, SAL_RESID_POINTER_TAB_SELECT_W },       // POINTER_TAB_SELECT_W
     { nullptr, nullptr, SAL_RESID_POINTER_TAB_SELECT_SW },      // POINTER_TAB_SELECT_SW
 
-     // #i20119#
-    { nullptr, nullptr, SAL_RESID_POINTER_PAINTBRUSH },         // POINTER_PAINTBRUSH
-
     { nullptr, nullptr, SAL_RESID_POINTER_HIDEWHITESPACE },     // POINTER_HIDEWHITESPACE
     { nullptr, nullptr, SAL_RESID_POINTER_SHOWWHITESPACE }      // POINTER_UNHIDEWHITESPACE
     };
author	Caolán McNamara <caolanm@redhat.com>	2017-04-14 09:33:21 +0100
committer	Caolán McNamara <caolanm@redhat.com>	2017-04-14 10:27:04 +0100
commit	32f34f0d1be9ea2c80772ba386b1df3a5a42d86d (patch)
tree	47f373fec0a07b192d3e8adb2f41fed967c873bc
parent	185bb1b6bb792d9d18b4934eacdda48cb551e355 (diff)