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/13 16:39:05 UTC
(openoffice) branch trunk updated: Replace horizontal/vertical sizebar cursors
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 275576af0e Replace horizontal/vertical sizebar cursors
275576af0e is described below
commit 275576af0eb49fdfebe17a6283d312c6718df85a
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Dec 13 17:38:47 2025 +0100
Replace horizontal/vertical sizebar cursors
---
main/vcl/WinResTarget_vcl.mk | 4 ----
main/vcl/inc/win/salids.hrc | 4 ++--
main/vcl/win/source/src/hsizebar.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/salsrc.rc | 2 --
main/vcl/win/source/src/vsizebar.cur | Bin 326 -> 0 bytes
main/vcl/win/source/window/salframe.cxx | 4 ++--
6 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk
index 0e043dcfdf..8ef66b052e 100644
--- a/main/vcl/WinResTarget_vcl.mk
+++ b/main/vcl/WinResTarget_vcl.mk
@@ -74,11 +74,9 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/timemove.cur \
vcl/win/source/src/ass.cur \
vcl/win/source/src/dbezier.cur \
- vcl/win/source/src/hsizebar.cur \
vcl/win/source/src/timesize.cur \
vcl/win/source/src/asse.cur \
vcl/win/source/src/dcapt.cur \
- vcl/win/source/src/hsplit.cur \
vcl/win/source/src/pen.cur \
vcl/win/source/src/vshear.cur \
vcl/win/source/src/assw.cur \
@@ -89,12 +87,10 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/dconnect.cur \
vcl/win/source/src/linkf.cur \
vcl/win/source/src/pivotdel.cur \
- vcl/win/source/src/vsizebar.cur \
vcl/win/source/src/aswe.cur \
vcl/win/source/src/dellipse.cur \
vcl/win/source/src/magnify.cur \
vcl/win/source/src/pivotfld.cur \
- vcl/win/source/src/vsplit.cur \
vcl/win/source/src/chain.cur \
vcl/win/source/src/detectiv.cur \
vcl/win/source/src/mirror.cur \
diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc
index d1814172ce..25ee4dad46 100644
--- a/main/vcl/inc/win/salids.hrc
+++ b/main/vcl/inc/win/salids.hrc
@@ -33,8 +33,8 @@
//#define SAL_RESID_POINTER_MOVE 10007 // "Move" cursor for older Windows versions was replaced in December 2025
//#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_HSIZEBAR 10010 // "Horizontal sizebar" cursor for older Windows versions was replaced in December 2025
+//#define SAL_RESID_POINTER_VSIZEBAR 10011 // "Vertical sizebar" cursor for older Windows versions was replaced in December 2025
//#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
diff --git a/main/vcl/win/source/src/hsizebar.cur b/main/vcl/win/source/src/hsizebar.cur
deleted file mode 100644
index dda3483bb5..0000000000
Binary files a/main/vcl/win/source/src/hsizebar.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/salsrc.rc b/main/vcl/win/source/src/salsrc.rc
index 2f000a085a..20d31e7be0 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_HSIZEBAR CURSOR hsizebar.cur
-SAL_RESID_POINTER_VSIZEBAR CURSOR vsizebar.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/src/vsizebar.cur b/main/vcl/win/source/src/vsizebar.cur
deleted file mode 100644
index a87811cb47..0000000000
Binary files a/main/vcl/win/source/src/vsizebar.cur and /dev/null differ
diff --git a/main/vcl/win/source/window/salframe.cxx b/main/vcl/win/source/window/salframe.cxx
index 3af3144433..2e5f1adbf8 100644
--- a/main/vcl/win/source/window/salframe.cxx
+++ b/main/vcl/win/source/window/salframe.cxx
@@ -2282,8 +2282,8 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ 0, IDC_SIZENWSE, 0 }, // POINTER_WINDOW_SESIZE
{ 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_SIZEWE, 0 }, // POINTER_HSIZEBAR
+ { 0, IDC_SIZENS, 0 }, // POINTER_VSIZEBAR
{ 0, IDC_HAND, 0 }, // POINTER_HAND
{ 0, IDC_HAND, 0 }, // POINTER_REFHAND
{ 0, 0, SAL_RESID_POINTER_PEN }, // POINTER_PEN