download.lst | 4 ++-- test/source/bootstrapfixture.cxx | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-)
New commits: commit 75e090e47e580ce17470172454ee90ecfcac3801 Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 13 10:19:57 2026 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Wed Jan 14 15:37:13 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]> (cherry picked from commit 49a1acfd91b9cb30807c42845560b93f87ecc547) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197233 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 13d1db0245f2..9a4a148e736d 100644 --- a/download.lst +++ b/download.lst @@ -596,8 +596,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; } }
