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 749f9595a82eda4b3a5f66139c527d72405f2a8d
Merge: 89526a3f6f 6b417ef1a7
Author: mseidel <msei...@apache.org>
AuthorDate: Wed Jul 31 00:39:59 2024 +0200
Merge branch 'trunk' into Pilot-Pirx-wizard
main/cui/source/options/optinet2.src | 643 ++++++++++-----------
.../source/deployment/gui/dp_gui_backend.src | 2 -
.../deployment/gui/dp_gui_dependencydialog.src | 77 ++-
.../source/deployment/gui/dp_gui_dialog.src | 4 -
.../source/deployment/gui/dp_gui_updatedialog.src | 446 +++++++-------
main/sc/source/ui/cctrl/dpcontrol.src | 78 ++-
main/sc/source/ui/src/condfrmt.src | 351 ++++++-----
7 files changed, 767 insertions(+), 834 deletions(-)
