sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 9 --------- sw/source/filter/ww8/docxattributeoutput.cxx | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-)
New commits: commit 1c98f3ae9e53fb831347708a845c454b58675e84 Author: Noel Grandin <[email protected]> AuthorDate: Wed Jan 14 15:28:06 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Jan 16 09:09:26 2026 +0100 officeotron: ordering of w:startOverride wrong we end up with <w:lvlOverride w:ilvl="0"> <w:lvl w:ilvl="0"> .... </w:lvl> <w:startOverride w:val="1"/> </w:lvlOverride> but startOverride needs to come before w:lvl Change-Id: Ide251945b312d48101e277970f1a53fc52c8b5a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197290 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index 28ed1b321bad..9d11d309a074 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -760,9 +760,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf142407, "tdf142407.docx") DECLARE_OOXMLEXPORT_TEST(testWPGBodyPr, "WPGbodyPr.docx") { - // FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - // There are a WPG shape and a picture CPPUNIT_ASSERT_EQUAL(2, getShapes()); @@ -808,9 +805,6 @@ DECLARE_OOXMLEXPORT_TEST(testWPGBodyPr, "WPGbodyPr.docx") DECLARE_OOXMLEXPORT_TEST(testTdf146851_1, "tdf146851_1.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<beans::XPropertySet> xPara; xPara.set(getParagraph(1, u"qwerty"_ustr), uno::UNO_QUERY); @@ -995,9 +989,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146955) { createSwDoc("tdf146955.odt"); - // FIXME: validation error in OOXML export: Errors: 9 - skipValidation(); - saveAndReload(TestFilter::DOCX); // import of a (broken?) DOCX export with dozens of frames raised a SAX exception, // when the code tried to access to a non-existent footnote diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 326253db5c5d..1125d04eb89d 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -7788,16 +7788,16 @@ void DocxAttributeOutput::OverrideNumberingDefinition( m_pSerializer->startElementNS(XML_w, XML_lvlOverride, FSNS(XML_w, XML_ilvl), OString::number(nLevel)); - if (bListsAreDifferent) - { - GetExport().NumberingLevel(rRule, nLevel); - } if (levelOverride != rLevelOverrides.end()) { // list numbering restart override m_pSerializer->singleElementNS(XML_w, XML_startOverride, FSNS(XML_w, XML_val), OString::number(levelOverride->second)); } + if (bListsAreDifferent) + { + GetExport().NumberingLevel(rRule, nLevel); + } m_pSerializer->endElementNS(XML_w, XML_lvlOverride); }
