This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-move
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/Pilot-Pirx-move by this push:
new 3d0c2c216d Also replace Hand cursors
3d0c2c216d is described below
commit 3d0c2c216d71d49e34dbf26a08d65c3434942032
Author: mseidel <[email protected]>
AuthorDate: Sat Dec 6 10:28:46 2025 +0100
Also replace Hand cursors
---
main/vcl/WinResTarget_vcl.mk | 2 --
main/vcl/inc/win/salids.hrc | 10 +++++-----
main/vcl/win/source/src/hand.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/refhand.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/salsrc.rc | 2 --
main/vcl/win/source/window/salframe.cxx | 4 ++--
6 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk
index 40457a63d3..7b62cc22f2 100644
--- a/main/vcl/WinResTarget_vcl.mk
+++ b/main/vcl/WinResTarget_vcl.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/tblsels.cur \
vcl/win/source/src/asne.cur \
vcl/win/source/src/crook.cur \
- vcl/win/source/src/hand.cur \
vcl/win/source/src/movept.cur \
vcl/win/source/src/tblselse.cur \
vcl/win/source/src/asns.cur \
@@ -108,7 +107,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/chart.cur \
vcl/win/source/src/dline.cur \
vcl/win/source/src/movebw.cur \
- vcl/win/source/src/refhand.cur \
))
else
diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc
index cd84bc6161..b7b893ee69 100644
--- a/main/vcl/inc/win/salids.hrc
+++ b/main/vcl/inc/win/salids.hrc
@@ -27,16 +27,16 @@
//#define SAL_RESID_POINTER_HELP 10001 // "Help"
cursor only needed for older Windows versions was removed in December 2025
//#define SAL_RESID_POINTER_HSIZE 10002 //
"Horizontal resize" cursor only needed for older Windows versions was removed
in December 2025
//#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 2" cursor only needed for older Windows versions was removed in December
2025
-//#define SAL_RESID_POINTER_NWSESIZE 10005 // "Diagonal
resize 1" 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_MOVE 10007 // "Move"
cursor only needed for older Windows versions was removed 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
#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_HAND 10012 // "Hand"
cursor for older Windows versions was replaced in December 2025
+//#define SAL_RESID_POINTER_REFHAND 10013 //
"Refhand" cursor for older Windows versions was replaced in December 2025
#define SAL_RESID_POINTER_PEN 10014
#define SAL_RESID_POINTER_MAGNIFY 10015
#define SAL_RESID_POINTER_FILL 10016
diff --git a/main/vcl/win/source/src/hand.cur b/main/vcl/win/source/src/hand.cur
deleted file mode 100644
index fc0e53b474..0000000000
Binary files a/main/vcl/win/source/src/hand.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/refhand.cur
b/main/vcl/win/source/src/refhand.cur
deleted file mode 100644
index a654974c6f..0000000000
Binary files a/main/vcl/win/source/src/refhand.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/salsrc.rc
b/main/vcl/win/source/src/salsrc.rc
index cc5e3045fc..6bb991fa24 100644
--- a/main/vcl/win/source/src/salsrc.rc
+++ b/main/vcl/win/source/src/salsrc.rc
@@ -29,8 +29,6 @@ SAL_RESID_POINTER_HSPLIT CURSOR
hsplit.cur
SAL_RESID_POINTER_VSPLIT CURSOR vsplit.cur
SAL_RESID_POINTER_HSIZEBAR CURSOR hsizebar.cur
SAL_RESID_POINTER_VSIZEBAR CURSOR vsizebar.cur
-SAL_RESID_POINTER_HAND CURSOR hand.cur
-SAL_RESID_POINTER_REFHAND CURSOR refhand.cur
SAL_RESID_POINTER_PEN CURSOR pen.cur
SAL_RESID_POINTER_MAGNIFY CURSOR magnify.cur
SAL_RESID_POINTER_FILL CURSOR fill.cur
diff --git a/main/vcl/win/source/window/salframe.cxx
b/main/vcl/win/source/window/salframe.cxx
index 8c8a839a62..f940f20254 100644
--- a/main/vcl/win/source/window/salframe.cxx
+++ b/main/vcl/win/source/window/salframe.cxx
@@ -2284,8 +2284,8 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, 0, SAL_RESID_POINTER_VSPLIT }, // POINTER_VSPLIT
{ 0, 0, SAL_RESID_POINTER_HSIZEBAR }, // POINTER_HSIZEBAR
{ 0, 0, SAL_RESID_POINTER_VSIZEBAR }, // POINTER_VSIZEBAR
- { 0, 0, SAL_RESID_POINTER_HAND }, // POINTER_HAND
- { 0, 0, SAL_RESID_POINTER_REFHAND }, // POINTER_REFHAND
+ { 0, IDC_HAND, 0 }, // POINTER_HAND
+ { 0, IDC_HAND, 0 }, // POINTER_REFHAND
{ 0, 0, SAL_RESID_POINTER_PEN }, // POINTER_PEN
{ 0, 0, SAL_RESID_POINTER_MAGNIFY }, // POINTER_MAGNIFY
{ 0, 0, SAL_RESID_POINTER_FILL }, // POINTER_FILL
