diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-13 10:10:17 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-13 10:15:08 +0100 |
| commit | f6ef7e33b034d4ee5fb85ae4b72d8d255fbed2b6 (patch) | |
| tree | 7b380ff59088c930d26432f015991975db1819b9 /sd | |
| parent | 1c482cb54b4dab4c5b549ecd2395104f042e4101 (diff) | |
slideshow: add "glitter" slide transition
Change-Id: Ie89b64c4399cd0092eee579660c9fe85f8ca8e73
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/AllTransitions.odp | bin | 13630 -> 13684 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 5 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 16 | ||||
| -rw-r--r-- | sd/xml/transitions-ogl.xml | 3 |
4 files changed, 20 insertions, 4 deletions
diff --git a/sd/qa/unit/data/AllTransitions.odp b/sd/qa/unit/data/AllTransitions.odp Binary files differindex 35b7a49f79a1..11c7c9c520a0 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 b0dcb74807a1..ba6c3092d3f7 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -1424,8 +1424,11 @@ void SdExportTest::testExportTransitionsPPTX() // RIPPLE CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 71, TransitionType::MISCSHAPEWIPE, TransitionSubType::HORIZONTAL)); + // GLITTER + CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 72, TransitionType::MISCSHAPEWIPE, TransitionSubType::DIAMOND)); + // NEWSFLASH - CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 72, TransitionType::ZOOM, TransitionSubType::ROTATEIN)); + CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 73, TransitionType::ZOOM, TransitionSubType::ROTATEIN)); } CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 257de7ca769f..95d6b38e7738 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -523,15 +523,17 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS ) sal_Int32 nTransition = 0; const char* pDirection = nullptr; - const char* pDirection14 = nullptr; const char* pOrientation = nullptr; const char* pThruBlk = nullptr; const char* pSpokes = nullptr; + char pSpokesTmp[2] = "0"; // p14 sal_Int32 nTransition14 = 0; + const char* pDirection14 = nullptr; const char* pInverted = nullptr; + const char* pPattern = nullptr; // diamond or hexagon //p15 const char* pPresetTransition = nullptr; @@ -581,13 +583,20 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS ) pPresetTransition = "fallOver"; bOOXmlSpecificTransition = true; break; - case animations::TransitionSubType::CORNERSIN: + case animations::TransitionSubType::CORNERSIN: // Inside turning cube pInverted = "true"; - case animations::TransitionSubType::CORNERSOUT: + case animations::TransitionSubType::CORNERSOUT: // Outside turning cube nTransition = XML_fade; nTransition14 = XML_prism; bOOXmlSpecificTransition = true; break; + case animations::TransitionSubType::DIAMOND: // Glitter + nTransition = XML_fade; + nTransition14 = XML_glitter; + pDirection14 = "l"; + pPattern = "hexagon"; + bOOXmlSpecificTransition = true; + break; } break; } @@ -644,6 +653,7 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS ) pFS->singleElementNS(XML_p14, nTransition14, XML_isInverted, pInverted, XML_dir, pDirection14, + XML_pattern, pPattern, FSEND ); } else if (pPresetTransition) diff --git a/sd/xml/transitions-ogl.xml b/sd/xml/transitions-ogl.xml index d5411334117a..d149c21b9abb 100644 --- a/sd/xml/transitions-ogl.xml +++ b/sd/xml/transitions-ogl.xml @@ -65,6 +65,9 @@ <anim:par pres:preset-id="ripple"> <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="horizontal"/> </anim:par> + <anim:par pres:preset-id="glitter"> + <anim:transitionFilter smil:type="miscShapeWipe" smil:subtype="diamond"/> + </anim:par> <anim:par pres:preset-id="zoom-rotate-in"> <anim:transitionFilter smil:type="zoom" smil:subtype="rotateIn"/> </anim:par> |