Skip to content

Commit 7721b50

Browse files
Pilot-PirxPilot-Pirx
committed
Remove Help Cursor (#448)
* Remove Help Cursor * Additional files * Small changes (cherry picked from commit aa1eea1)
1 parent 9314d6f commit 7721b50

File tree

5 files changed

+97
-110
lines changed

5 files changed

+97
-110
lines changed

‎main/vcl/WinResTarget_vcl.mk‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#
2020
#**************************************************************
2121

22-
23-
2422
$(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
2523

2624
$(eval $(call gb_WinResTarget_set_include,vcl/src,\
@@ -67,7 +65,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
6765
vcl/win/source/src/tblselse.cur \
6866
vcl/win/source/src/asns.cur \
6967
vcl/win/source/src/crop.cur \
70-
vcl/win/source/src/help.cur \
7168
vcl/win/source/src/neswsize.cur \
7269
vcl/win/source/src/tblselsw.cur \
7370
vcl/win/source/src/asnswe.cur \

‎main/vcl/inc/vcl/ptrstyle.hxx‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
*
2020
*************************************************************/
2121

22-
23-
2422
#ifndef _VCL_PTRSTYLE_HXX
2523
#define _VCL_PTRSTYLE_HXX
2624

@@ -60,9 +58,9 @@ typedef sal_uInt16 PointerStyle;
6058
#define POINTER_HSIZEBAR ((PointerStyle)25)
6159
#define POINTER_VSIZEBAR ((PointerStyle)26)
6260
#define POINTER_HAND ((PointerStyle)27)
63-
#define POINTER_REFHAND ((PointerStyle)28)
64-
#define POINTER_PEN ((PointerStyle)29)
65-
#define POINTER_MAGNIFY ((PointerStyle)30)
61+
#define POINTER_REFHAND ((PointerStyle)28)
62+
#define POINTER_PEN ((PointerStyle)29)
63+
#define POINTER_MAGNIFY ((PointerStyle)30)
6664
#define POINTER_FILL ((PointerStyle)31)
6765
#define POINTER_ROTATE ((PointerStyle)32)
6866
#define POINTER_HSHEAR ((PointerStyle)33)
@@ -88,7 +86,7 @@ typedef sal_uInt16 PointerStyle;
8886
#define POINTER_DRAW_LINE ((PointerStyle)53)
8987
#define POINTER_DRAW_RECT ((PointerStyle)54)
9088
#define POINTER_DRAW_POLYGON ((PointerStyle)55)
91-
#define POINTER_DRAW_BEZIER ((PointerStyle)56)
89+
#define POINTER_DRAW_BEZIER ((PointerStyle)56)
9290
#define POINTER_DRAW_ARC ((PointerStyle)57)
9391
#define POINTER_DRAW_PIE ((PointerStyle)58)
9492
#define POINTER_DRAW_CIRCLECUT ((PointerStyle)59)
@@ -101,7 +99,7 @@ typedef sal_uInt16 PointerStyle;
10199
#define POINTER_DETECTIVE ((PointerStyle)66)
102100
#define POINTER_PIVOT_COL ((PointerStyle)67)
103101
#define POINTER_PIVOT_ROW ((PointerStyle)68)
104-
#define POINTER_PIVOT_FIELD ((PointerStyle)69)
102+
#define POINTER_PIVOT_FIELD ((PointerStyle)69)
105103
#define POINTER_CHAIN ((PointerStyle)70)
106104
#define POINTER_CHAIN_NOTALLOWED ((PointerStyle)71)
107105
#define POINTER_TIMEEVENT_MOVE ((PointerStyle)72)
@@ -116,23 +114,25 @@ typedef sal_uInt16 PointerStyle;
116114
#define POINTER_AUTOSCROLL_SE ((PointerStyle)81)
117115
#define POINTER_AUTOSCROLL_NS ((PointerStyle)82)
118116
#define POINTER_AUTOSCROLL_WE ((PointerStyle)83)
119-
#define POINTER_AUTOSCROLL_NSWE ((PointerStyle)84)
117+
#define POINTER_AUTOSCROLL_NSWE ((PointerStyle)84)
120118
#define POINTER_AIRBRUSH ((PointerStyle)85)
121119
#define POINTER_TEXT_VERTICAL ((PointerStyle)86)
122-
#define POINTER_PIVOT_DELETE ((PointerStyle)87)
120+
#define POINTER_PIVOT_DELETE ((PointerStyle)87)
123121

124122
// --> FME 2004-07-30 #i32329# Enhanced table selection
125-
#define POINTER_TAB_SELECT_S ((PointerStyle)88)
126-
#define POINTER_TAB_SELECT_E ((PointerStyle)89)
127-
#define POINTER_TAB_SELECT_SE ((PointerStyle)90)
128-
#define POINTER_TAB_SELECT_W ((PointerStyle)91)
129-
#define POINTER_TAB_SELECT_SW ((PointerStyle)92)
123+
#define POINTER_TAB_SELECT_S ((PointerStyle)88)
124+
#define POINTER_TAB_SELECT_E ((PointerStyle)89)
125+
#define POINTER_TAB_SELECT_SE ((PointerStyle)90)
126+
#define POINTER_TAB_SELECT_W ((PointerStyle)91)
127+
#define POINTER_TAB_SELECT_SW ((PointerStyle)92)
130128
// <--
131129

132130
// --> FME 2004-08-16 #i20119# Paintbrush tool
133-
#define POINTER_PAINTBRUSH ((PointerStyle)93)
131+
#define POINTER_PAINTBRUSH ((PointerStyle)93)
134132
// <--
135133

136-
#define POINTER_COUNT 94
134+
#define POINTER_COUNT 94
137135

138136
#endif // _VCL_PTRSTYLE_HXX
137+
138+
/* vim: set noet sw=4 ts=4: */

‎main/vcl/inc/win/salids.hrc‎

Lines changed: 81 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -23,92 +23,90 @@
2323
#define _SV_SALIDS_HRC
2424

2525
// Cursor
26-
#define SAL_RESID_POINTER_NULL 10000
27-
#ifndef W40ONLY
28-
#define SAL_RESID_POINTER_HELP 10001
29-
#endif
26+
#define SAL_RESID_POINTER_NULL 10000
27+
//#define SAL_RESID_POINTER_HELP 10001 // Help Cursor only needed for older Windows versions was removed in December 2025
3028
#ifndef WNT
31-
#define SAL_RESID_POINTER_HSIZE 10002
32-
#define SAL_RESID_POINTER_VSIZE 10003
33-
#define SAL_RESID_POINTER_NESWSIZE 10004
34-
#define SAL_RESID_POINTER_NWSESIZE 10005
29+
#define SAL_RESID_POINTER_HSIZE 10002
30+
#define SAL_RESID_POINTER_VSIZE 10003
31+
#define SAL_RESID_POINTER_NESWSIZE 10004
32+
#define SAL_RESID_POINTER_NWSESIZE 10005
3533
#endif
36-
#define SAL_RESID_POINTER_CROSS 10006
37-
#define SAL_RESID_POINTER_MOVE 10007
38-
#define SAL_RESID_POINTER_HSPLIT 10008
39-
#define SAL_RESID_POINTER_VSPLIT 10009
40-
#define SAL_RESID_POINTER_HSIZEBAR 10010
41-
#define SAL_RESID_POINTER_VSIZEBAR 10011
42-
#define SAL_RESID_POINTER_HAND 10012
43-
#define SAL_RESID_POINTER_REFHAND 10013
44-
#define SAL_RESID_POINTER_PEN 10014
45-
#define SAL_RESID_POINTER_MAGNIFY 10015
46-
#define SAL_RESID_POINTER_FILL 10016
47-
#define SAL_RESID_POINTER_ROTATE 10017
48-
#define SAL_RESID_POINTER_HSHEAR 10018
49-
#define SAL_RESID_POINTER_VSHEAR 10019
50-
#define SAL_RESID_POINTER_MIRROR 10020
51-
#define SAL_RESID_POINTER_CROOK 10021
52-
#define SAL_RESID_POINTER_CROP 10022
53-
#define SAL_RESID_POINTER_MOVEPOINT 10023
54-
#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT 10024
55-
#define SAL_RESID_POINTER_MOVEDATA 10025
56-
#define SAL_RESID_POINTER_COPYDATA 10026
57-
#define SAL_RESID_POINTER_LINKDATA 10027
58-
#define SAL_RESID_POINTER_MOVEDATALINK 10028
59-
#define SAL_RESID_POINTER_COPYDATALINK 10029
60-
#define SAL_RESID_POINTER_MOVEFILE 10030
61-
#define SAL_RESID_POINTER_COPYFILE 10031
62-
#define SAL_RESID_POINTER_LINKFILE 10032
63-
#define SAL_RESID_POINTER_MOVEFILELINK 10033
64-
#define SAL_RESID_POINTER_COPYFILELINK 10034
65-
#define SAL_RESID_POINTER_MOVEFILES 10035
66-
#define SAL_RESID_POINTER_COPYFILES 10036
67-
#define SAL_RESID_POINTER_NOTALLOWED 10037
68-
#define SAL_RESID_POINTER_DRAW_LINE 10038
69-
#define SAL_RESID_POINTER_DRAW_RECT 10039
70-
#define SAL_RESID_POINTER_DRAW_POLYGON 10040
71-
#define SAL_RESID_POINTER_DRAW_BEZIER 10041
72-
#define SAL_RESID_POINTER_DRAW_ARC 10042
73-
#define SAL_RESID_POINTER_DRAW_PIE 10043
74-
#define SAL_RESID_POINTER_DRAW_CIRCLECUT 10044
75-
#define SAL_RESID_POINTER_DRAW_ELLIPSE 10045
76-
#define SAL_RESID_POINTER_DRAW_FREEHAND 10046
77-
#define SAL_RESID_POINTER_DRAW_CONNECT 10047
78-
#define SAL_RESID_POINTER_DRAW_TEXT 10048
79-
#define SAL_RESID_POINTER_DRAW_CAPTION 10049
80-
#define SAL_RESID_POINTER_CHART 10050
81-
#define SAL_RESID_POINTER_DETECTIVE 10051
82-
#define SAL_RESID_POINTER_PIVOT_COL 10052
83-
#define SAL_RESID_POINTER_PIVOT_ROW 10053
84-
#define SAL_RESID_POINTER_PIVOT_FIELD 10054
85-
#define SAL_RESID_POINTER_CHAIN 10055
86-
#define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10056
87-
#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10057
88-
#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10058
89-
#define SAL_RESID_POINTER_AUTOSCROLL_N 10059
90-
#define SAL_RESID_POINTER_AUTOSCROLL_S 10060
91-
#define SAL_RESID_POINTER_AUTOSCROLL_W 10061
92-
#define SAL_RESID_POINTER_AUTOSCROLL_E 10062
93-
#define SAL_RESID_POINTER_AUTOSCROLL_NW 10063
94-
#define SAL_RESID_POINTER_AUTOSCROLL_NE 10064
95-
#define SAL_RESID_POINTER_AUTOSCROLL_SW 10065
96-
#define SAL_RESID_POINTER_AUTOSCROLL_SE 10066
97-
#define SAL_RESID_POINTER_AUTOSCROLL_NS 10067
98-
#define SAL_RESID_POINTER_AUTOSCROLL_WE 10068
99-
#define SAL_RESID_POINTER_AUTOSCROLL_NSWE 10069
100-
#define SAL_RESID_POINTER_AIRBRUSH 10070
101-
#define SAL_RESID_POINTER_TEXT_VERTICAL 10071
102-
#define SAL_RESID_POINTER_PIVOT_DELETE 10072
103-
#define SAL_RESID_POINTER_TAB_SELECT_S 10073
104-
#define SAL_RESID_POINTER_TAB_SELECT_E 10074
105-
#define SAL_RESID_POINTER_TAB_SELECT_SE 10075
106-
#define SAL_RESID_POINTER_TAB_SELECT_W 10076
107-
#define SAL_RESID_POINTER_TAB_SELECT_SW 10077
108-
#define SAL_RESID_POINTER_PAINTBRUSH 10078
34+
#define SAL_RESID_POINTER_CROSS 10006
35+
#define SAL_RESID_POINTER_MOVE 10007
36+
#define SAL_RESID_POINTER_HSPLIT 10008
37+
#define SAL_RESID_POINTER_VSPLIT 10009
38+
#define SAL_RESID_POINTER_HSIZEBAR 10010
39+
#define SAL_RESID_POINTER_VSIZEBAR 10011
40+
#define SAL_RESID_POINTER_HAND 10012
41+
#define SAL_RESID_POINTER_REFHAND 10013
42+
#define SAL_RESID_POINTER_PEN 10014
43+
#define SAL_RESID_POINTER_MAGNIFY 10015
44+
#define SAL_RESID_POINTER_FILL 10016
45+
#define SAL_RESID_POINTER_ROTATE 10017
46+
#define SAL_RESID_POINTER_HSHEAR 10018
47+
#define SAL_RESID_POINTER_VSHEAR 10019
48+
#define SAL_RESID_POINTER_MIRROR 10020
49+
#define SAL_RESID_POINTER_CROOK 10021
50+
#define SAL_RESID_POINTER_CROP 10022
51+
#define SAL_RESID_POINTER_MOVEPOINT 10023
52+
#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT 10024
53+
#define SAL_RESID_POINTER_MOVEDATA 10025
54+
#define SAL_RESID_POINTER_COPYDATA 10026
55+
#define SAL_RESID_POINTER_LINKDATA 10027
56+
#define SAL_RESID_POINTER_MOVEDATALINK 10028
57+
#define SAL_RESID_POINTER_COPYDATALINK 10029
58+
#define SAL_RESID_POINTER_MOVEFILE 10030
59+
#define SAL_RESID_POINTER_COPYFILE 10031
60+
#define SAL_RESID_POINTER_LINKFILE 10032
61+
#define SAL_RESID_POINTER_MOVEFILELINK 10033
62+
#define SAL_RESID_POINTER_COPYFILELINK 10034
63+
#define SAL_RESID_POINTER_MOVEFILES 10035
64+
#define SAL_RESID_POINTER_COPYFILES 10036
65+
#define SAL_RESID_POINTER_NOTALLOWED 10037
66+
#define SAL_RESID_POINTER_DRAW_LINE 10038
67+
#define SAL_RESID_POINTER_DRAW_RECT 10039
68+
#define SAL_RESID_POINTER_DRAW_POLYGON 10040
69+
#define SAL_RESID_POINTER_DRAW_BEZIER 10041
70+
#define SAL_RESID_POINTER_DRAW_ARC 10042
71+
#define SAL_RESID_POINTER_DRAW_PIE 10043
72+
#define SAL_RESID_POINTER_DRAW_CIRCLECUT 10044
73+
#define SAL_RESID_POINTER_DRAW_ELLIPSE 10045
74+
#define SAL_RESID_POINTER_DRAW_FREEHAND 10046
75+
#define SAL_RESID_POINTER_DRAW_CONNECT 10047
76+
#define SAL_RESID_POINTER_DRAW_TEXT 10048
77+
#define SAL_RESID_POINTER_DRAW_CAPTION 10049
78+
#define SAL_RESID_POINTER_CHART 10050
79+
#define SAL_RESID_POINTER_DETECTIVE 10051
80+
#define SAL_RESID_POINTER_PIVOT_COL 10052
81+
#define SAL_RESID_POINTER_PIVOT_ROW 10053
82+
#define SAL_RESID_POINTER_PIVOT_FIELD 10054
83+
#define SAL_RESID_POINTER_CHAIN 10055
84+
#define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10056
85+
#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10057
86+
#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10058
87+
#define SAL_RESID_POINTER_AUTOSCROLL_N 10059
88+
#define SAL_RESID_POINTER_AUTOSCROLL_S 10060
89+
#define SAL_RESID_POINTER_AUTOSCROLL_W 10061
90+
#define SAL_RESID_POINTER_AUTOSCROLL_E 10062
91+
#define SAL_RESID_POINTER_AUTOSCROLL_NW 10063
92+
#define SAL_RESID_POINTER_AUTOSCROLL_NE 10064
93+
#define SAL_RESID_POINTER_AUTOSCROLL_SW 10065
94+
#define SAL_RESID_POINTER_AUTOSCROLL_SE 10066
95+
#define SAL_RESID_POINTER_AUTOSCROLL_NS 10067
96+
#define SAL_RESID_POINTER_AUTOSCROLL_WE 10068
97+
#define SAL_RESID_POINTER_AUTOSCROLL_NSWE 10069
98+
#define SAL_RESID_POINTER_AIRBRUSH 10070
99+
#define SAL_RESID_POINTER_TEXT_VERTICAL 10071
100+
#define SAL_RESID_POINTER_PIVOT_DELETE 10072
101+
#define SAL_RESID_POINTER_TAB_SELECT_S 10073
102+
#define SAL_RESID_POINTER_TAB_SELECT_E 10074
103+
#define SAL_RESID_POINTER_TAB_SELECT_SE 10075
104+
#define SAL_RESID_POINTER_TAB_SELECT_W 10076
105+
#define SAL_RESID_POINTER_TAB_SELECT_SW 10077
106+
#define SAL_RESID_POINTER_PAINTBRUSH 10078
109107

110-
#define SAL_RESID_BITMAP_50 11000
108+
#define SAL_RESID_BITMAP_50 11000
111109

112-
#define SAL_RESID_ICON_DEFAULT 1
110+
#define SAL_RESID_ICON_DEFAULT 1
113111

114112
#endif // _SV_SALIDS_HRC

‎main/vcl/win/source/src/help.cur‎

-326 Bytes
Binary file not shown.

‎main/vcl/win/source/src/salsrc.rc‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,11 @@
1919
*
2020
*************************************************************/
2121

22-
23-
24-
// for WINVER
25-
#include <windows.h>
26-
2722
#ifndef _SV_SALIDS_HRC
2823
#include <win/salids.hrc>
2924
#endif
3025

3126
SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR
32-
#if ( WINVER < 0x0400 )
33-
SAL_RESID_POINTER_HELP CURSOR HELP.CUR
34-
#endif
3527
#ifndef WNT
3628
SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR
3729
SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR

0 commit comments

Comments
 (0)