oox/source/export/shapes.cxx | 3 +++ sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit 92b2ff40930a9278732943a1fa44e95e898bf78f Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 20 07:39:59 2026 +0100 Commit: Aron Budea <[email protected]> CommitDate: Wed Jan 21 15:21:52 2026 +0100 Revert "mso-test: invalid xdr:twoCellAnchor" This reverts commit 6b9794ea1c6c24d7c48a1b43a9302c51ea607215, because With this change, now these files are corrupt after a RT -forum-mso-en3-23097.docx -forum-mso-en4-364124.docx -forum-mso-en4-428907.docx -tdf104181-3.docx -tdf104181-6.docx Change-Id: Ib3010fbf0868897fbe8d1f325f3ccdd33475cf3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197616 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 2a7ee38519d9b1c3db6efe83ccff50a4af0593d2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197638 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Justin Luth <[email protected]> (cherry picked from commit c206a9e195c017d0c27f1b956c4a083ed64337d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197753 Reviewed-by: Aron Budea <[email protected]> Tested-by: Aron Budea <[email protected]> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 800427baa911..6d4221c9ade3 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1425,7 +1425,10 @@ 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 137d60a6452d..21aabad8e892 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(14, getShapes()); + CPPUNIT_ASSERT_EQUAL(13, getShapes()); } DECLARE_OOXMLEXPORT_TEST(testTdf142404_tabSpacing, "tdf142404_tabSpacing.docx")
