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 2026/01/02 00:09:37 UTC
(openoffice) 01/01: Merge branch 'trunk' into Pilot-Pirx-iconset
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-iconset
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1eda15df69095c2d3b2f948d5f2a90c04a28caa4
Merge: f4fc05d307 9edfee4196
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Jan 2 01:09:14 2026 +0100
Merge branch 'trunk' into Pilot-Pirx-iconset
.github/linters/codespell.txt | 19 ----
.github/workflows/pre-commit.yml | 2 +-
.pre-commit-config.yaml | 12 ++-
main/LICENSE | 2 +-
main/LICENSE_ALv2 | 2 +-
main/NOTICE | 2 +-
main/cpputools/source/unoexe/unoexe.cxx | 2 +-
main/cui/source/dialogs/about.cxx | 2 +-
.../deployment/manager/dp_extensionmanager.cxx | 2 +-
.../source/deployment/manager/dp_manager.cxx | 2 +-
main/desktop/win32/source/guiloader/makefile.mk | 21 ++--
main/desktop/win32/source/setup/Resource.h | 4 +-
main/desktop/win32/source/setup/rctmpl.txt | 10 +-
main/desktop/win32/source/setup/setup.cpp | 6 +-
main/desktop/win32/source/setup/setup.ulf | 43 +-------
.../source/primitive3d/polygontubeprimitive3d.cxx | 2 +-
main/filter/source/flash/swfwriter1.cxx | 6 +-
.../source/win32/filepicker/FileOpenDlg.hxx | 2 +-
main/idl/source/prj/command.cxx | 2 +-
main/odk/docs/install.html | 2 +-
main/odk/docs/notsupported.html | 2 +-
main/odk/docs/tools.html | 2 +-
main/odk/examples/DevelopersGuide/examples.html | 2 +-
main/odk/examples/examples.html | 2 +-
main/odk/index.html | 2 +-
.../com/sun/star/ui/ModuleUICommandDescription.idl | 2 +-
.../sun/star/ui/XUIElementFactoryRegistration.idl | 2 +-
main/oox/source/xls/viewsettings.cxx | 6 +-
.../source/packinfo/packinfo_brand.txt | 16 +--
.../source/packinfo/packinfo_office.txt | 118 ++++++++++-----------
.../source/packinfo/packinfo_office_lang.txt | 22 ++--
.../source/packinfo/packinfo_sdkoo.txt | 2 +-
main/setup_native/source/packinfo/packinfo_ure.txt | 4 +-
.../source/win32/nsis/downloadtemplate.nsi | 2 +-
main/slideshow/source/engine/tools.cxx | 2 +-
.../source/engine/transitions/slidechangebase.cxx | 2 +-
main/solenv/inc/version.lst | 2 +-
main/svx/source/unodraw/unobrushitemhelper.cxx | 2 +-
main/sysui/desktop/icons/makefile.mk | 12 ---
main/sysui/desktop/icons/ooo-base-app.ico | Bin 92854 -> 0 bytes
main/sysui/desktop/icons/ooo-calc-app.ico | Bin 92854 -> 0 bytes
main/sysui/desktop/icons/ooo-configuration.ico | Bin 25214 -> 0 bytes
main/sysui/desktop/icons/ooo-draw-app.ico | Bin 92854 -> 0 bytes
main/sysui/desktop/icons/ooo-impress-app.ico | Bin 92854 -> 0 bytes
main/sysui/desktop/icons/ooo-main-app.ico | Bin 92854 -> 0 bytes
main/sysui/desktop/icons/ooo-math-app.ico | Bin 92854 -> 0 bytes
main/sysui/desktop/icons/ooo-open.ico | Bin 25214 -> 0 bytes
main/sysui/desktop/icons/ooo-printer.ico | Bin 25214 -> 0 bytes
main/sysui/desktop/icons/ooo-writer-app.ico | Bin 92854 -> 0 bytes
main/sysui/desktop/os2/makefile.mk | 44 --------
main/sysui/desktop/os2/ooo-configuration.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/ooo-open.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/ooo-printer.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-base-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-calc-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-calc-tem.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-chart-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-draw-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-draw-tem.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-impress-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-impress-tem.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-master-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-math-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-writer-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so7-writer-tem.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-base-app.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-base-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-calc-app.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-calc-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-calc-tem.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-chart-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-configuration.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-draw-app.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-draw-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-draw-tem.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-empty-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-empty-tem.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-image-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-impress-app.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-impress-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-impress-tem.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-macro-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-main-app.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-master-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-math-app.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-math-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-open.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-printer.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-web-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-writer-app.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-writer-doc.ico | Bin 5604 -> 0 bytes
main/sysui/desktop/os2/so8-writer-tem.ico | Bin 5604 -> 0 bytes
main/ucb/workben/ucb/ucbdemo.cxx | 2 +-
main/vcl/WinResTarget_vcl.mk | 4 -
main/vcl/aqua/source/app/saldata.cxx | 2 -
main/vcl/aqua/source/res/cursors/timemove.png | Bin 249 -> 0 bytes
main/vcl/aqua/source/res/cursors/timesize.png | Bin 241 -> 0 bytes
main/vcl/inc/os2/salids.hrc | 4 +-
main/vcl/inc/unx/x11_cursors/salcursors.h | 5 -
main/vcl/inc/unx/x11_cursors/timemove_curs.h | 60 -----------
main/vcl/inc/unx/x11_cursors/timemove_mask.h | 60 -----------
main/vcl/inc/unx/x11_cursors/timesize_curs.h | 60 -----------
main/vcl/inc/unx/x11_cursors/timesize_mask.h | 60 -----------
main/vcl/inc/vcl/ptrstyle.hxx | 44 ++++----
main/vcl/inc/win/salids.hrc | 4 +-
main/vcl/os2/source/src/makefile.mk | 2 -
main/vcl/os2/source/src/salsrc.rc | 2 -
main/vcl/os2/source/src/timemove.ptr | Bin 1190 -> 0 bytes
main/vcl/os2/source/src/timesize.ptr | Bin 1190 -> 0 bytes
main/vcl/os2/source/window/salframe.cxx | 64 ++++++-----
main/vcl/unx/generic/app/saldisp.cxx | 6 --
main/vcl/unx/gtk/app/gtkdata.cxx | 2 -
main/vcl/win/source/src/salsrc.rc | 2 -
main/vcl/win/source/src/timemove.cur | Bin 326 -> 0 bytes
main/vcl/win/source/src/timesize.cur | Bin 326 -> 0 bytes
main/vcl/win/source/window/salframe.cxx | 4 +-
main/writerfilter/source/ooxml/factorytools.xsl | 4 +-
main/xmloff/source/text/txtprmap.cxx | 2 +-
118 files changed, 200 insertions(+), 586 deletions(-)