oox/source/export/shapes.cxx | 3 --- sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
New commits: commit 4158108427515dce8452dd1026a4f0412ce3ca9a Author: Noel Grandin <[email protected]> AuthorDate: Thu Nov 6 15:04:48 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Nov 7 10:01:15 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]> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 4b055f45f6f4..e200803ba52b 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1408,10 +1408,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 f4dbdaec15bc..14abb6b3ee5d 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")
