You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by ji...@apache.org on 2026/08/03 10:52:32 UTC

(openoffice) 03/03: Merge branch 'trunk' of https://github.com/apache/openoffice into trunk

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

jimjag pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 8f6d19db0eabd2ae79966522b6c0998dffac4129
Merge: 2d58aae5e7 79670aa18e
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Mon Aug 3 06:52:15 2026 -0400

    Merge branch 'trunk' of https://github.com/apache/openoffice into trunk

 .../source/cpp_uno/s5abi_macosx_aarch64/abi.cxx    | 54 +++++++++++++++++++--
 .../source/cpp_uno/s5abi_macosx_aarch64/abi.hxx    |  9 ++++
 .../source/cpp_uno/s5abi_macosx_aarch64/call.s     | 26 +++++++++-
 .../cpp_uno/s5abi_macosx_aarch64/cpp2uno.cxx       | 14 +++---
 .../source/cpp_uno/s5abi_macosx_aarch64/except.cxx | 47 +++++++++++++++++-
 .../source/cpp_uno/s5abi_macosx_aarch64/share.hxx  |  4 ++
 .../cpp_uno/s5abi_macosx_aarch64/uno2cpp.cxx       | 56 +++++++++++++++++-----
 7 files changed, 187 insertions(+), 23 deletions(-)