You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/12/11 22:59:04 UTC
(openoffice) branch AOO42X updated: Replace horizontal/vertical split cursors
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 6cea7a067e Replace horizontal/vertical split cursors
6cea7a067e is described below
commit 6cea7a067e2b7ebb9f9587d1983433ec75dbeeed
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Dec 11 23:57:49 2025 +0100
Replace horizontal/vertical split cursors
(cherry picked from commit 726adf0101b408f847f68462a2f08d8641278391)
---
main/vcl/inc/win/salids.hrc | 4 ++--
main/vcl/win/source/src/hsplit.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/salsrc.rc | 2 --
main/vcl/win/source/src/vsplit.cur | Bin 326 -> 0 bytes
main/vcl/win/source/window/salframe.cxx | 4 ++--
5 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc
index 452d0de634..d1814172ce 100644
--- a/main/vcl/inc/win/salids.hrc
+++ b/main/vcl/inc/win/salids.hrc
@@ -31,8 +31,8 @@
//#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 // "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
+//#define SAL_RESID_POINTER_HSPLIT 10008 // "Horizontal split" cursor for older Windows versions was replaced in December 2025
+//#define SAL_RESID_POINTER_VSPLIT 10009 // "Vertical split" cursor for older Windows versions was replaced in December 2025
#define SAL_RESID_POINTER_HSIZEBAR 10010
#define SAL_RESID_POINTER_VSIZEBAR 10011
//#define SAL_RESID_POINTER_HAND 10012 // "Hand" cursor for older Windows versions was replaced in December 2025
diff --git a/main/vcl/win/source/src/hsplit.cur b/main/vcl/win/source/src/hsplit.cur
deleted file mode 100644
index f2f0be363d..0000000000
Binary files a/main/vcl/win/source/src/hsplit.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/salsrc.rc b/main/vcl/win/source/src/salsrc.rc
index a2f1aca08a..2f000a085a 100644
--- a/main/vcl/win/source/src/salsrc.rc
+++ b/main/vcl/win/source/src/salsrc.rc
@@ -24,8 +24,6 @@
#endif
SAL_RESID_POINTER_NULL CURSOR nullptr.cur
-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_PEN CURSOR pen.cur
diff --git a/main/vcl/win/source/src/vsplit.cur b/main/vcl/win/source/src/vsplit.cur
deleted file mode 100644
index a4260808fa..0000000000
Binary files a/main/vcl/win/source/src/vsplit.cur and /dev/null differ
diff --git a/main/vcl/win/source/window/salframe.cxx b/main/vcl/win/source/window/salframe.cxx
index cadcc621d7..3af3144433 100644
--- a/main/vcl/win/source/window/salframe.cxx
+++ b/main/vcl/win/source/window/salframe.cxx
@@ -2280,8 +2280,8 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, IDC_SIZENESW, 0 }, // POINTER_WINDOW_NESIZE
{ 0, IDC_SIZENESW, 0 }, // POINTER_WINDOW_SWSIZE
{ 0, IDC_SIZENWSE, 0 }, // POINTER_WINDOW_SESIZE
- { 0, 0, SAL_RESID_POINTER_HSPLIT }, // POINTER_HSPLIT
- { 0, 0, SAL_RESID_POINTER_VSPLIT }, // POINTER_VSPLIT
+ { 0, IDC_SIZEWE, 0 }, // POINTER_HSPLIT
+ { 0, IDC_SIZENS, 0 }, // POINTER_VSPLIT
{ 0, 0, SAL_RESID_POINTER_HSIZEBAR }, // POINTER_HSIZEBAR
{ 0, 0, SAL_RESID_POINTER_VSIZEBAR }, // POINTER_VSIZEBAR
{ 0, IDC_HAND, 0 }, // POINTER_HAND