summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-09 10:59:32 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-09 11:00:58 +0100
commitc24fbd8c8a4f00c4eeaa97528832afa67d4af1e7 (patch)
treebad4f6346a5aaea9c6b9c3f832687c724c0cea37 /sd
parentpptx: export "Ripple" and "Vortex" transition (diff)
downloadcore-c24fbd8c8a4f00c4eeaa97528832afa67d4af1e7.tar.gz
core-c24fbd8c8a4f00c4eeaa97528832afa67d4af1e7.zip
pptx: import "Vortex" and "Ripple" transition + test
Change-Id: I29d71e9c07c4964275c13772cdb6042624550acb
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/unit/data/AllTransitions.odpbin13577 -> 13630 bytes
-rw-r--r--sd/qa/unit/export-tests.cxx12
2 files changed, 10 insertions, 2 deletions
diff --git a/sd/qa/unit/data/AllTransitions.odp b/sd/qa/unit/data/AllTransitions.odp
index fa2eced2cc3f..35b7a49f79a1 100644
--- a/sd/qa/unit/data/AllTransitions.odp
+++ b/sd/qa/unit/data/AllTransitions.odp
Binary files differ
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);