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 5e5879973d4db309481365272f65e80396ca4431 Author: Justin Luth <[email protected]> AuthorDate: Mon Dec 1 17:22:27 2025 -0500 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Dec 8 14:08:17 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 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195133 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> 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 67ab647f6fe8..76e566fb0e8f 100644 --- a/oox/qa/unit/shape.cxx +++ b/oox/qa/unit/shape.cxx @@ -164,9 +164,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 7cb99bc957e6..9176e4d9dc78 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -420,7 +420,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
