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 f06b48e7c2 Additional files
f06b48e7c2 is described below
commit f06b48e7c2d6aa0297ecfae49e945470fe1b0591
Author: mseidel <[email protected]>
AuthorDate: Fri Dec 5 14:31:35 2025 +0100
Additional files
---
main/vcl/WinResTarget_vcl.mk | 6 --
main/vcl/inc/win/salids.hrc | 14 ++--
main/vcl/win/source/src/50.png | Bin 125 -> 0 bytes
main/vcl/win/source/src/hsize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/move.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/neswsize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/nwsesize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/salsrc.rc | 157 +++++++++++++++++------------------
main/vcl/win/source/src/vsize.cur | Bin 326 -> 0 bytes
9 files changed, 81 insertions(+), 96 deletions(-)
diff --git a/main/vcl/WinResTarget_vcl.mk b/main/vcl/WinResTarget_vcl.mk
index 84d3bbf214..40457a63d3 100644
--- a/main/vcl/WinResTarget_vcl.mk
+++ b/main/vcl/WinResTarget_vcl.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/dpie.cur \
vcl/win/source/src/movedata.cur \
vcl/win/source/src/rotate.cur \
- vcl/win/source/src/50.png \
vcl/win/source/src/copydlnk.cur \
vcl/win/source/src/dpolygon.cur \
vcl/win/source/src/movedlnk.cur \
@@ -65,7 +64,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/neswsize.cur \
vcl/win/source/src/tblselsw.cur \
vcl/win/source/src/asnswe.cur \
vcl/win/source/src/cross.cur \
@@ -74,13 +72,11 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/tblselw.cur \
vcl/win/source/src/asnw.cur \
vcl/win/source/src/darc.cur \
- vcl/win/source/src/hsize.cur \
vcl/win/source/src/nullptr.cur \
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/nwsesize.cur \
vcl/win/source/src/timesize.cur \
vcl/win/source/src/asse.cur \
vcl/win/source/src/dcapt.cur \
@@ -91,7 +87,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/dcirccut.cur \
vcl/win/source/src/linkdata.cur \
vcl/win/source/src/pivotcol.cur \
- vcl/win/source/src/vsize.cur \
vcl/win/source/src/asw.cur \
vcl/win/source/src/dconnect.cur \
vcl/win/source/src/linkf.cur \
@@ -109,7 +104,6 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
vcl/win/source/src/vtext.cur \
vcl/win/source/src/chainnot.cur \
vcl/win/source/src/dfree.cur \
- vcl/win/source/src/move.cur \
vcl/win/source/src/pntbrsh.cur \
vcl/win/source/src/chart.cur \
vcl/win/source/src/dline.cur \
diff --git a/main/vcl/inc/win/salids.hrc b/main/vcl/inc/win/salids.hrc
index e8b0d203a8..cd84bc6161 100644
--- a/main/vcl/inc/win/salids.hrc
+++ b/main/vcl/inc/win/salids.hrc
@@ -24,15 +24,13 @@
// Cursor
#define SAL_RESID_POINTER_NULL 10000
-//#define SAL_RESID_POINTER_HELP 10001 // Help
Cursor only needed for older Windows versions was removed in December 2025
-#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
-#endif
+//#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_CROSS 10006
-#define SAL_RESID_POINTER_MOVE 10007
+//#define SAL_RESID_POINTER_MOVE 10007 // "Move"
cursor only needed for older Windows versions was removed in December 2025
#define SAL_RESID_POINTER_HSPLIT 10008
#define SAL_RESID_POINTER_VSPLIT 10009
#define SAL_RESID_POINTER_HSIZEBAR 10010
diff --git a/main/vcl/win/source/src/50.png b/main/vcl/win/source/src/50.png
deleted file mode 100644
index 8517d965f0..0000000000
Binary files a/main/vcl/win/source/src/50.png and /dev/null differ
diff --git a/main/vcl/win/source/src/hsize.cur
b/main/vcl/win/source/src/hsize.cur
deleted file mode 100644
index 571dd0ef70..0000000000
Binary files a/main/vcl/win/source/src/hsize.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/move.cur b/main/vcl/win/source/src/move.cur
deleted file mode 100644
index a407a1298a..0000000000
Binary files a/main/vcl/win/source/src/move.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/neswsize.cur
b/main/vcl/win/source/src/neswsize.cur
deleted file mode 100644
index c38501ee15..0000000000
Binary files a/main/vcl/win/source/src/neswsize.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/nwsesize.cur
b/main/vcl/win/source/src/nwsesize.cur
deleted file mode 100644
index 570cbbb571..0000000000
Binary files a/main/vcl/win/source/src/nwsesize.cur and /dev/null differ
diff --git a/main/vcl/win/source/src/salsrc.rc
b/main/vcl/win/source/src/salsrc.rc
index 720a88f8a6..cc5e3045fc 100644
--- a/main/vcl/win/source/src/salsrc.rc
+++ b/main/vcl/win/source/src/salsrc.rc
@@ -23,87 +23,80 @@
#include <win/salids.hrc>
#endif
-SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR
-#ifndef WNT
-SAL_RESID_POINTER_HSIZE CURSOR
HSIZE.CUR
-SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR
-SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR
-SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR
-#endif
-SAL_RESID_POINTER_CROSS CURSOR
CROSS.CUR
-SAL_RESID_POINTER_MOVE CURSOR MOVE.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_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
-SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR
-SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR
-SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR
-SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR
-SAL_RESID_POINTER_CROOK CURSOR
CROOK.CUR
-SAL_RESID_POINTER_CROP CURSOR CROP.CUR
-SAL_RESID_POINTER_MOVEPOINT CURSOR MOVEPT.CUR
-SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR MOVEBW.CUR
-SAL_RESID_POINTER_MOVEDATA CURSOR MOVEDATA.CUR
-SAL_RESID_POINTER_COPYDATA CURSOR COPYDATA.CUR
-SAL_RESID_POINTER_LINKDATA CURSOR LINKDATA.CUR
-SAL_RESID_POINTER_MOVEDATALINK CURSOR MOVEDLNK.CUR
-SAL_RESID_POINTER_COPYDATALINK CURSOR COPYDLNK.CUR
-SAL_RESID_POINTER_MOVEFILE CURSOR MOVEF.CUR
-SAL_RESID_POINTER_COPYFILE CURSOR COPYF.CUR
-SAL_RESID_POINTER_LINKFILE CURSOR LINKF.CUR
-SAL_RESID_POINTER_MOVEFILELINK CURSOR MOVEFLNK.CUR
-SAL_RESID_POINTER_COPYFILELINK CURSOR COPYFLNK.CUR
-SAL_RESID_POINTER_MOVEFILES CURSOR MOVEF2.CUR
-SAL_RESID_POINTER_COPYFILES CURSOR COPYF2.CUR
-SAL_RESID_POINTER_NOTALLOWED CURSOR NOTALLOW.CUR
-SAL_RESID_POINTER_DRAW_LINE CURSOR DLINE.CUR
-SAL_RESID_POINTER_DRAW_RECT CURSOR DRECT.CUR
-SAL_RESID_POINTER_DRAW_POLYGON CURSOR DPOLYGON.CUR
-SAL_RESID_POINTER_DRAW_BEZIER CURSOR DBEZIER.CUR
-SAL_RESID_POINTER_DRAW_ARC CURSOR DARC.CUR
-SAL_RESID_POINTER_DRAW_PIE CURSOR DPIE.CUR
-SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR DCIRCCUT.CUR
-SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR DELLIPSE.CUR
-SAL_RESID_POINTER_DRAW_FREEHAND CURSOR DFREE.CUR
-SAL_RESID_POINTER_DRAW_CONNECT CURSOR DCONNECT.CUR
-SAL_RESID_POINTER_DRAW_TEXT CURSOR DTEXT.CUR
-SAL_RESID_POINTER_DRAW_CAPTION CURSOR DCAPT.CUR
-SAL_RESID_POINTER_CHART CURSOR
CHART.CUR
-SAL_RESID_POINTER_DETECTIVE CURSOR DETECTIV.CUR
-SAL_RESID_POINTER_PIVOT_COL CURSOR PIVOTCOL.CUR
-SAL_RESID_POINTER_PIVOT_ROW CURSOR PIVOTROW.CUR
-SAL_RESID_POINTER_PIVOT_FIELD CURSOR PIVOTFLD.CUR
-SAL_RESID_POINTER_PIVOT_DELETE CURSOR PIVOTDEL.CUR
-SAL_RESID_POINTER_CHAIN CURSOR
CHAIN.CUR
-SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR CHAINNOT.CUR
-SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR TIMEMOVE.CUR
-SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR TIMESIZE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_N CURSOR ASN.CUR
-SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ASS.CUR
-SAL_RESID_POINTER_AUTOSCROLL_W CURSOR ASW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ASE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR ASNW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR ASNE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR ASSW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR ASSE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR ASNS.CUR
-SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR ASWE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR ASNSWE.CUR
-SAL_RESID_POINTER_AIRBRUSH CURSOR AIRBRUSH.CUR
-SAL_RESID_POINTER_TEXT_VERTICAL CURSOR VTEXT.CUR
-SAL_RESID_POINTER_TAB_SELECT_S CURSOR TBLSELS.CUR
-SAL_RESID_POINTER_TAB_SELECT_E CURSOR TBLSELE.CUR
-SAL_RESID_POINTER_TAB_SELECT_SE CURSOR TBLSELSE.CUR
-SAL_RESID_POINTER_TAB_SELECT_W CURSOR TBLSELW.CUR
-SAL_RESID_POINTER_TAB_SELECT_SW CURSOR TBLSELSW.CUR
-SAL_RESID_POINTER_PAINTBRUSH CURSOR PNTBRSH.CUR
+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
+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
+SAL_RESID_POINTER_ROTATE CURSOR rotate.cur
+SAL_RESID_POINTER_HSHEAR CURSOR hshear.cur
+SAL_RESID_POINTER_VSHEAR CURSOR vshear.cur
+SAL_RESID_POINTER_MIRROR CURSOR mirror.cur
+SAL_RESID_POINTER_CROOK CURSOR
crook.cur
+SAL_RESID_POINTER_CROP CURSOR crop.cur
+SAL_RESID_POINTER_MOVEPOINT CURSOR movept.cur
+SAL_RESID_POINTER_MOVEBEZIERWEIGHT CURSOR movebw.cur
+SAL_RESID_POINTER_MOVEDATA CURSOR movedata.cur
+SAL_RESID_POINTER_COPYDATA CURSOR copydata.cur
+SAL_RESID_POINTER_LINKDATA CURSOR linkdata.cur
+SAL_RESID_POINTER_MOVEDATALINK CURSOR movedlnk.cur
+SAL_RESID_POINTER_COPYDATALINK CURSOR copydlnk.cur
+SAL_RESID_POINTER_MOVEFILE CURSOR movef.cur
+SAL_RESID_POINTER_COPYFILE CURSOR copyf.cur
+SAL_RESID_POINTER_LINKFILE CURSOR linkf.cur
+SAL_RESID_POINTER_MOVEFILELINK CURSOR moveflnk.cur
+SAL_RESID_POINTER_COPYFILELINK CURSOR copyflnk.cur
+SAL_RESID_POINTER_MOVEFILES CURSOR movef2.cur
+SAL_RESID_POINTER_COPYFILES CURSOR copyf2.cur
+SAL_RESID_POINTER_NOTALLOWED CURSOR notallow.cur
+SAL_RESID_POINTER_DRAW_LINE CURSOR dline.cur
+SAL_RESID_POINTER_DRAW_RECT CURSOR drect.cur
+SAL_RESID_POINTER_DRAW_POLYGON CURSOR dpolygon.cur
+SAL_RESID_POINTER_DRAW_BEZIER CURSOR dbezier.cur
+SAL_RESID_POINTER_DRAW_ARC CURSOR darc.cur
+SAL_RESID_POINTER_DRAW_PIE CURSOR dpie.cur
+SAL_RESID_POINTER_DRAW_CIRCLECUT CURSOR dcirccut.cur
+SAL_RESID_POINTER_DRAW_ELLIPSE CURSOR dellipse.cur
+SAL_RESID_POINTER_DRAW_FREEHAND CURSOR dfree.cur
+SAL_RESID_POINTER_DRAW_CONNECT CURSOR dconnect.cur
+SAL_RESID_POINTER_DRAW_TEXT CURSOR dtext.cur
+SAL_RESID_POINTER_DRAW_CAPTION CURSOR dcapt.cur
+SAL_RESID_POINTER_CHART CURSOR
chart.cur
+SAL_RESID_POINTER_DETECTIVE CURSOR detectiv.cur
+SAL_RESID_POINTER_PIVOT_COL CURSOR pivotcol.cur
+SAL_RESID_POINTER_PIVOT_ROW CURSOR pivotrow.cur
+SAL_RESID_POINTER_PIVOT_FIELD CURSOR pivotfld.cur
+SAL_RESID_POINTER_PIVOT_DELETE CURSOR pivotdel.cur
+SAL_RESID_POINTER_CHAIN CURSOR
chain.cur
+SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR chainnot.cur
+SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR timemove.cur
+SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR timesize.cur
+SAL_RESID_POINTER_AUTOSCROLL_N CURSOR asn.cur
+SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ass.cur
+SAL_RESID_POINTER_AUTOSCROLL_W CURSOR asw.cur
+SAL_RESID_POINTER_AUTOSCROLL_E CURSOR ase.cur
+SAL_RESID_POINTER_AUTOSCROLL_NW CURSOR asnw.cur
+SAL_RESID_POINTER_AUTOSCROLL_NE CURSOR asne.cur
+SAL_RESID_POINTER_AUTOSCROLL_SW CURSOR assw.cur
+SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR asse.cur
+SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR asns.cur
+SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR aswe.cur
+SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR asnswe.cur
+SAL_RESID_POINTER_AIRBRUSH CURSOR airbrush.cur
+SAL_RESID_POINTER_TEXT_VERTICAL CURSOR vtext.cur
+SAL_RESID_POINTER_TAB_SELECT_S CURSOR tblsels.cur
+SAL_RESID_POINTER_TAB_SELECT_E CURSOR tblsele.cur
+SAL_RESID_POINTER_TAB_SELECT_SE CURSOR tblselse.cur
+SAL_RESID_POINTER_TAB_SELECT_W CURSOR tblselw.cur
+SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur
+SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur
-SAL_RESID_BITMAP_50 BITMAP 50.BMP
+SAL_RESID_BITMAP_50 BITMAP 50.bmp
-SAL_RESID_ICON_DEFAULT ICON SD.ICO
+SAL_RESID_ICON_DEFAULT ICON sd.ico
diff --git a/main/vcl/win/source/src/vsize.cur
b/main/vcl/win/source/src/vsize.cur
deleted file mode 100644
index 76449be89d..0000000000
Binary files a/main/vcl/win/source/src/vsize.cur and /dev/null differ
