Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions main/vcl/WinResTarget_vcl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#
#**************************************************************



$(eval $(call gb_WinResTarget_WinResTarget,vcl/src))

$(eval $(call gb_WinResTarget_set_include,vcl/src,\
Expand Down Expand Up @@ -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 \
Expand Down
163 changes: 80 additions & 83 deletions main/vcl/inc/win/salids.hrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,92 +23,89 @@
#define _SV_SALIDS_HRC

// Cursor
#define SAL_RESID_POINTER_NULL 10000
#ifndef W40ONLY
#define SAL_RESID_POINTER_HELP 10001
Comment thread
Pilot-Pirx marked this conversation as resolved.
#endif
#define SAL_RESID_POINTER_NULL 10000
#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
Binary file removed main/vcl/win/source/src/help.cur
Binary file not shown.
8 changes: 0 additions & 8 deletions main/vcl/win/source/src/salsrc.rc
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,11 @@
*
*************************************************************/



// for WINVER
#include <windows.h>

#ifndef _SV_SALIDS_HRC
#include <win/salids.hrc>
#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
Expand Down