diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk index 8fe0b2a2c21..84d3bbf214a 100644 --- a/main/vcl/WinResTarget_vcl.mk +++ b/main/vcl/WinResTarget_vcl.mk @@ -19,8 +19,6 @@ # #************************************************************** - - $(eval $(call gb_WinResTarget_WinResTarget,vcl/src)) $(eval $(call gb_WinResTarget_set_include,vcl/src,\ @@ -67,7 +65,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ vcl/win/source/src/tblselse.cur \ vcl/win/source/src/asns.cur \ vcl/win/source/src/crop.cur \ - vcl/win/source/src/help.cur \ vcl/win/source/src/neswsize.cur \ vcl/win/source/src/tblselsw.cur \ vcl/win/source/src/asnswe.cur \ diff --git a/main/vcl/inc/vcl/ptrstyle.hxx b/main/vcl/inc/vcl/ptrstyle.hxx index 104deb0f82f..37aad6136a4 100644 --- a/main/vcl/inc/vcl/ptrstyle.hxx +++ b/main/vcl/inc/vcl/ptrstyle.hxx @@ -19,8 +19,6 @@ * *************************************************************/ - - #ifndef _VCL_PTRSTYLE_HXX #define _VCL_PTRSTYLE_HXX @@ -60,9 +58,9 @@ typedef sal_uInt16 PointerStyle; #define POINTER_HSIZEBAR ((PointerStyle)25) #define POINTER_VSIZEBAR ((PointerStyle)26) #define POINTER_HAND ((PointerStyle)27) -#define POINTER_REFHAND ((PointerStyle)28) -#define POINTER_PEN ((PointerStyle)29) -#define POINTER_MAGNIFY ((PointerStyle)30) +#define POINTER_REFHAND ((PointerStyle)28) +#define POINTER_PEN ((PointerStyle)29) +#define POINTER_MAGNIFY ((PointerStyle)30) #define POINTER_FILL ((PointerStyle)31) #define POINTER_ROTATE ((PointerStyle)32) #define POINTER_HSHEAR ((PointerStyle)33) @@ -88,7 +86,7 @@ typedef sal_uInt16 PointerStyle; #define POINTER_DRAW_LINE ((PointerStyle)53) #define POINTER_DRAW_RECT ((PointerStyle)54) #define POINTER_DRAW_POLYGON ((PointerStyle)55) -#define POINTER_DRAW_BEZIER ((PointerStyle)56) +#define POINTER_DRAW_BEZIER ((PointerStyle)56) #define POINTER_DRAW_ARC ((PointerStyle)57) #define POINTER_DRAW_PIE ((PointerStyle)58) #define POINTER_DRAW_CIRCLECUT ((PointerStyle)59) @@ -101,7 +99,7 @@ typedef sal_uInt16 PointerStyle; #define POINTER_DETECTIVE ((PointerStyle)66) #define POINTER_PIVOT_COL ((PointerStyle)67) #define POINTER_PIVOT_ROW ((PointerStyle)68) -#define POINTER_PIVOT_FIELD ((PointerStyle)69) +#define POINTER_PIVOT_FIELD ((PointerStyle)69) #define POINTER_CHAIN ((PointerStyle)70) #define POINTER_CHAIN_NOTALLOWED ((PointerStyle)71) #define POINTER_TIMEEVENT_MOVE ((PointerStyle)72) @@ -116,23 +114,25 @@ typedef sal_uInt16 PointerStyle; #define POINTER_AUTOSCROLL_SE ((PointerStyle)81) #define POINTER_AUTOSCROLL_NS ((PointerStyle)82) #define POINTER_AUTOSCROLL_WE ((PointerStyle)83) -#define POINTER_AUTOSCROLL_NSWE ((PointerStyle)84) +#define POINTER_AUTOSCROLL_NSWE ((PointerStyle)84) #define POINTER_AIRBRUSH ((PointerStyle)85) #define POINTER_TEXT_VERTICAL ((PointerStyle)86) -#define POINTER_PIVOT_DELETE ((PointerStyle)87) +#define POINTER_PIVOT_DELETE ((PointerStyle)87) // --> FME 2004-07-30 #i32329# Enhanced table selection -#define POINTER_TAB_SELECT_S ((PointerStyle)88) -#define POINTER_TAB_SELECT_E ((PointerStyle)89) -#define POINTER_TAB_SELECT_SE ((PointerStyle)90) -#define POINTER_TAB_SELECT_W ((PointerStyle)91) -#define POINTER_TAB_SELECT_SW ((PointerStyle)92) +#define POINTER_TAB_SELECT_S ((PointerStyle)88) +#define POINTER_TAB_SELECT_E ((PointerStyle)89) +#define POINTER_TAB_SELECT_SE ((PointerStyle)90) +#define POINTER_TAB_SELECT_W ((PointerStyle)91) +#define POINTER_TAB_SELECT_SW ((PointerStyle)92) // <-- // --> FME 2004-08-16 #i20119# Paintbrush tool -#define POINTER_PAINTBRUSH ((PointerStyle)93) +#define POINTER_PAINTBRUSH ((PointerStyle)93) // <-- -#define POINTER_COUNT 94 +#define POINTER_COUNT 94 #endif // _VCL_PTRSTYLE_HXX + +/* vim: set noet sw=4 ts=4: */ diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc index d8c9d1d798d..e8b0d203a8f 100644 --- a/main/vcl/inc/win/salids.hrc +++ b/main/vcl/inc/win/salids.hrc @@ -23,92 +23,90 @@ #define _SV_SALIDS_HRC // Cursor -#define SAL_RESID_POINTER_NULL 10000 -#ifndef W40ONLY -#define SAL_RESID_POINTER_HELP 10001 -#endif +#define SAL_RESID_POINTER_NULL 10000 +//#define SAL_RESID_POINTER_HELP 10001 // Help Cursor only needed for older Windows versions was removed in December 2025 #ifndef WNT -#define SAL_RESID_POINTER_HSIZE 10002 -#define SAL_RESID_POINTER_VSIZE 10003 -#define SAL_RESID_POINTER_NESWSIZE 10004 -#define SAL_RESID_POINTER_NWSESIZE 10005 +#define SAL_RESID_POINTER_HSIZE 10002 +#define SAL_RESID_POINTER_VSIZE 10003 +#define SAL_RESID_POINTER_NESWSIZE 10004 +#define SAL_RESID_POINTER_NWSESIZE 10005 #endif -#define SAL_RESID_POINTER_CROSS 10006 -#define SAL_RESID_POINTER_MOVE 10007 -#define SAL_RESID_POINTER_HSPLIT 10008 -#define SAL_RESID_POINTER_VSPLIT 10009 -#define SAL_RESID_POINTER_HSIZEBAR 10010 -#define SAL_RESID_POINTER_VSIZEBAR 10011 -#define SAL_RESID_POINTER_HAND 10012 -#define SAL_RESID_POINTER_REFHAND 10013 -#define SAL_RESID_POINTER_PEN 10014 -#define SAL_RESID_POINTER_MAGNIFY 10015 -#define SAL_RESID_POINTER_FILL 10016 -#define SAL_RESID_POINTER_ROTATE 10017 -#define SAL_RESID_POINTER_HSHEAR 10018 -#define SAL_RESID_POINTER_VSHEAR 10019 -#define SAL_RESID_POINTER_MIRROR 10020 -#define SAL_RESID_POINTER_CROOK 10021 -#define SAL_RESID_POINTER_CROP 10022 -#define SAL_RESID_POINTER_MOVEPOINT 10023 -#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT 10024 -#define SAL_RESID_POINTER_MOVEDATA 10025 -#define SAL_RESID_POINTER_COPYDATA 10026 -#define SAL_RESID_POINTER_LINKDATA 10027 -#define SAL_RESID_POINTER_MOVEDATALINK 10028 -#define SAL_RESID_POINTER_COPYDATALINK 10029 -#define SAL_RESID_POINTER_MOVEFILE 10030 -#define SAL_RESID_POINTER_COPYFILE 10031 -#define SAL_RESID_POINTER_LINKFILE 10032 -#define SAL_RESID_POINTER_MOVEFILELINK 10033 -#define SAL_RESID_POINTER_COPYFILELINK 10034 -#define SAL_RESID_POINTER_MOVEFILES 10035 -#define SAL_RESID_POINTER_COPYFILES 10036 -#define SAL_RESID_POINTER_NOTALLOWED 10037 -#define SAL_RESID_POINTER_DRAW_LINE 10038 -#define SAL_RESID_POINTER_DRAW_RECT 10039 -#define SAL_RESID_POINTER_DRAW_POLYGON 10040 -#define SAL_RESID_POINTER_DRAW_BEZIER 10041 -#define SAL_RESID_POINTER_DRAW_ARC 10042 -#define SAL_RESID_POINTER_DRAW_PIE 10043 -#define SAL_RESID_POINTER_DRAW_CIRCLECUT 10044 -#define SAL_RESID_POINTER_DRAW_ELLIPSE 10045 -#define SAL_RESID_POINTER_DRAW_FREEHAND 10046 -#define SAL_RESID_POINTER_DRAW_CONNECT 10047 -#define SAL_RESID_POINTER_DRAW_TEXT 10048 -#define SAL_RESID_POINTER_DRAW_CAPTION 10049 -#define SAL_RESID_POINTER_CHART 10050 -#define SAL_RESID_POINTER_DETECTIVE 10051 -#define SAL_RESID_POINTER_PIVOT_COL 10052 -#define SAL_RESID_POINTER_PIVOT_ROW 10053 -#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 -#define SAL_RESID_POINTER_AUTOSCROLL_E 10062 -#define SAL_RESID_POINTER_AUTOSCROLL_NW 10063 -#define SAL_RESID_POINTER_AUTOSCROLL_NE 10064 -#define SAL_RESID_POINTER_AUTOSCROLL_SW 10065 -#define SAL_RESID_POINTER_AUTOSCROLL_SE 10066 -#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 -#define SAL_RESID_POINTER_TAB_SELECT_E 10074 -#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_CROSS 10006 +#define SAL_RESID_POINTER_MOVE 10007 +#define SAL_RESID_POINTER_HSPLIT 10008 +#define SAL_RESID_POINTER_VSPLIT 10009 +#define SAL_RESID_POINTER_HSIZEBAR 10010 +#define SAL_RESID_POINTER_VSIZEBAR 10011 +#define SAL_RESID_POINTER_HAND 10012 +#define SAL_RESID_POINTER_REFHAND 10013 +#define SAL_RESID_POINTER_PEN 10014 +#define SAL_RESID_POINTER_MAGNIFY 10015 +#define SAL_RESID_POINTER_FILL 10016 +#define SAL_RESID_POINTER_ROTATE 10017 +#define SAL_RESID_POINTER_HSHEAR 10018 +#define SAL_RESID_POINTER_VSHEAR 10019 +#define SAL_RESID_POINTER_MIRROR 10020 +#define SAL_RESID_POINTER_CROOK 10021 +#define SAL_RESID_POINTER_CROP 10022 +#define SAL_RESID_POINTER_MOVEPOINT 10023 +#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT 10024 +#define SAL_RESID_POINTER_MOVEDATA 10025 +#define SAL_RESID_POINTER_COPYDATA 10026 +#define SAL_RESID_POINTER_LINKDATA 10027 +#define SAL_RESID_POINTER_MOVEDATALINK 10028 +#define SAL_RESID_POINTER_COPYDATALINK 10029 +#define SAL_RESID_POINTER_MOVEFILE 10030 +#define SAL_RESID_POINTER_COPYFILE 10031 +#define SAL_RESID_POINTER_LINKFILE 10032 +#define SAL_RESID_POINTER_MOVEFILELINK 10033 +#define SAL_RESID_POINTER_COPYFILELINK 10034 +#define SAL_RESID_POINTER_MOVEFILES 10035 +#define SAL_RESID_POINTER_COPYFILES 10036 +#define SAL_RESID_POINTER_NOTALLOWED 10037 +#define SAL_RESID_POINTER_DRAW_LINE 10038 +#define SAL_RESID_POINTER_DRAW_RECT 10039 +#define SAL_RESID_POINTER_DRAW_POLYGON 10040 +#define SAL_RESID_POINTER_DRAW_BEZIER 10041 +#define SAL_RESID_POINTER_DRAW_ARC 10042 +#define SAL_RESID_POINTER_DRAW_PIE 10043 +#define SAL_RESID_POINTER_DRAW_CIRCLECUT 10044 +#define SAL_RESID_POINTER_DRAW_ELLIPSE 10045 +#define SAL_RESID_POINTER_DRAW_FREEHAND 10046 +#define SAL_RESID_POINTER_DRAW_CONNECT 10047 +#define SAL_RESID_POINTER_DRAW_TEXT 10048 +#define SAL_RESID_POINTER_DRAW_CAPTION 10049 +#define SAL_RESID_POINTER_CHART 10050 +#define SAL_RESID_POINTER_DETECTIVE 10051 +#define SAL_RESID_POINTER_PIVOT_COL 10052 +#define SAL_RESID_POINTER_PIVOT_ROW 10053 +#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 +#define SAL_RESID_POINTER_AUTOSCROLL_E 10062 +#define SAL_RESID_POINTER_AUTOSCROLL_NW 10063 +#define SAL_RESID_POINTER_AUTOSCROLL_NE 10064 +#define SAL_RESID_POINTER_AUTOSCROLL_SW 10065 +#define SAL_RESID_POINTER_AUTOSCROLL_SE 10066 +#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 +#define SAL_RESID_POINTER_TAB_SELECT_E 10074 +#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_BITMAP_50 11000 +#define SAL_RESID_BITMAP_50 11000 -#define SAL_RESID_ICON_DEFAULT 1 +#define SAL_RESID_ICON_DEFAULT 1 #endif // _SV_SALIDS_HRC diff --git a/main/vcl/win/source/src/help.cur b/main/vcl/win/source/src/help.cur deleted file mode 100644 index 2a639baf3e1..00000000000 Binary files a/main/vcl/win/source/src/help.cur and /dev/null differ diff --git a/main/vcl/win/source/src/salsrc.rc b/main/vcl/win/source/src/salsrc.rc index 317bcf13bf2..720a88f8a6c 100644 --- a/main/vcl/win/source/src/salsrc.rc +++ b/main/vcl/win/source/src/salsrc.rc @@ -19,19 +19,11 @@ * *************************************************************/ - - -// for WINVER -#include - #ifndef _SV_SALIDS_HRC #include #endif SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR -#if ( WINVER < 0x0400 ) -SAL_RESID_POINTER_HELP CURSOR HELP.CUR -#endif #ifndef WNT SAL_RESID_POINTER_HSIZE CURSOR HSIZE.CUR SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR