distro-configs/Jenkins/macosx_clang_dbgutil | 1 + distro-configs/Jenkins/windows_msc_dbgutil_32 | 1 + distro-configs/Jenkins/windows_msc_dbgutil_64 | 1 + download.lst | 4 ++-- test/source/bootstrapfixture.cxx | 11 ----------- 5 files changed, 5 insertions(+), 13 deletions(-)
New commits: commit 49a1acfd91b9cb30807c42845560b93f87ecc547 Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 13 10:19:57 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Jan 14 07:43:17 2026 +0100 update to officeotron 0.8.8 which means we no longer need the workaround Change-Id: Ibdc47750a7d5eacc9a1e2251e145379f0464b7f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197174 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/download.lst b/download.lst index d557365f4ea8..a0a3da585430 100644 --- a/download.lst +++ b/download.lst @@ -539,8 +539,8 @@ ODFVALIDATOR_JAR := odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab # three static lines # so that git cherry-pick # will not run into conflicts -OFFICEOTRON_SHA256SUM := 0c2a4227394ac78147387f1c1ff1063e87f2151ffc91f1eb97bb17c2650fa708 -OFFICEOTRON_JAR := officeotron-0.8.5.jar +OFFICEOTRON_SHA256SUM := c72cdcb7fe7cfe917d1fb8766ddbc3f92b6124ecd5fb8c6dc0ddabb74a7e057c +OFFICEOTRON_JAR := officeotron-0.8.8.jar # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 34e48bbb16b0..c0297d7d211e 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -190,17 +190,6 @@ OUString filterValidationResults(const OUString& s) // But officeotron only knows the old version... result = filterOut(result, u"Invalid content was found starting with element 'p:pic'. No child element is expected at this point."); - { - /* While the spec says the core-properties relationship must be - * officedocument/2006/relationships/metadata/core-properties - * MS Office actually just writes the ECMA-376-1ST EDITION version - * for both ECMA_Transitional and ISO_Transitional formats. - * - * officeotron doesn't care that clause 15.2.12.1 fails on all MSWord-produced output. - */ - result = filterOut(result, u"Entry with MIME type \"application/vnd.openxmlformats-package.core-properties+xml\" has unrecognized relationship type \"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties\"; (see ISO/IEC 29500-1:2008, Clause 15.2.12.1)"); - } - return result; } } commit c064cf11693a8998cc4b090e48cf84b31dc42266 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Jan 13 15:30:00 2026 +0100 Commit: Noel Grandin <[email protected]> CommitDate: Wed Jan 14 07:43:02 2026 +0100 turn off export validation on Windows/Mac bots The build time doubled in both platforms since the validation started to validate docx files by default Change-Id: Id71c603d7116d9523b8a29f29acdf0961916648e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197198 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/distro-configs/Jenkins/macosx_clang_dbgutil b/distro-configs/Jenkins/macosx_clang_dbgutil index ebb715a75960..d052037bef03 100644 --- a/distro-configs/Jenkins/macosx_clang_dbgutil +++ b/distro-configs/Jenkins/macosx_clang_dbgutil @@ -4,3 +4,4 @@ --enable-optimized --enable-odk --disable-online-update +--without-export-validation diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_32 b/distro-configs/Jenkins/windows_msc_dbgutil_32 index b7827644df9f..6213c993a0a3 100644 --- a/distro-configs/Jenkins/windows_msc_dbgutil_32 +++ b/distro-configs/Jenkins/windows_msc_dbgutil_32 @@ -3,3 +3,4 @@ --disable-dependency-tracking --enable-odk --disable-online-update +--without-export-validation diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_64 b/distro-configs/Jenkins/windows_msc_dbgutil_64 index 464cab64092e..a102fc1e17a8 100644 --- a/distro-configs/Jenkins/windows_msc_dbgutil_64 +++ b/distro-configs/Jenkins/windows_msc_dbgutil_64 @@ -2,3 +2,4 @@ INCLUDE:Jenkins/windows_wsl_common --host=x86_64-pc-cygwin --enable-dbgutil --disable-dependency-tracking +--without-export-validation
