diff options
| -rw-r--r-- | sd/qa/unit/data/odp/loopNoPause.odp | bin | 0 -> 10998 bytes | |||
| -rw-r--r-- | sd/qa/unit/data/odp/loopPause10.odp | bin | 0 -> 10960 bytes | |||
| -rw-r--r-- | sd/qa/unit/data/ppt/loopNoPause.ppt | bin | 0 -> 87552 bytes | |||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 28 | ||||
| -rw-r--r-- | sd/source/core/drawdoc.cxx | 2 |
5 files changed, 29 insertions, 1 deletions
diff --git a/sd/qa/unit/data/odp/loopNoPause.odp b/sd/qa/unit/data/odp/loopNoPause.odp Binary files differnew file mode 100644 index 000000000000..d9be1c2dcac4 --- /dev/null +++ b/sd/qa/unit/data/odp/loopNoPause.odp diff --git a/sd/qa/unit/data/odp/loopPause10.odp b/sd/qa/unit/data/odp/loopPause10.odp Binary files differnew file mode 100644 index 000000000000..0e3e316db314 --- /dev/null +++ b/sd/qa/unit/data/odp/loopPause10.odp diff --git a/sd/qa/unit/data/ppt/loopNoPause.ppt b/sd/qa/unit/data/ppt/loopNoPause.ppt Binary files differnew file mode 100644 index 000000000000..d82879a5247e --- /dev/null +++ b/sd/qa/unit/data/ppt/loopNoPause.ppt diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 56f7a11cc267..c47982d39066 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/XPresentationPage.hpp> +#include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> @@ -195,6 +196,7 @@ public: void testTdf120028b(); void testTdf44223(); void testDescriptionImport(); + void testTdf83247(); CPPUNIT_TEST_SUITE(SdImportTest); @@ -281,6 +283,7 @@ public: CPPUNIT_TEST(testTdf120028b); CPPUNIT_TEST(testTdf44223); CPPUNIT_TEST(testDescriptionImport); + CPPUNIT_TEST(testTdf83247); CPPUNIT_TEST_SUITE_END(); }; @@ -2666,6 +2669,31 @@ void SdImportTest::testDescriptionImport() xDocShRef->DoClose(); } +void SdImportTest::testTdf83247() +{ + auto GetPause = [this](const OUString& sSrc, sal_Int32 nFormat) { + sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc(sSrc), nFormat); + uno::Reference<presentation::XPresentationSupplier> xPresentationSupplier( + xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); + uno::Reference<beans::XPropertySet> xPresentationProps( + xPresentationSupplier->getPresentation(), uno::UNO_QUERY_THROW); + + auto retVal = xPresentationProps->getPropertyValue("Pause"); + xDocShRef->DoClose(); + return retVal.get<sal_Int32>(); + }; + + // 1. Check that presentation:pause attribute is imported correctly + CPPUNIT_ASSERT_EQUAL(sal_Int32(10), GetPause("/sd/qa/unit/data/odp/loopPause10.odp", ODP)); + + // 2. ODF compliance: if presentation:pause attribute is absent, it must be treated as 0 + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), GetPause("/sd/qa/unit/data/odp/loopNoPause.odp", ODP)); + + // 3. Import PPT: pause should be 0 + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), GetPause("/sd/qa/unit/data/ppt/loopNoPause.ppt", PPT)); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 58c8a404b144..1ff77f1283c3 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -105,7 +105,7 @@ PresentationSettings::PresentationSettings() mbAlwaysOnTop( false ), mbFullScreen( true ), mbAnimationAllowed( true ), - mnPauseTimeout( 10 ), + mnPauseTimeout( 0 ), mbShowPauseLogo( false ) { } |