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 db19832e364e2e67f846c5286563c6a8fe3f5e79
Merge: 32be25f6eb 5cd1c82638
Author: mseidel <[email protected]>
AuthorDate: Sun Aug 31 16:03:42 2025 +0200

    Merge branch 'trunk' into Pilot-Pirx-iconset

 .../connectivity/source/inc/resource/mozab_res.hrc |  10 +-
 .../source/resource/conn_shared_res.src            |  27 +-
 main/dbaccess/source/ui/misc/HtmlReader.cxx        |   2 +-
 main/extensions/source/abpilot/abpresid.hrc        |  76 ++---
 main/extensions/source/abpilot/abspilot.cxx        | 349 ++++++++++-----------
 main/extensions/source/abpilot/abspilot.src        |  16 +-
 main/extensions/source/abpilot/addresssettings.hxx |  12 +-
 .../source/abpilot/datasourcehandling.cxx          | 100 +++---
 .../source/abpilot/datasourcehandling.hxx          |  68 ++--
 .../source/abpilot/typeselectionpage.cxx           |  70 ++---
 .../source/abpilot/typeselectionpage.hxx           |   3 -
 main/filter/source/msfilter/eschesdo.cxx           |   4 +-
 .../source/xslt/odf2xhtml/export/xhtml/body.xsl    |  16 +-
 main/formula/source/core/api/token.cxx             |   2 +-
 .../path_substitution/PathSubstitutionTest.java    |   4 +-
 main/helpcontent2/helpers/help_hid.lst             |   1 -
 .../source/text/shared/autopi/01170000.xhp         |  17 +-
 .../source/text/shared/autopi/01170300.xhp         |   2 +-
 .../text/shared/explorer/database/dabawiz01.xhp    |   2 +-
 .../source/text/shared/guide/data_addressbook.xhp  |   2 +-
 .../java/convwatch/GraphicalTestArguments.java     |   2 +-
 .../main/java/ifc/document/_XViewDataSupplier.java |   2 +-
 .../main/java/ifc/sheet/_XDocumentAuditing.java    |   2 +-
 .../src/main/java/ifc/sheet/_XSheetAuditing.java   |   2 +-
 .../mod/_fwk/ModuleUIConfigurationManager.java     |   2 +-
 .../main/java/mod/_fwk/UIConfigurationManager.java |   2 +-
 .../java/stats/ComplexDataBaseOutProducer.java     |   2 +-
 .../java/OOoRunner/src/main/java/util/utils.java   |   8 +-
 main/sc/source/core/data/table3.cxx                |   2 +-
 main/sc/source/core/tool/chartarr.cxx              |   2 +-
 main/sc/source/core/tool/chartlis.cxx              |   2 +-
 main/sc/source/core/tool/chartpos.cxx              |   8 +-
 main/sc/source/core/tool/chgtrack.cxx              |   6 +-
 main/sc/source/core/tool/interpr1.cxx              |   8 +-
 main/sc/source/filter/html/htmlpars.cxx            |  10 +-
 main/sc/source/filter/xcl97/XclImpChangeTrack.cxx  |   2 +-
 main/sc/source/filter/xcl97/xcl97rec.cxx           |   2 +-
 main/sc/source/ui/view/viewfunc.cxx                |   2 +-
 main/sw/source/filter/writer/writer.cxx            | 299 +++++++++---------
 main/sw/source/filter/writer/wrt_fn.cxx            |  16 +-
 main/sw/source/filter/writer/wrtswtbl.cxx          | 180 +++++------
 main/sw/source/ui/wrtsh/delete.cxx                 |   2 +
 .../CheckTransientDocumentsContentProvider.java    |   2 +-
 .../CheckTransientDocumentsDocumentContent.java    |   2 +-
 main/vcl/qa/complex/memCheck/CheckMemoryUsage.java |   2 +-
 45 files changed, 643 insertions(+), 709 deletions(-)

Reply via email to