sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 15 --------------- sw/source/filter/ww8/docxtablestyleexport.cxx | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-)
New commits: commit 31ed14cdc3880d3cd04fe70724ec62c286eca715 Author: Noel Grandin <[email protected]> AuthorDate: Tue Dec 9 21:20:13 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Dec 10 09:51:09 2025 +0100 officeotron: w:spacing in wrong order found by converting the document in testNumberedList to docx, then running officeotron on it. Change-Id: I090b38a9a2e74dd8ec1c64aa818d976e319f59b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195333 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index eb62bd953a71..3577484a63ed 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -229,9 +229,6 @@ CPPUNIT_TEST_FIXTURE(Test, testNumberedList) { createSwDoc("NumberedList.docx"); - //FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - saveAndReload(TestFilter::DOCX); //fdo74150:In document.xml, for pStyle = "NumberedList1", iLvl and numId was not preserved xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -248,9 +245,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf131819) { createSwDoc("NumberedList.docx"); - //FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - save(TestFilter::DOCX); // keep width of fixed size cells in the nested table xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -263,9 +257,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf131959) { createSwDoc("NumberedList.docx"); - //FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - save(TestFilter::DOCX); // import tblInd from table style xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -304,9 +295,6 @@ CPPUNIT_TEST_FIXTURE(Test, testContentTypeTIF) DECLARE_OOXMLEXPORT_TEST(testFDO77117, "fdo77117.docx") { - //FIXME: validation error in OOXML export: Errors: 6 - skipValidation(); - uno::Reference<drawing::XShapes> xGroup(getShape(1), uno::UNO_QUERY); uno::Reference<text::XTextRange> xShape(xGroup->getByIndex(0), uno::UNO_QUERY); // This checks textbox textrun size of font which is in group shape. @@ -358,9 +346,6 @@ CPPUNIT_TEST_FIXTURE(Test, testOldComplexMergeTableInTable) { createSwDoc("ooo96040-2.odt"); - //FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - save(TestFilter::DOCX); parseExport(u"word/document.xml"_ustr); diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx index 9397ea3e57bb..0e864b095015 100644 --- a/sw/source/filter/ww8/docxtablestyleexport.cxx +++ b/sw/source/filter/ww8/docxtablestyleexport.cxx @@ -497,9 +497,9 @@ void DocxTableStyleExport::Impl::tableStylePPr(const uno::Sequence<beans::Proper } if (bWordWrap) m_pSerializer->singleElementNS(XML_w, XML_wordWrap); - tableStylePInd(aInd); handleBoolean(aSnapToGrid, XML_snapToGrid); tableStylePSpacing(aSpacing); + tableStylePInd(aInd); if (!aJc.isEmpty()) m_pSerializer->singleElementNS(XML_w, XML_jc, FSNS(XML_w, XML_val), aJc);
