dev/null |binary oox/qa/unit/data/tdf165180_standardConnectorsECMA.potx |binary oox/qa/unit/shape.cxx | 6 ++++-- sd/source/ui/docshell/docshel4.cxx | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 011066d92f6739bed09cee58ab1619db46bddea3 Author: Justin Luth <[email protected]> AuthorDate: Mon Dec 1 17:22:27 2025 -0500 Commit: Justin Luth <[email protected]> CommitDate: Fri Dec 5 22:04:03 2025 +0100 tdf#165180 tdf#149756 tdf#152545 pptx: treat all 2007 filters the same I can't see any reason why all MS PowerPoint 2007 filters would not fall under the same rules as the main PowerPoint 2007 one. This patch effectively adds "Impress MS PowerPoint 2007 XML AutoPlay" "Impress MS PowerPoint 2007 XML Template" "Impress MS PowerPoint 2007 XML VBA" Unfortunately, there is nothing visually different in the unit test... make CppunitTest_oox_shape \ CPPUNIT_TEST_NAME=testTdf165180_standardConnectorsECMA Change-Id: I538975ce90b3ce3c5bc68a7779a8617a4e630700 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195017 Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins diff --git a/oox/qa/unit/data/standardConnectors.pptx b/oox/qa/unit/data/standardConnectors.pptx deleted file mode 100644 index 46bb0735f40f..000000000000 Binary files a/oox/qa/unit/data/standardConnectors.pptx and /dev/null differ diff --git a/oox/qa/unit/data/tdf165180_standardConnectorsECMA.potx b/oox/qa/unit/data/tdf165180_standardConnectorsECMA.potx new file mode 100644 index 000000000000..95eb0e748b95 Binary files /dev/null and b/oox/qa/unit/data/tdf165180_standardConnectorsECMA.potx differ diff --git a/oox/qa/unit/shape.cxx b/oox/qa/unit/shape.cxx index 1b51efe3c226..35c8e49bc28e 100644 --- a/oox/qa/unit/shape.cxx +++ b/oox/qa/unit/shape.cxx @@ -168,9 +168,11 @@ CPPUNIT_TEST_FIXTURE(OoxShapeTest, testCurvedConnectors) CPPUNIT_ASSERT_EQUAL(sal_Int32(3019), nEdgeLineDelta); } -CPPUNIT_TEST_FIXTURE(OoxShapeTest, testStandardConnectors) +CPPUNIT_TEST_FIXTURE(OoxShapeTest, testTdf165180_standardConnectorsECMA) { - loadFromFile(u"standardConnectors.pptx"); + // This test was created for tdf#149756 tdf#152545 + // and modified to simply use a template format for tdf#165180 + loadFromFile(u"tdf165180_standardConnectorsECMA.potx"); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index c33264045d97..70978b232d40 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -422,7 +422,7 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium, mpDoc->SetSummationOfParagraphs(); } - if (aFilterName == "Impress MS PowerPoint 2007 XML") + if (bIsPowerPointECMA) { // This is a "MS Compact" mode for connectors. // The Libreoffice uses bounding rectangle of connected shapes but
