This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch Pilot-Pirx-wizard
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 954bd891b1f7f8b4d37cdb393de3f3ece845a140
Merge: 627562ce12 cba28f4f85
Author: mseidel <[email protected]>
AuthorDate: Wed Jun 5 20:48:59 2024 +0200

    Merge branch 'trunk' into Pilot-Pirx-wizard

 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 ++--
 main/default_images/extensions/res/buttonminus.png | Bin 457 -> 206 bytes
 .../extensions/res/buttonminus_hc.png              | Bin 122 -> 127 bytes
 .../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 +-
 .../filter/misc/FinalizedMandatoryTest.java        |  42 +--
 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 -> 1364926 
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/shell/qa/zip/testimpl/testzipimpl.cxx         |  18 +-
 main/shell/qa/zip/testimpl/testzipimpl.hxx         |  13 +-
 main/shell/qa/zip/ziptest.cxx                      |   2 -
 main/sot/source/sdstor/stgdir.hxx                  |   2 +-
 main/sw/source/core/text/redlnitr.cxx              | 127 ++++----
 .../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 +-
 52 files changed, 657 insertions(+), 688 deletions(-)

Reply via email to