dev/null |binary sd/qa/unit/data/potx/tdf96389_deftabstopISO29500.potx |binary sd/qa/unit/import-tests2.cxx | 4 ++-- sd/source/ui/docshell/docshel4.cxx | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit da17cebd902b3eb03ee2432327f011d03344cd3a Author: Justin Luth <[email protected]> AuthorDate: Tue Dec 2 10:42:32 2025 -0500 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Dec 8 14:11:47 2025 +0100 tdf#165180 tdf#96389 pptx: treat all 2010 filters the same I can't see any reason why all MS PowerPoint 2010 filters would not fall under the same rules as the main PowerPoint 2010 one. This patch effectively adds "Impress Office Open XML AutoPlay" "Impress Office Open XML Template" Unfortunately, there is nothing visually different in the unit test... make CppunitTest_sd_import_tests2 \ CPPUNIT_TEST_NAME=testTdf96389_deftabstopISO29500 Change-Id: Ifd82fbfe0298a182ddadcdff394fee4c930c81d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195018 Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195134 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sd/qa/unit/data/potx/tdf96389_deftabstopISO29500.potx b/sd/qa/unit/data/potx/tdf96389_deftabstopISO29500.potx new file mode 100644 index 000000000000..8381bf3e0262 Binary files /dev/null and b/sd/qa/unit/data/potx/tdf96389_deftabstopISO29500.potx differ diff --git a/sd/qa/unit/data/pptx/deftabstop.pptx b/sd/qa/unit/data/pptx/deftabstop.pptx deleted file mode 100644 index 5cfe71794446..000000000000 Binary files a/sd/qa/unit/data/pptx/deftabstop.pptx and /dev/null differ diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx index 55441174ddd9..be470f8b782e 100644 --- a/sd/qa/unit/import-tests2.cxx +++ b/sd/qa/unit/import-tests2.cxx @@ -1897,9 +1897,9 @@ CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf128596) CPPUNIT_ASSERT_EQUAL(css::drawing::BitmapMode_REPEAT, bitmapmode); } -CPPUNIT_TEST_FIXTURE(SdImportTest2, testDefaultTabStop) +CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf96389_deftabstopISO29500) { - createSdImpressDoc("pptx/deftabstop.pptx"); + createSdImpressDoc("potx/tdf96389_deftabstopISO29500.potx"); SdXImpressDocument* pXImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); CPPUNIT_ASSERT(pXImpressDocument); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 9176e4d9dc78..06b4c0dc35d5 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -403,6 +403,7 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium, { const OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); const bool bIsPowerPointECMA = aFilterName.startsWith("Impress MS PowerPoint 2007 XML"); + const bool bIsPowerPointISO29500 = aFilterName.startsWith("Impress Office Open XML"); // 2010+ if (bIsPowerPointECMA) { // As this is a MSFT format, we should use the "MS Compat" @@ -435,7 +436,7 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium, mpDoc->SetCompatibilityFlag(SdrCompatibilityFlag::UseTrailingEmptyLinesInLayout, true); } - if (bIsPowerPointECMA || aFilterName == "Impress Office Open XML") + if (bIsPowerPointECMA || bIsPowerPointISO29500) { // We need to be able to set the default tab size for each text object. // This is possible at the moment only for the whole document. See
