This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-patch-1
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 74741f260a00d49e25a9ecf0c73a26417a1bc90b
Merge: 2bd4cdeaa3 a7d8910e9b
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Jun 2 13:26:45 2024 +0200
Merge branch 'trunk' into Pilot-Pirx-patch-1
main/cui/source/dialogs/dlgname.cxx | 90 +++---
main/cui/source/dialogs/dlgname.hrc | 12 +-
main/cui/source/dialogs/zoom.cxx | 356 ++++++++++-----------
main/cui/source/dialogs/zoom.hrc | 48 +--
main/cui/source/options/doclinkdialog.src | 78 ++---
main/cui/source/options/fontsubs.src | 24 +-
main/cui/source/options/optsave.src | 63 ++--
.../res/commandimagelist/lc_helpmenu.png | Bin 1623 -> 0 bytes
.../res/commandimagelist/lch_helpmenu.png | Bin 208 -> 0 bytes
.../res/commandimagelist/sc_helpmenu.png | Bin 802 -> 0 bytes
.../res/commandimagelist/sch_helpmenu.png | Bin 167 -> 0 bytes
.../primitive2d/controlprimitive2d.hxx | 4 +-
main/editeng/source/misc/unolingu.cxx | 2 +-
main/embeddedobj/source/msole/olepersist.cxx | 46 +--
main/extensions.lst | 2 +-
main/forms/source/xforms/submission/replace.cxx | 2 +-
.../source/xforms/submission/submission_get.cxx | 6 +-
.../source/xforms/submission/submission_post.cxx | 2 +-
main/framework/test/typecfg/cfgview.cxx | 2 +-
.../source/text/shared/00/00000402.xhp | 2 +-
main/linguistic/source/misc.cxx | 2 +-
.../classic/classic_images.tar.gz | Bin 1355547 -> 1364891
bytes
.../industrial/res/commandimagelist/lc_adjust.png | Bin 905 -> 572 bytes
.../industrial/res/commandimagelist/lc_draw.png | Bin 882 -> 870 bytes
.../res/commandimagelist/lc_helpmenu.png | Bin 652 -> 0 bytes
.../res/commandimagelist/lc_symbolcatalogue.png | Bin 558 -> 300 bytes
.../industrial/res/commandimagelist/sc_adjust.png | Bin 711 -> 291 bytes
.../industrial/res/commandimagelist/sc_draw.png | Bin 763 -> 253 bytes
.../res/commandimagelist/sc_helpmenu.png | Bin 275 -> 0 bytes
.../res/commandimagelist/sc_symbolcatalogue.png | Bin 424 -> 124 bytes
main/packimages/Makefile | 8 +-
main/packimages/Module_packimages.mk | 11 +-
main/packimages/Package_packimages.mk | 11 +-
main/psprint_config/configuration/psprint.conf | 2 +-
.../main/java/ifc/frame/_XNotifyingDispatch.java | 2 +-
main/sal/rtl/source/unload.cxx | 2 +-
main/scp2/source/ooo/file_ooo.scp | 2 +-
main/scp2/source/ooo/module_hidden_ooo.scp | 3 +-
main/sd/source/ui/inc/OutlineView.hxx | 2 +-
main/sfx2/sdi/sfx.sdi | 295 +++++++++--------
main/sot/source/sdstor/stgdir.hxx | 2 +-
.../sun/star/wizards/agenda/AgendaTemplate.java | 52 +--
.../com/sun/star/wizards/web/ImageListDialog.java | 6 +-
.../xmerge/source/palmtests/qa/lib/converterlib.pm | 2 +-
main/xmloff/source/text/txtparai.cxx | 2 +-
45 files changed, 559 insertions(+), 584 deletions(-)
