en Copyright 2025 Java http://opengrok.openoffice.org:8080/history/AOO42X/#f612a329d949995c5ddbe9c69f54790f1a78c359 Fix the ambiguity between NULL pointer and 0UL that MSVCcomplains about on the Windows/x86-64 build.Patch by: me(cherry picked from commit 53abccca07615f75317952e908fe340e2b71d6c0) List of files: /AOO42X/main/xmloff/source/style/impastp1.cxx/AOO42X/main/xmloff/source/style/impastp4.cxx/AOO42X/main/xmloff/source/style/xmlstyle.cxx Wed, 01 Jan 2025 13:00:00 +0000 Damjan Jovanovic <damjan@apache.org> http://opengrok.openoffice.org:8080/history/AOO42X/#d448e1e6676b19015ce91e8d71fe01b9ec49292e Add missing include directivesThey are required under Linux(cherry picked from commit 88cf7e972200271fb6f6b7607c004d42d3587caa) List of files: /AOO42X/main/sw/source/filter/ww8/ww8scan.cxx/AOO42X/main/vcl/unx/generic/printergfx/printerjob.cxx Sun, 05 Jul 2026 14:00:00 +0000 Arrigo Marchiori <ardovm@yahoo.it> http://opengrok.openoffice.org:8080/history/AOO42X/#61ceef5ddbb98d1585077f6c64ca745c563d6df0 Step Three of AOO42X macOS build backports.Fix the --with-system-icu build plumbingicuversion.mk is only delivered when building the bundled ICU, so guardthe include; and pass icu-config --cppflags through to compiles, whichuntil now only worked by accident on Linux, where the ICU headersalready sit in a default search path.Both confirmed by i18npool going on to compile against the system ICUheaders. A complete system-ICU build still stops after that, as ICU 78needs C++17 and this branch builds macOS at C++11.Not a backport: trunk has neither fix and needs both. List of files: /AOO42X/main/i18npool/Library_i18npool.mk/AOO42X/main/set_soenv.in Fri, 07 Aug 2026 10:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#a230972184deb427a995e0eb922a5743673d1d16 Step One of AOO42X macOS build backports.Backport the macOS/arm64 C++-UNO bridge hardening from trunkCherry-picks d9eb145fce, 79670aa18e, 245a583a7b, adce10bba5 and9ff3e22531; AOO42X had only the original arm64 port. CoversJIT-protected vtable writes, HFA argument and return marshalling, andsynthesising exception RTTI, which clang emits hidden for keylessclasses on arm64 Darwin.Apply in that order: d9eb145fce defines JitWriteGuard, which the latercommits use. List of files: /AOO42X/main/solenv/bin/addsym-macosx.sh/AOO42X/main/solenv/src/component.map/AOO42X/main/testtools/com/sun/star/comp/bridge/TestComponent.java/AOO42X/main/testtools/source/bridgetest/bridgetest.cxx/AOO42X/main/testtools/source/bridgetest/cli/cli_cs_testobj.cs/AOO42X/main/testtools/source/bridgetest/cppobj.cxx/AOO42X/main/testtools/source/bridgetest/idl/bridgetest.idl Fri, 07 Aug 2026 10:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#1e361ffd27367b00a8000f78e918297c41e8379c Step Two of AOO42X macOS build backports.Backport macOS build and packaging fixes from trunkFrom 4195d08bb6: drop --with-www=xml from raptor, rasqal and redland,as libxml2 2.12 removed xmlNanoHTTP*; add the mso_lineNone sentinel sothe ww8 filter no longer switches on a value outside MSO_LineStyle.From 6ebbb19991: resolve $TMPDIR through Cwd::realpath beforepackaging, since Archive::Zip refuses to extract through the /varsymlink. Only that hunk applies here; the macab1 path change istrunk-specific, as AOO42X still delivers macab1.component flat. List of files: /AOO42X/main/filter/source/msfilter/msdffimp.cxx/AOO42X/main/redland/raptor/makefile.mk/AOO42X/main/redland/rasqal/makefile.mk/AOO42X/main/redland/redland/makefile.mk/AOO42X/main/solenv/bin/modules/installer/parameter.pm/AOO42X/main/svx/inc/svx/msdffdef.hxx/AOO42X/main/sw/source/filter/ww8/ww8graf.cxx/AOO42X/main/sw/source/filter/ww8/ww8par.cxx Fri, 07 Aug 2026 10:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#4421c0a19de5765a74284db758e89d8d0d7e5b0b Step Four of AOO42X macOS build backports.testtools: rebuild uno_types.rdb when bridgetest.idl changesThe registry merges in bridgetest.rdb but did not depend on it, so anIDL edit left it describing the old interface while the headers andlibraries described the new one, and the bridge dispatched the addedmethods through stale vtable slots. It only ever came out right on aclean build.$? can no longer name the copy source now that there are twoprerequisites.Not a backport: trunk has the same bug and needs the same fix. List of files: /AOO42X/main/testtools/source/bridgetest/makefile.mk Fri, 07 Aug 2026 10:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#a3755bb1965cae69a2694ff18ee39835b152d832 rtl: guard rtl_str/rtl_ustr entry points against NULL in debug builds(cherry picked from commit f0853378f1a90e669189f0f58595ee993d034643, source-only —the accompanying qa/rtl/ostring and qa/rtl/oustring test rewrites are notpart of AOO42X's build.lst and ENABLE_UNIT_TESTS is off by default, so theydon't apply here) List of files: /AOO42X/main/sal/rtl/source/strtmpl.c Fri, 07 Aug 2026 10:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#93b8026614f5d70f8783b249285a4f981e9b309e libxml2: build --without-iconv, and drop the resulting -liconv linkageNo OpenOffice code calls iconv, and libxml2-configure.patch has alwaysmeant to disable it -- but it patches the generated xmlversion.h, whichconfigure regenerates, so it never took effect. Windows already passediconv=no.--with-static-system-libs=libiconv stays, for a system libxml2 whose ownbuild enabled iconv and whose xml2-config therefore reports -liconv. List of files: /AOO42X/main/libxml2/makefile.mk/AOO42X/main/solenv/inc/libs.mk Thu, 06 Aug 2026 23:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#5148e70946c01d6598acd2e37133813c284b635b Fix sal encoding-dispatch off-by-one (ISCII removal) + ZapfDingbats table bugs (#488)Impl_getTextEncodingData() is a positional array indexed by the ABI-frozenrtl_TextEncoding enum. #i119141 removed the ISCII converter but deleted itsarray slot with no NULL placeholder, shifting JAVA_UTF8, ADOBE_STANDARD,ADOBE_SYMBOL, PT154 and ADOBE_DINGBATS onto the wrong converter. Restore theNULL slot and add a compile-time size guard.Wiring ADOBE_DINGBATS correctly surfaced three latent ZapfDingbats tableerrors (0x6C→U+25CF; reverse range to U+2797; circled-digits reverse start0xAC); fix all three. Update rtl_textcvt qa: park the now-unimplemented ISCIIbehind TEST_ISCII_DEVANAGARI, correct the ISCII Windows codepage to 57002.(cherry picked from commit a9afaeb67b88027bd0a60034e84d56dc7c60c68b) List of files: /AOO42X/main/sal/qa/rtl/textenc/rtl_textcvt.cxx/AOO42X/main/sal/textenc/convertadobe.tab/AOO42X/main/sal/textenc/textenc.cxx Sun, 05 Jul 2026 17:00:00 +0000 Peter <leginee@users.noreply.github.com> http://opengrok.openoffice.org:8080/history/AOO42X/#d8b52f69d8c795d16e12e5cd944e2fc0e95dfc78 Fixed typogit-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1860603 13f79535-47bb-0310-9956-ffa450edef68(cherry picked from commit 217556ffc8c131b608cf5e06409613bcc0265419) List of files: /AOO42X/main/scripting/README Tue, 04 Jun 2019 11:00:00 +0000 Matthias Seidel <mseidel@apache.org> http://opengrok.openoffice.org:8080/history/AOO42X/#06d4d1ca0f536cdc52f7bde77dbcde0a83ff2e2a ustring.c: gate the mixed UTF-16/ASCII NULL guards behind OSL_DEBUG_LEVELstrtmpl.c's aImplGuardEmptyStr, which these macros reference, only existsunder OSL_DEBUG_LEVEL > 0. Without a matching guard here, a product buildfails: "use of undeclared identifier 'aImplGuardEmptyStr'". Mirrorsstrtmpl.c's own #if/#else pattern. Found by an actual product-buildrebuild of AOO42X after picking a3755bb196; trunk has the same bug. List of files: /AOO42X/main/sal/rtl/source/ustring.c Fri, 07 Aug 2026 11:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#38b1ce9df0a5b232cab949038c3fae73a2244274 Run the remaining Extension Manager dialogs on the main thread List of files: /AOO42X/main/desktop/source/deployment/gui/dp_gui_dialog2.cxx/AOO42X/main/desktop/source/deployment/gui/dp_gui_dialog2.hxx/AOO42X/main/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx/AOO42X/main/desktop/source/deployment/gui/dp_gui_handleversionexception.cxx Fri, 07 Aug 2026 21:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#987134dfd35a79cfa110957f7cda084da5576a36 Add support for iODBC on *nix.On *nix (Linux and FreeBSD), instead of only trying to load theunixODBC driver manager, try that first but fall back to iODBC'sdriver manager otherwise. These platforms have both, and we canuse both, and only use iODBC on Mac, so there's no point inavoiding iODBC on *nix.Fixes: https://bz.apache.org/ooo/show_bug.cgi?id=128632(cherry picked from commit 559fc678afa1e0758f8514b5b7514953e13a4ef4) List of files: /AOO42X/main/connectivity/source/drivers/odbc/OFunctions.cxx/AOO42X/main/dbaccess/source/ui/dlg/odbcconfig.cxx Fri, 26 Jun 2026 17:00:00 +0000 Damjan Jovanovic <damjan@apache.org> http://opengrok.openoffice.org:8080/history/AOO42X/#77f9ea5be6029c993eb5a2030091c4e61270558e Get the integer parameters passed to Min() to have the same typeon all platforms.Patch by: me(cherry picked from commit 50afe12f1bad5058f456099ad5e48203f14c167f)(cherry picked from commit 43d3b3372455c0d584c915485ab9a06ce70b2065) List of files: /AOO42X/main/connectivity/source/drivers/dbase/DTable.cxx Sat, 04 Jan 2025 12:00:00 +0000 Damjan Jovanovic <damjan@apache.org> http://opengrok.openoffice.org:8080/history/AOO42X/#abb4d0ef01ec74db85b620a50311367f82e614f1 configure.ac: allow autoconf 2.71 except on macOS, which needs 2.72due to the toolchain fixes in autoconf 2.72.(cherry picked from commit 0791cec65c0068740b3ca6cd1f3e87bc165ce041) List of files: /AOO42X/main/configure.ac Wed, 05 Aug 2026 11:00:00 +0000 Jim Jagielski <jimjag@gmail.com> http://opengrok.openoffice.org:8080/history/AOO42X/#5438bcb3668b99204624416818dbc0bb29fe96f0 Mode change List of files: /AOO42X/main/config.guess Fri, 07 Aug 2026 13:00:00 +0000 Jim Jagielski <jimjag@gmail.com>