diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-09 10:59:32 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-09 11:00:58 +0100 |
| commit | c24fbd8c8a4f00c4eeaa97528832afa67d4af1e7 (patch) | |
| tree | bad4f6346a5aaea9c6b9c3f832687c724c0cea37 | |
| parent | 733846f20c43588478d01c448f622cc9854bc59e (diff) | |
pptx: import "Vortex" and "Ripple" transition + test
Change-Id: I29d71e9c07c4964275c13772cdb6042624550acb
| -rw-r--r-- | oox/source/ppt/slidetransition.cxx | 8 | ||||
| -rw-r--r-- | oox/source/ppt/slidetransitioncontext.cxx | 2 | ||||
| -rw-r--r-- | sd/qa/unit/data/AllTransitions.odp | bin | 13577 -> 13630 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 12 |
4 files changed, 20 insertions, 2 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 2c130dd120ac..e623558f1962 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -405,6 +405,14 @@ namespace oox { namespace ppt { else mnTransitionSubType = TransitionSubType::CORNERSOUT; break; + case P14_TOKEN(vortex): + mnTransitionType = TransitionType::MISCSHAPEWIPE; + mnTransitionSubType = TransitionSubType::VERTICAL; + break; + case P14_TOKEN(ripple): + mnTransitionType = TransitionType::MISCSHAPEWIPE; + mnTransitionSubType = TransitionSubType::HORIZONTAL; + break; default: mnTransitionType = 0; break; diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index 78d7825eecb6..4a9c996d695b 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -129,6 +129,8 @@ SlideTransitionContext::~SlideTransitionContext() throw() case PPT_TOKEN( plus ): case PPT_TOKEN( random ): case PPT_TOKEN( wedge ): + case P14_TOKEN( vortex ): + case P14_TOKEN( ripple ): // CT_Empty if (!mbHasTransition) { diff --git a/sd/qa/unit/data/AllTransitions.odp b/sd/qa/unit/data/AllTransitions.odp Binary files differindex fa2eced2cc3f..35b7a49f79a1 100644 --- a/sd/qa/unit/data/AllTransitions.odp +++ b/sd/qa/unit/data/AllTransitions.odp diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index bba730a618fa..f16e9e9547fc 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -173,13 +173,15 @@ public: CPPUNIT_TEST(testBulletMarginAndIndentation); CPPUNIT_TEST(testParaMarginAndindentation); CPPUNIT_TEST(testTransparentBackground); - CPPUNIT_TEST(testExportTransitionsPPTX); CPPUNIT_TEST(testTdf91378); #if !defined WNT CPPUNIT_TEST(testBnc822341); #endif CPPUNIT_TEST(testTdf80224); + + CPPUNIT_TEST(testExportTransitionsPPTX); + CPPUNIT_TEST_SUITE_END(); }; @@ -1413,8 +1415,14 @@ void SdExportTest::testExportTransitionsPPTX() // INSIDE TURNING CUBE CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 60, TransitionType::MISCSHAPEWIPE, TransitionSubType::CORNERSIN)); + // VORTEX + CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 70, TransitionType::MISCSHAPEWIPE, TransitionSubType::VERTICAL)); + + // RIPPLE + CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 71, TransitionType::MISCSHAPEWIPE, TransitionSubType::HORIZONTAL)); + // NEWSFLASH - CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 71, TransitionType::ZOOM, TransitionSubType::ROTATEIN)); + CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 72, TransitionType::ZOOM, TransitionSubType::ROTATEIN)); } CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest); |