test/source/bootstrapfixture.cxx | 53 --------------------------------------- 1 file changed, 53 deletions(-)
New commits: commit be735cd569415580b8da2db49bc87a8397d4e6bb Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 13 10:22:47 2026 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Wed Jan 14 15:37:39 2026 +0100 we dont need this officeotron workaround anymore ever since commit e4978f9079cda7abb7bb424503d780566c728adf Author: Karthik Godha <[email protected]> Date: Mon Nov 24 19:16:51 2025 +0530 Update OOXML schema to follow ECMA-376 5th edition which was part of officeotron 0.8.1 Change-Id: I0b9f8ff0d513ced06cda9f4257454ee756b28322 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197175 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins (cherry picked from commit 4da8f78016adae7da01f3822b87a9422466f26a2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197234 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index c0297d7d211e..a30b10057738 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -140,58 +140,6 @@ OString loadFile(const OUString& rURL) constexpr std::u16string_view grand_total = u"Grand total of errors in submitted package: "; -OUString filterOut(const OUString& s, std::u16string_view excludedSubstr) -{ - OUString result = s; - for (;;) - { - sal_Int32 pos = result.indexOf(excludedSubstr); - if (pos < 0) - break; - sal_Int32 start = result.lastIndexOf(' ', pos); - if (!result.match("ERROR", start + 1)) - return s; // unexpected string format - sal_Int32 end = result.indexOf(' ', pos); - result = result.replaceAt(start, end - start, u""_ustr); - pos = result.lastIndexOf(grand_total); - if (pos < 0) - return s; // unexpected string format - start = end = pos + grand_total.size(); - while (end < result.getLength() && rtl::isAsciiDigit(result[end])) - ++end; - std::u16string_view aNumber = result.subView(start, end - start); - sal_Int32 nErrors = o3tl::toInt32(aNumber) - 1; - result = result.replaceAt(start, end - start, OUString::number(nErrors)); - } - return result; -} - -OUString filterValidationResults(const OUString& s) -{ - OUString result = s; - // In ECMA-376-1 Second Edition, 2008, there is the following restriction for oleObj: - // - // <xsd:choice minOccurs="1" maxOccurs="1"> - // <xsd:element name="embed" type="CT_OleObjectEmbed"/> - // <xsd:element name="link" type="CT_OleObjectLink"/> - // <xsd:element name="pic" type="CT_Picture"/> - // </xsd:choice> - // - // This makes simultaneous use of embed (or link) and pic impossible. This was obviously a - // mistake; and the following editions of standard fixed it: e.g., in ECMA-376-1:2016, that - // rule is - // - // <xsd:choice minOccurs="1" maxOccurs="1"> - // <xsd:element name="embed" type="CT_OleObjectEmbed"/> - // <xsd:element name="link" type="CT_OleObjectLink"/> - // </xsd:choice> - // <xsd:element name="pic" type="CT_Picture" minOccurs="1" maxOccurs="1"/> - // - // 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."); - - return result; -} } #endif @@ -296,7 +244,6 @@ void test::BootstrapFixture::validate(const OUString& rPath, std::u16string_view if( eFormat == test::OOXML && !aContentOUString.isEmpty() ) { - aContentOUString = filterValidationResults(aContentOUString); // check for validation errors here sal_Int32 nIndex = aContentOUString.lastIndexOf(grand_total); if(nIndex == -1)
