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 d6deb1131dbd6e6574478dff5e09e5060eb3b4d2
Merge: 79fa2d6bee 1890034f73
Author: mseidel <[email protected]>
AuthorDate: Thu Jun 5 20:10:10 2025 +0200

    Merge branch 'trunk' into Pilot-Pirx-iconset

 main/autodoc/source/parser/cpp/preproc.cxx         | 276 +++++++-------
 .../source/parser_i/inc/s2_luidl/pe_tydf2.hxx      |  36 +-
 main/basebmp/inc/basebmp/endian.hxx                |  22 +-
 main/canvas/source/cairo/cairo_canvasfont.cxx      | 278 +++++++-------
 .../source/controller/main/CommandDispatch.cxx     | 230 ++++++------
 .../source/controller/main/UndoCommandDispatch.cxx | 154 ++++----
 .../connectivity/source/drivers/evoab2/makefile.mk |   2 +-
 main/desktop/source/deployment/gui/descedit.hxx    |  38 +-
 main/editeng/inc/editeng/unoviwed.hxx              |  30 +-
 main/fileaccess/source/FileAccess.cxx              |  65 ++--
 main/forms/source/xforms/resourcehelper.hxx        |  29 +-
 main/forms/source/xforms/submission/makefile.mk    |   3 +-
 main/forms/source/xforms/xpathlib/makefile.mk      |   3 +-
 main/linguistic/source/convdiclist.cxx             |  22 +-
 main/linguistic/source/dlistimp.cxx                |  21 +-
 main/linguistic/source/gciterator.cxx              |  50 +--
 main/linguistic/source/gciterator.hxx              |   7 +-
 main/linguistic/source/lngopt.cxx                  |  21 +-
 main/linguistic/source/lngreg.cxx                  | 152 ++++----
 main/linguistic/source/lngsvcmgr.cxx               |  24 +-
 main/pyuno/source/loader/makefile.mk               |   2 +-
 main/pyuno/source/module/makefile.mk               |   2 +-
 main/shell/source/backends/kde4be/makefile.mk      |   2 +-
 main/shell/source/backends/kdebe/makefile.mk       |   2 +-
 main/slideshow/source/engine/screenupdater.cxx     | 415 ++++++++++-----------
 main/solenv/inc/target.mk                          |   4 +-
 main/unotools/source/ucbhelper/XTempFile.hxx       |   3 -
 main/unotools/source/ucbhelper/xtempfile.cxx       |  32 +-
 main/vcl/aqua/source/gdi/atsfonts.hxx              |  14 +-
 main/vcl/inc/salvd.hxx                             |  39 +-
 .../source/style/XMLFootnoteSeparatorExport.hxx    |  16 +-
 main/xmlsecurity/source/xmlsec/makefile.mk         |   3 +-
 main/xmlsecurity/source/xmlsec/nss/makefile.mk     |   3 +-
 33 files changed, 928 insertions(+), 1072 deletions(-)

Reply via email to