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 93a24604d202a18cf122fa3d3b1ac8e8cd711552 Merge: f9e11e736d a9afaeb67b Author: Jim Jagielski <[email protected]> AuthorDate: Mon Jul 6 05:49:10 2026 -0400 Merge branch 'trunk' of https://github.com/apache/openoffice into trunk main/configure.ac | 20 +++++++- main/package/source/package/zipapi/ZipFile.cxx | 2 +- .../source/package/zippackage/ZipPackageFolder.cxx | 2 +- main/sal/qa/rtl/textenc/rtl_textcvt.cxx | 20 ++++++-- .../qa/testHelperFunctions/testHelperFunctions.cxx | 56 +++++++++++++++++----- main/sal/textenc/convertadobe.tab | 6 +-- main/sal/textenc/textenc.cxx | 14 ++++++ main/set_soenv.in | 2 + main/solenv/gbuild/platform/freebsd.mk | 6 +++ main/solenv/gbuild/platform/linux.mk | 6 +++ main/solenv/inc/unxfbsd.mk | 4 ++ main/solenv/inc/unxlng.mk | 4 ++ main/sw/source/filter/ww8/ww8graf.cxx | 3 -- main/sw/source/filter/ww8/ww8scan.cxx | 1 + main/tools/inc/tools/postx.h | 3 -- main/tools/inc/tools/prex.h | 4 ++ main/vcl/unx/generic/printergfx/printerjob.cxx | 1 + test/build.xml | 6 +-- test/smoketestdoc/aoo-ant.xml | 2 +- 19 files changed, 130 insertions(+), 32 deletions(-)
