This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 0c2a99de90 Further cursor improvements (Windows and OS/2)
0c2a99de90 is described below
commit 0c2a99de90092c91b59e4d3633269d2c2a474da5
Author: mseidel <[email protected]>
AuthorDate: Mon Dec 8 16:54:14 2025 +0100
Further cursor improvements (Windows and OS/2)
(cherry picked from commit 889334d1c79d6d3023cd1f302a5cdd5b5abf8dc1)
---
main/vcl/WinResTarget_vcl.mk | 1 -
main/vcl/inc/os2/salids.hrc | 150 +++++++++++++++++------------------
main/vcl/inc/win/salids.hrc | 2 +-
main/vcl/os2/source/src/makefile.mk | 138 ++++++++++++++++----------------
main/vcl/os2/source/src/salsrc.rc | 150 +++++++++++++++++------------------
main/vcl/os2/source/src/tblsele.ptr | Bin 1190 -> 1190 bytes
main/vcl/os2/source/src/tblsels.ptr | Bin 1190 -> 1190 bytes
main/vcl/os2/source/src/tblselse.ptr | Bin 1190 -> 1190 bytes
main/vcl/os2/source/src/tblselsw.ptr | Bin 1190 -> 1190 bytes
main/vcl/os2/source/src/tblselw.ptr | Bin 1190 -> 1190 bytes
main/vcl/win/source/src/cross.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/salsrc.rc | 1 -
main/vcl/win/source/src/tblsele.cur | Bin 326 -> 326 bytes
main/vcl/win/source/src/tblsels.cur | Bin 326 -> 326 bytes
main/vcl/win/source/src/tblselse.cur | Bin 326 -> 326 bytes
main/vcl/win/source/src/tblselsw.cur | Bin 326 -> 326 bytes
main/vcl/win/source/src/tblselw.cur | Bin 326 -> 326 bytes
17 files changed, 218 insertions(+), 224 deletions(-)
diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk
index 7b62cc22f2..0e043dcfdf 100644
--- a/main/vcl/WinResTarget_vcl.mk
+++ b/main/vcl/WinResTarget_vcl.mk
@@ -65,7 +65,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/crop.cur \
vcl/win/source/src/tblselsw.cur \
vcl/win/source/src/asnswe.cur \
- vcl/win/source/src/cross.cur \
vcl/win/source/src/hshear.cur \
vcl/win/source/src/notallow.cur \
vcl/win/source/src/tblselw.cur \
diff --git a/main/vcl/inc/os2/salids.hrc b/main/vcl/inc/os2/salids.hrc
index 3f4fa847a9..75c7fd7642 100644
--- a/main/vcl/inc/os2/salids.hrc
+++ b/main/vcl/inc/os2/salids.hrc
@@ -23,81 +23,81 @@
#define _SV_SALIDS_HRC
// Pointer
-#define SAL_RESID_POINTER_NULL 10000
-#define SAL_RESID_POINTER_HELP 10001
-#define SAL_RESID_POINTER_CROSS 10002
-#define SAL_RESID_POINTER_MOVE 10003
-#define SAL_RESID_POINTER_HSPLIT 10004
-#define SAL_RESID_POINTER_VSPLIT 10005
-#define SAL_RESID_POINTER_HSIZEBAR 10006
-#define SAL_RESID_POINTER_VSIZEBAR 10007
-#define SAL_RESID_POINTER_HAND 10008
-#define SAL_RESID_POINTER_REFHAND 10009
-#define SAL_RESID_POINTER_PEN 10010
-#define SAL_RESID_POINTER_MAGNIFY 10011
-#define SAL_RESID_POINTER_FILL 10012
-#define SAL_RESID_POINTER_ROTATE 10013
-#define SAL_RESID_POINTER_HSHEAR 10014
-#define SAL_RESID_POINTER_VSHEAR 10015
-#define SAL_RESID_POINTER_MIRROR 10016
-#define SAL_RESID_POINTER_CROOK 10017
-#define SAL_RESID_POINTER_CROP 10018
-#define SAL_RESID_POINTER_MOVEPOINT 10019
-#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT 10020
-#define SAL_RESID_POINTER_MOVEDATA 10021
-#define SAL_RESID_POINTER_COPYDATA 10022
-#define SAL_RESID_POINTER_LINKDATA 10023
-#define SAL_RESID_POINTER_MOVEDATALINK 10024
-#define SAL_RESID_POINTER_COPYDATALINK 10025
-#define SAL_RESID_POINTER_MOVEFILE 10026
-#define SAL_RESID_POINTER_COPYFILE 10027
-#define SAL_RESID_POINTER_LINKFILE 10028
-#define SAL_RESID_POINTER_MOVEFILELINK 10029
-#define SAL_RESID_POINTER_COPYFILELINK 10030
-#define SAL_RESID_POINTER_MOVEFILES 10031
-#define SAL_RESID_POINTER_COPYFILES 10032
-#define SAL_RESID_POINTER_DRAW_LINE 10033
-#define SAL_RESID_POINTER_DRAW_RECT 10034
-#define SAL_RESID_POINTER_DRAW_POLYGON 10035
-#define SAL_RESID_POINTER_DRAW_BEZIER 10036
-#define SAL_RESID_POINTER_DRAW_ARC 10037
-#define SAL_RESID_POINTER_DRAW_PIE 10038
-#define SAL_RESID_POINTER_DRAW_CIRCLECUT 10039
-#define SAL_RESID_POINTER_DRAW_ELLIPSE 10040
-#define SAL_RESID_POINTER_DRAW_FREEHAND 10041
-#define SAL_RESID_POINTER_DRAW_CONNECT 10042
-#define SAL_RESID_POINTER_DRAW_TEXT 10043
-#define SAL_RESID_POINTER_DRAW_CAPTION 10044
-#define SAL_RESID_POINTER_CHART 10045
-#define SAL_RESID_POINTER_DETECTIVE 10046
-#define SAL_RESID_POINTER_PIVOT_COL 10047
-#define SAL_RESID_POINTER_PIVOT_ROW 10048
-#define SAL_RESID_POINTER_PIVOT_FIELD 10049
-#define SAL_RESID_POINTER_CHAIN 10050
-#define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10051
-#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10052
-#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10053
-#define SAL_RESID_POINTER_AUTOSCROLL_N 10054
-#define SAL_RESID_POINTER_AUTOSCROLL_S 10055
-#define SAL_RESID_POINTER_AUTOSCROLL_W 10056
-#define SAL_RESID_POINTER_AUTOSCROLL_E 10057
-#define SAL_RESID_POINTER_AUTOSCROLL_NW 10058
-#define SAL_RESID_POINTER_AUTOSCROLL_NE 10059
-#define SAL_RESID_POINTER_AUTOSCROLL_SW 10060
-#define SAL_RESID_POINTER_AUTOSCROLL_SE 10061
-#define SAL_RESID_POINTER_AUTOSCROLL_NS 10062
-#define SAL_RESID_POINTER_AUTOSCROLL_WE 10063
-#define SAL_RESID_POINTER_AUTOSCROLL_NSWE 10064
-#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_NULL 10000
+#define SAL_RESID_POINTER_HELP 10001
+#define SAL_RESID_POINTER_CROSS 10002
+#define SAL_RESID_POINTER_MOVE 10003
+#define SAL_RESID_POINTER_HSPLIT 10004
+#define SAL_RESID_POINTER_VSPLIT 10005
+#define SAL_RESID_POINTER_HSIZEBAR 10006
+#define SAL_RESID_POINTER_VSIZEBAR 10007
+#define SAL_RESID_POINTER_HAND 10008
+#define SAL_RESID_POINTER_REFHAND 10009
+#define SAL_RESID_POINTER_PEN 10010
+#define SAL_RESID_POINTER_MAGNIFY 10011
+#define SAL_RESID_POINTER_FILL 10012
+#define SAL_RESID_POINTER_ROTATE 10013
+#define SAL_RESID_POINTER_HSHEAR 10014
+#define SAL_RESID_POINTER_VSHEAR 10015
+#define SAL_RESID_POINTER_MIRROR 10016
+#define SAL_RESID_POINTER_CROOK 10017
+#define SAL_RESID_POINTER_CROP 10018
+#define SAL_RESID_POINTER_MOVEPOINT 10019
+#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT 10020
+#define SAL_RESID_POINTER_MOVEDATA 10021
+#define SAL_RESID_POINTER_COPYDATA 10022
+#define SAL_RESID_POINTER_LINKDATA 10023
+#define SAL_RESID_POINTER_MOVEDATALINK 10024
+#define SAL_RESID_POINTER_COPYDATALINK 10025
+#define SAL_RESID_POINTER_MOVEFILE 10026
+#define SAL_RESID_POINTER_COPYFILE 10027
+#define SAL_RESID_POINTER_LINKFILE 10028
+#define SAL_RESID_POINTER_MOVEFILELINK 10029
+#define SAL_RESID_POINTER_COPYFILELINK 10030
+#define SAL_RESID_POINTER_MOVEFILES 10031
+#define SAL_RESID_POINTER_COPYFILES 10032
+#define SAL_RESID_POINTER_DRAW_LINE 10033
+#define SAL_RESID_POINTER_DRAW_RECT 10034
+#define SAL_RESID_POINTER_DRAW_POLYGON 10035
+#define SAL_RESID_POINTER_DRAW_BEZIER 10036
+#define SAL_RESID_POINTER_DRAW_ARC 10037
+#define SAL_RESID_POINTER_DRAW_PIE 10038
+#define SAL_RESID_POINTER_DRAW_CIRCLECUT 10039
+#define SAL_RESID_POINTER_DRAW_ELLIPSE 10040
+#define SAL_RESID_POINTER_DRAW_FREEHAND 10041
+#define SAL_RESID_POINTER_DRAW_CONNECT 10042
+#define SAL_RESID_POINTER_DRAW_TEXT 10043
+#define SAL_RESID_POINTER_DRAW_CAPTION 10044
+#define SAL_RESID_POINTER_CHART 10045
+#define SAL_RESID_POINTER_DETECTIVE 10046
+#define SAL_RESID_POINTER_PIVOT_COL 10047
+#define SAL_RESID_POINTER_PIVOT_ROW 10048
+#define SAL_RESID_POINTER_PIVOT_FIELD 10049
+#define SAL_RESID_POINTER_CHAIN 10050
+#define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10051
+#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10052
+#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10053
+#define SAL_RESID_POINTER_AUTOSCROLL_N 10054
+#define SAL_RESID_POINTER_AUTOSCROLL_S 10055
+#define SAL_RESID_POINTER_AUTOSCROLL_W 10056
+#define SAL_RESID_POINTER_AUTOSCROLL_E 10057
+#define SAL_RESID_POINTER_AUTOSCROLL_NW 10058
+#define SAL_RESID_POINTER_AUTOSCROLL_NE 10059
+#define SAL_RESID_POINTER_AUTOSCROLL_SW 10060
+#define SAL_RESID_POINTER_AUTOSCROLL_SE 10061
+#define SAL_RESID_POINTER_AUTOSCROLL_NS 10062
+#define SAL_RESID_POINTER_AUTOSCROLL_WE 10063
+#define SAL_RESID_POINTER_AUTOSCROLL_NSWE 10064
+#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_ICON_DEFAULT 1
+#define SAL_RESID_ICON_DEFAULT 1
#endif // _SV_SALIDS_HRC
diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc
index b7b893ee69..452d0de634 100644
--- a/main/vcl/inc/win/salids.hrc
+++ b/main/vcl/inc/win/salids.hrc
@@ -29,7 +29,7 @@
//#define SAL_RESID_POINTER_VSIZE 10003 //
"Vertical resize" cursor only needed for older Windows versions was removed in
December 2025
//#define SAL_RESID_POINTER_NESWSIZE 10004 // "Diagonal
resize NESW" cursor only needed for older Windows versions was removed in
December 2025
//#define SAL_RESID_POINTER_NWSESIZE 10005 // "Diagonal
resize NWSE" cursor only needed for older Windows versions was removed in
December 2025
-#define SAL_RESID_POINTER_CROSS 10006
+//#define SAL_RESID_POINTER_CROSS 10006 //
"Cross" cursor for older Windows versions was replaced in December 2025
//#define SAL_RESID_POINTER_MOVE 10007 // "Move"
cursor for older Windows versions was replaced in December 2025
#define SAL_RESID_POINTER_HSPLIT 10008
#define SAL_RESID_POINTER_VSPLIT 10009
diff --git a/main/vcl/os2/source/src/makefile.mk
b/main/vcl/os2/source/src/makefile.mk
index 0b6ef574ea..c44f010107 100644
--- a/main/vcl/os2/source/src/makefile.mk
+++ b/main/vcl/os2/source/src/makefile.mk
@@ -19,8 +19,6 @@
#
#**************************************************************
-
-
PRJ=..$/..$/..
PRJNAME=vcl
@@ -28,80 +26,80 @@ TARGET=salsrc
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile2.pmk
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile2.pmk
# --- Files --------------------------------------------------------
-RCDEPN= nullptr.ptr \
- help.ptr \
- cross.ptr \
- move.ptr \
- hsplit.ptr \
- vsplit.ptr \
- hsizebar.ptr \
- vsizebar.ptr \
- hand.ptr \
- refhand.ptr \
- pen.ptr \
- magnify.ptr \
- fill.ptr \
- rotate.ptr \
- hshear.ptr \
- vshear.ptr \
- mirror.ptr \
- crook.ptr \
- crop.ptr \
- movept.ptr \
- movebw.ptr \
- movedata.ptr \
- copydata.ptr \
- linkdata.ptr \
- movedlnk.ptr \
- copydlnk.ptr \
- movef.ptr \
- copyf.ptr \
- linkf.ptr \
- moveflnk.ptr \
- copyflnk.ptr \
- movef2.ptr \
- copyf2.ptr \
- dline.ptr \
- drect.ptr \
- dpolygon.ptr \
- dbezier.ptr \
- darc.ptr \
- dpie.ptr \
- dcirccut.ptr \
- dellipse.ptr \
- dfree.ptr \
- dconnect.ptr \
- dtext.ptr \
- dcapt.ptr \
- chart.ptr \
- detectiv.ptr \
- pivotcol.ptr \
- pivotrow.ptr \
- pivotfld.ptr \
- chain.ptr \
- chainnot.ptr \
- timemove.ptr \
- timesize.ptr \
- asn.ptr \
- ass.ptr \
- asw.ptr \
- ase.ptr \
- asnw.ptr \
- asne.ptr \
- assw.ptr \
- asse.ptr \
- asns.ptr \
- aswe.ptr \
- asnswe.ptr \
+RCDEPN= nullptr.ptr \
+ help.ptr \
+ cross.ptr \
+ move.ptr \
+ hsplit.ptr \
+ vsplit.ptr \
+ hsizebar.ptr \
+ vsizebar.ptr \
+ hand.ptr \
+ refhand.ptr \
+ pen.ptr \
+ magnify.ptr \
+ fill.ptr \
+ rotate.ptr \
+ hshear.ptr \
+ vshear.ptr \
+ mirror.ptr \
+ crook.ptr \
+ crop.ptr \
+ movept.ptr \
+ movebw.ptr \
+ movedata.ptr \
+ copydata.ptr \
+ linkdata.ptr \
+ movedlnk.ptr \
+ copydlnk.ptr \
+ movef.ptr \
+ copyf.ptr \
+ linkf.ptr \
+ moveflnk.ptr \
+ copyflnk.ptr \
+ movef2.ptr \
+ copyf2.ptr \
+ dline.ptr \
+ drect.ptr \
+ dpolygon.ptr \
+ dbezier.ptr \
+ darc.ptr \
+ dpie.ptr \
+ dcirccut.ptr \
+ dellipse.ptr \
+ dfree.ptr \
+ dconnect.ptr \
+ dtext.ptr \
+ dcapt.ptr \
+ chart.ptr \
+ detectiv.ptr \
+ pivotcol.ptr \
+ pivotrow.ptr \
+ pivotfld.ptr \
+ chain.ptr \
+ chainnot.ptr \
+ timemove.ptr \
+ timesize.ptr \
+ asn.ptr \
+ ass.ptr \
+ asw.ptr \
+ ase.ptr \
+ asnw.ptr \
+ asne.ptr \
+ assw.ptr \
+ asse.ptr \
+ asns.ptr \
+ aswe.ptr \
+ asnswe.ptr \
sd.ico
RCFILES= salsrc.rc
# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
+.INCLUDE : target.mk
diff --git a/main/vcl/os2/source/src/salsrc.rc
b/main/vcl/os2/source/src/salsrc.rc
index 6688b05966..6690d9bf5a 100644
--- a/main/vcl/os2/source/src/salsrc.rc
+++ b/main/vcl/os2/source/src/salsrc.rc
@@ -19,85 +19,83 @@
*
*************************************************************/
-
-
#ifndef _SV_SALIDS_HRC
#include <os2/salids.hrc>
#endif
-POINTER SAL_RESID_POINTER_NULL
NULLPTR.PTR
-POINTER SAL_RESID_POINTER_HELP HELP.PTR
-POINTER SAL_RESID_POINTER_CROSS
CROSS.PTR
-POINTER SAL_RESID_POINTER_MOVE MOVE.PTR
-POINTER SAL_RESID_POINTER_HSPLIT
HSPLIT.PTR
-POINTER SAL_RESID_POINTER_VSPLIT
VSPLIT.PTR
-POINTER SAL_RESID_POINTER_HSIZEBAR
HSIZEBAR.PTR
-POINTER SAL_RESID_POINTER_VSIZEBAR
VSIZEBAR.PTR
-POINTER SAL_RESID_POINTER_HAND HAND.PTR
-POINTER SAL_RESID_POINTER_REFHAND
REFHAND.PTR
-POINTER SAL_RESID_POINTER_PEN PEN.PTR
-POINTER SAL_RESID_POINTER_MAGNIFY
MAGNIFY.PTR
-POINTER SAL_RESID_POINTER_FILL FILL.PTR
-POINTER SAL_RESID_POINTER_ROTATE
ROTATE.PTR
-POINTER SAL_RESID_POINTER_HSHEAR
HSHEAR.PTR
-POINTER SAL_RESID_POINTER_VSHEAR
VSHEAR.PTR
-POINTER SAL_RESID_POINTER_MIRROR
MIRROR.PTR
-POINTER SAL_RESID_POINTER_CROOK
CROOK.PTR
-POINTER SAL_RESID_POINTER_CROP CROP.PTR
-POINTER SAL_RESID_POINTER_MOVEPOINT MOVEPT.PTR
-POINTER SAL_RESID_POINTER_MOVEBEZIERWEIGHT MOVEBW.PTR
-POINTER SAL_RESID_POINTER_MOVEDATA
MOVEDATA.PTR
-POINTER SAL_RESID_POINTER_COPYDATA
COPYDATA.PTR
-POINTER SAL_RESID_POINTER_LINKDATA
LINKDATA.PTR
-POINTER SAL_RESID_POINTER_MOVEDATALINK MOVEDLNK.PTR
-POINTER SAL_RESID_POINTER_COPYDATALINK COPYDLNK.PTR
-POINTER SAL_RESID_POINTER_MOVEFILE
MOVEF.PTR
-POINTER SAL_RESID_POINTER_COPYFILE
COPYF.PTR
-POINTER SAL_RESID_POINTER_LINKFILE
LINKF.PTR
-POINTER SAL_RESID_POINTER_MOVEFILELINK MOVEFLNK.PTR
-POINTER SAL_RESID_POINTER_COPYFILELINK COPYFLNK.PTR
-POINTER SAL_RESID_POINTER_MOVEFILES MOVEF2.PTR
-POINTER SAL_RESID_POINTER_COPYFILES COPYF2.PTR
-POINTER SAL_RESID_POINTER_DRAW_LINE DLINE.PTR
-POINTER SAL_RESID_POINTER_DRAW_RECT DRECT.PTR
-POINTER SAL_RESID_POINTER_DRAW_POLYGON DPOLYGON.PTR
-POINTER SAL_RESID_POINTER_DRAW_BEZIER DBEZIER.PTR
-POINTER SAL_RESID_POINTER_DRAW_ARC DARC.PTR
-POINTER SAL_RESID_POINTER_DRAW_PIE DPIE.PTR
-POINTER SAL_RESID_POINTER_DRAW_CIRCLECUT DCIRCCUT.PTR
-POINTER SAL_RESID_POINTER_DRAW_ELLIPSE DELLIPSE.PTR
-POINTER SAL_RESID_POINTER_DRAW_FREEHAND DFREE.PTR
-POINTER SAL_RESID_POINTER_DRAW_CONNECT DCONNECT.PTR
-POINTER SAL_RESID_POINTER_DRAW_TEXT DTEXT.PTR
-POINTER SAL_RESID_POINTER_DRAW_CAPTION DCAPT.PTR
-POINTER SAL_RESID_POINTER_CHART
CHART.PTR
-POINTER SAL_RESID_POINTER_DETECTIVE DETECTIV.PTR
-POINTER SAL_RESID_POINTER_PIVOT_COL PIVOTCOL.PTR
-POINTER SAL_RESID_POINTER_PIVOT_ROW PIVOTROW.PTR
-POINTER SAL_RESID_POINTER_PIVOT_FIELD PIVOTFLD.PTR
-POINTER SAL_RESID_POINTER_CHAIN
CHAIN.PTR
-POINTER SAL_RESID_POINTER_CHAIN_NOTALLOWED CHAINNOT.PTR
-POINTER SAL_RESID_POINTER_TIMEEVENT_MOVE TIMEMOVE.PTR
-POINTER SAL_RESID_POINTER_TIMEEVENT_SIZE TIMESIZE.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_N ASN.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_S ASS.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_W ASW.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_E ASE.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_NW ASNW.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_NE ASNE.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_SW ASSW.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_SE ASSE.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_NS ASNS.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_WE ASWE.PTR
-POINTER SAL_RESID_POINTER_AUTOSCROLL_NSWE ASNSWE.PTR
+POINTER SAL_RESID_POINTER_NULL
NULLPTR.PTR
+POINTER SAL_RESID_POINTER_HELP
HELP.PTR
+POINTER SAL_RESID_POINTER_CROSS
CROSS.PTR
+POINTER SAL_RESID_POINTER_MOVE
MOVE.PTR
+POINTER SAL_RESID_POINTER_HSPLIT
HSPLIT.PTR
+POINTER SAL_RESID_POINTER_VSPLIT
VSPLIT.PTR
+POINTER SAL_RESID_POINTER_HSIZEBAR
HSIZEBAR.PTR
+POINTER SAL_RESID_POINTER_VSIZEBAR
VSIZEBAR.PTR
+POINTER SAL_RESID_POINTER_HAND
HAND.PTR
+POINTER SAL_RESID_POINTER_REFHAND
REFHAND.PTR
+POINTER SAL_RESID_POINTER_PEN
PEN.PTR
+POINTER SAL_RESID_POINTER_MAGNIFY
MAGNIFY.PTR
+POINTER SAL_RESID_POINTER_FILL
FILL.PTR
+POINTER SAL_RESID_POINTER_ROTATE
ROTATE.PTR
+POINTER SAL_RESID_POINTER_HSHEAR
HSHEAR.PTR
+POINTER SAL_RESID_POINTER_VSHEAR
VSHEAR.PTR
+POINTER SAL_RESID_POINTER_MIRROR
MIRROR.PTR
+POINTER SAL_RESID_POINTER_CROOK
CROOK.PTR
+POINTER SAL_RESID_POINTER_CROP
CROP.PTR
+POINTER SAL_RESID_POINTER_MOVEPOINT
MOVEPT.PTR
+POINTER SAL_RESID_POINTER_MOVEBEZIERWEIGHT
MOVEBW.PTR
+POINTER SAL_RESID_POINTER_MOVEDATA
MOVEDATA.PTR
+POINTER SAL_RESID_POINTER_COPYDATA
COPYDATA.PTR
+POINTER SAL_RESID_POINTER_LINKDATA
LINKDATA.PTR
+POINTER SAL_RESID_POINTER_MOVEDATALINK
MOVEDLNK.PTR
+POINTER SAL_RESID_POINTER_COPYDATALINK
COPYDLNK.PTR
+POINTER SAL_RESID_POINTER_MOVEFILE
MOVEF.PTR
+POINTER SAL_RESID_POINTER_COPYFILE
COPYF.PTR
+POINTER SAL_RESID_POINTER_LINKFILE
LINKF.PTR
+POINTER SAL_RESID_POINTER_MOVEFILELINK
MOVEFLNK.PTR
+POINTER SAL_RESID_POINTER_COPYFILELINK
COPYFLNK.PTR
+POINTER SAL_RESID_POINTER_MOVEFILES
MOVEF2.PTR
+POINTER SAL_RESID_POINTER_COPYFILES
COPYF2.PTR
+POINTER SAL_RESID_POINTER_DRAW_LINE
DLINE.PTR
+POINTER SAL_RESID_POINTER_DRAW_RECT
DRECT.PTR
+POINTER SAL_RESID_POINTER_DRAW_POLYGON
DPOLYGON.PTR
+POINTER SAL_RESID_POINTER_DRAW_BEZIER
DBEZIER.PTR
+POINTER SAL_RESID_POINTER_DRAW_ARC
DARC.PTR
+POINTER SAL_RESID_POINTER_DRAW_PIE
DPIE.PTR
+POINTER SAL_RESID_POINTER_DRAW_CIRCLECUT
DCIRCCUT.PTR
+POINTER SAL_RESID_POINTER_DRAW_ELLIPSE
DELLIPSE.PTR
+POINTER SAL_RESID_POINTER_DRAW_FREEHAND
DFREE.PTR
+POINTER SAL_RESID_POINTER_DRAW_CONNECT
DCONNECT.PTR
+POINTER SAL_RESID_POINTER_DRAW_TEXT
DTEXT.PTR
+POINTER SAL_RESID_POINTER_DRAW_CAPTION
DCAPT.PTR
+POINTER SAL_RESID_POINTER_CHART
CHART.PTR
+POINTER SAL_RESID_POINTER_DETECTIVE
DETECTIV.PTR
+POINTER SAL_RESID_POINTER_PIVOT_COL
PIVOTCOL.PTR
+POINTER SAL_RESID_POINTER_PIVOT_ROW
PIVOTROW.PTR
+POINTER SAL_RESID_POINTER_PIVOT_FIELD
PIVOTFLD.PTR
+POINTER SAL_RESID_POINTER_CHAIN
CHAIN.PTR
+POINTER SAL_RESID_POINTER_CHAIN_NOTALLOWED
CHAINNOT.PTR
+POINTER SAL_RESID_POINTER_TIMEEVENT_MOVE
TIMEMOVE.PTR
+POINTER SAL_RESID_POINTER_TIMEEVENT_SIZE
TIMESIZE.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_N ASN.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_S ASS.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_W ASW.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_E ASE.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_NW ASNW.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_NE ASNE.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_SW ASSW.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_SE ASSE.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_NS ASNS.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_WE ASWE.PTR
+POINTER SAL_RESID_POINTER_AUTOSCROLL_NSWE
ASNSWE.PTR
-POINTER SAL_RESID_POINTER_AIRBRUSH AIRBRUSH.PTR
-POINTER SAL_RESID_POINTER_TEXT_VERTICAL VTEXT.PTR
-POINTER SAL_RESID_POINTER_TAB_SELECT_S TBLSELS.PTR
-POINTER SAL_RESID_POINTER_TAB_SELECT_E TBLSELE.PTR
-POINTER SAL_RESID_POINTER_TAB_SELECT_SE TBLSELSE.PTR
-POINTER SAL_RESID_POINTER_TAB_SELECT_W TBLSELW.PTR
-POINTER SAL_RESID_POINTER_TAB_SELECT_SW TBLSELSW.PTR
-POINTER SAL_RESID_POINTER_PAINTBRUSH PNTBRSH.PTR
+POINTER SAL_RESID_POINTER_AIRBRUSH
AIRBRUSH.PTR
+POINTER SAL_RESID_POINTER_TEXT_VERTICAL
VTEXT.PTR
+POINTER SAL_RESID_POINTER_TAB_SELECT_S
TBLSELS.PTR
+POINTER SAL_RESID_POINTER_TAB_SELECT_E
TBLSELE.PTR
+POINTER SAL_RESID_POINTER_TAB_SELECT_SE
TBLSELSE.PTR
+POINTER SAL_RESID_POINTER_TAB_SELECT_W
TBLSELW.PTR
+POINTER SAL_RESID_POINTER_TAB_SELECT_SW
TBLSELSW.PTR
+POINTER SAL_RESID_POINTER_PAINTBRUSH
PNTBRSH.PTR
-ICON SAL_RESID_ICON_DEFAULT
SD.ICO
+ICON SAL_RESID_ICON_DEFAULT SD.ICO
diff --git a/main/vcl/os2/source/src/tblsele.ptr
b/main/vcl/os2/source/src/tblsele.ptr
index ee2d2f0275..ddff735278 100644
Binary files a/main/vcl/os2/source/src/tblsele.ptr and
b/main/vcl/os2/source/src/tblsele.ptr differ
diff --git a/main/vcl/os2/source/src/tblsels.ptr
b/main/vcl/os2/source/src/tblsels.ptr
index 305ade0c23..1cb0f74e58 100644
Binary files a/main/vcl/os2/source/src/tblsels.ptr and
b/main/vcl/os2/source/src/tblsels.ptr differ
diff --git a/main/vcl/os2/source/src/tblselse.ptr
b/main/vcl/os2/source/src/tblselse.ptr
index d7b6c49b43..a23ddfda3c 100644
Binary files a/main/vcl/os2/source/src/tblselse.ptr and
b/main/vcl/os2/source/src/tblselse.ptr differ
diff --git a/main/vcl/os2/source/src/tblselsw.ptr
b/main/vcl/os2/source/src/tblselsw.ptr
index 1e9774474c..2abb28db22 100644
Binary files a/main/vcl/os2/source/src/tblselsw.ptr and
b/main/vcl/os2/source/src/tblselsw.ptr differ
diff --git a/main/vcl/os2/source/src/tblselw.ptr
b/main/vcl/os2/source/src/tblselw.ptr
index a429773b4d..59fce46f13 100644
Binary files a/main/vcl/os2/source/src/tblselw.ptr and
b/main/vcl/os2/source/src/tblselw.ptr differ
diff --git a/main/vcl/win/source/src/cross.cur
b/main/vcl/win/source/src/cross.cur
deleted file mode 100644
index 8fd9762386..0000000000
Binary files a/main/vcl/win/source/src/cross.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/salsrc.rc
b/main/vcl/win/source/src/salsrc.rc
index 6bb991fa24..a2f1aca08a 100644
--- a/main/vcl/win/source/src/salsrc.rc
+++ b/main/vcl/win/source/src/salsrc.rc
@@ -24,7 +24,6 @@
#endif
SAL_RESID_POINTER_NULL CURSOR nullptr.cur
-SAL_RESID_POINTER_CROSS CURSOR
cross.cur
SAL_RESID_POINTER_HSPLIT CURSOR hsplit.cur
SAL_RESID_POINTER_VSPLIT CURSOR vsplit.cur
SAL_RESID_POINTER_HSIZEBAR CURSOR hsizebar.cur
diff --git a/main/vcl/win/source/src/tblsele.cur
b/main/vcl/win/source/src/tblsele.cur
index 3683e20df1..8314841c25 100644
Binary files a/main/vcl/win/source/src/tblsele.cur and
b/main/vcl/win/source/src/tblsele.cur differ
diff --git a/main/vcl/win/source/src/tblsels.cur
b/main/vcl/win/source/src/tblsels.cur
index 007182d734..cb92ea198a 100644
Binary files a/main/vcl/win/source/src/tblsels.cur and
b/main/vcl/win/source/src/tblsels.cur differ
diff --git a/main/vcl/win/source/src/tblselse.cur
b/main/vcl/win/source/src/tblselse.cur
index 986f013950..5a0d7bd250 100644
Binary files a/main/vcl/win/source/src/tblselse.cur and
b/main/vcl/win/source/src/tblselse.cur differ
diff --git a/main/vcl/win/source/src/tblselsw.cur
b/main/vcl/win/source/src/tblselsw.cur
index adabba1a2a..940b372ff6 100644
Binary files a/main/vcl/win/source/src/tblselsw.cur and
b/main/vcl/win/source/src/tblselsw.cur differ
diff --git a/main/vcl/win/source/src/tblselw.cur
b/main/vcl/win/source/src/tblselw.cur
index a95eb85af4..5c60eecbf8 100644
Binary files a/main/vcl/win/source/src/tblselw.cur and
b/main/vcl/win/source/src/tblselw.cur differ
