diff options
| author | Mark Hung <marklh9@gmail.com> | 2018-09-03 21:56:07 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2018-09-04 18:15:34 +0200 |
| commit | 6db1448eaa30ac7e2ebc64ad561b1d4a2c6e4ff2 (patch) | |
| tree | dc9b05b0ce9f5adbffe0afaef5d1bfed35448f1b /sd/qa | |
| parent | 8d7b1f2e7c13a1ebcf6dfa2afed80f1df6d2565d (diff) | |
tdf#119629 Fix keytime formula and missing effect node type.
1. Don't override keytime formula value if already read.
2. MSO's effect node type Click parallel node, with group node,
after group node were missing, now mapping to ON_CLICK,
WITH_PREVIOUS, AFTER_PREVIOUS correspondingly.
Change-Id: Id81d6c8597f4de58a7face3f013fcd7a36bb0fd9
Reviewed-on: https://gerrit.libreoffice.org/59940
Tested-by: Jenkins
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/data/ppt/tdf119629.ppt | bin | 0 -> 112128 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 22 |
2 files changed, 22 insertions, 0 deletions
diff --git a/sd/qa/unit/data/ppt/tdf119629.ppt b/sd/qa/unit/data/ppt/tdf119629.ppt Binary files differnew file mode 100644 index 000000000000..b9c90e916fff --- /dev/null +++ b/sd/qa/unit/data/ppt/tdf119629.ppt diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index b17fb213c5b1..3e5bd8ef3bfb 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -102,6 +102,7 @@ public: void testTdf115394PPT(); void testBulletsAsImage(); void testTdf113818(); + void testTdf119629(); void testTdf113822(); CPPUNIT_TEST_SUITE(SdExportTest); @@ -130,6 +131,7 @@ public: CPPUNIT_TEST(testTdf115394PPT); CPPUNIT_TEST(testBulletsAsImage); CPPUNIT_TEST(testTdf113818); + CPPUNIT_TEST(testTdf119629); CPPUNIT_TEST(testTdf113822); CPPUNIT_TEST_SUITE_END(); @@ -1137,6 +1139,26 @@ void SdExportTest::testTdf113818() xDocShRef->DoClose(); } +void SdExportTest::testTdf119629() +{ + utl::TempFile tempFile; + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf119629.ppt"), PPT); + xDocShRef = saveAndReload(xDocShRef.get(), PPT); + xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile); + + xmlDocPtr pXmlDoc = parseExport(tempFile, "content.xml"); + + // MSO's effect node type Click parallel node, with group node, after group node + // were missing. + assertXPath(pXmlDoc, "//draw:page" + "/anim:par[@presentation:node-type='timing-root']" + "/anim:seq[@presentation:node-type='main-sequence']" + "/anim:par[@presentation:node-type='on-click']" + "/anim:par[@presentation:node-type='with-previous']" + "/anim:par[@presentation:node-type='on-click']" + "/anim:animate[@anim:formula='width*sin(2.5*pi*$)']", 1); + xDocShRef->DoClose(); +} CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest); |