oox/source/export/chartexport.cxx | 3 ++- oox/source/export/shapes.cxx | 3 --- sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 515aa2de6a9accd898c55ca559378f142d0b6502 Author: Noel Grandin <[email protected]> AuthorDate: Thu Nov 6 13:37:13 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Nov 10 10:04:25 2025 +0100 mso-test: c:noMultiLvlLbl not valid for category axis This is using the test document from forum-mso-en4-58299.xls. Importing and exporting to XLSX and then running officeotron generates an error. The c:noMultiLvlLbl element is only valid for category axes, not date axes. Change-Id: If24941b9802a8e6e8f4e9243ad8f5cf07a85b1d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193527 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit cdf2a068a6c5f4d4d8051d845a08f9552b913079) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193545 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 1fa4d0e6c95bddecbcc63bc6622187a8be2ee48d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193565 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index eb06aa73e888..7ba674ed2537 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -4177,7 +4177,8 @@ void ChartExport::exportOneAxis_chart( } // FIXME: seems not support? noMultiLvlLbl - pFS->singleElement(FSNS(XML_c, XML_noMultiLvlLbl), XML_val, OString::number(0)); + if( nAxisType == XML_catAx ) + pFS->singleElement(FSNS(XML_c, XML_noMultiLvlLbl), XML_val, OString::number(0)); } // crossBetween commit 83a8b73ab4046020cd6da5bf85b20c8c22948eba Author: Noel Grandin <[email protected]> AuthorDate: Thu Nov 6 15:04:48 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Nov 10 10:04:21 2025 +0100 mso-test: invalid xdr:twoCellAnchor This is using the test document from fdo73254-1.xls. Importing and exporting to XLSX and then running officeotron generates an error. The xdr:twoCellAnchor has mandatory subelements, so we cannot skip writing them, even if we have no graphic or media URL. The code I am removing seems to be from commit cbcffbaee204e9dfbdc2125dda73e36d77e9b844 Author: Jan Holesovsky <[email protected]> Date: Tue Sep 5 16:53:14 2017 +0200 tdf#106867: Export videos in PPTX. Change-Id: Ie095bad8ea9bf92b553448205f00c9cacf42d513 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193538 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 4158108427515dce8452dd1026a4f0412ce3ca9a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193570 Tested-by: Jenkins (cherry picked from commit 6b9794ea1c6c24d7c48a1b43a9302c51ea607215) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193602 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index fb285eeb6a13..ba5384d233f8 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1407,10 +1407,7 @@ void ShapeExport::WriteGraphicObjectShapePart( const Reference< XShape >& xShape && (xShapeProps->getPropertyValue(u"MediaURL"_ustr) >>= sMediaURL); if (!xGraphic.is() && !bHasMediaURL) - { SAL_INFO("oox.shape", "no graphic or media URL found"); - return; - } FSHelperPtr pFS = GetFS(); XmlFilterBase* pFB = GetFB(); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index 21aabad8e892..137d60a6452d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -567,7 +567,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf141173_missingFrames) loadAndReload("tdf141173_missingFrames.rtf"); // Without the fix in place, almost all of the text and textboxes were missing. // Without the fix, there were only 2 shapes (mostly unseen). - CPPUNIT_ASSERT_EQUAL(13, getShapes()); + CPPUNIT_ASSERT_EQUAL(14, getShapes()); } DECLARE_OOXMLEXPORT_TEST(testTdf142404_tabSpacing, "tdf142404_tabSpacing.docx")
