Kaydet (Commit) 59095c79 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

pptx: import/export of honeycomb slide transition

Change-Id: I3edb77d5b046691e64d600d61dcd44e892c31301
üst 9f839284
......@@ -417,6 +417,10 @@ namespace oox { namespace ppt {
mnTransitionType = TransitionType::MISCSHAPEWIPE;
mnTransitionSubType = TransitionSubType::DIAMOND;
break;
case P14_TOKEN(honeycomb):
mnTransitionType = TransitionType::MISCSHAPEWIPE;
mnTransitionSubType = TransitionSubType::HEART;
break;
default:
mnTransitionType = 0;
break;
......
......@@ -132,6 +132,7 @@ SlideTransitionContext::~SlideTransitionContext() throw()
case P14_TOKEN( vortex ):
case P14_TOKEN( ripple ):
case P14_TOKEN( glitter ):
case P14_TOKEN( honeycomb ):
// CT_Empty
if (!mbHasTransition)
{
......
......@@ -1275,8 +1275,11 @@ void SdExportTest::testExportTransitionsPPTX()
// GLITTER
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 72, TransitionType::MISCSHAPEWIPE, TransitionSubType::DIAMOND));
// HONEYCOMB
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 73, TransitionType::MISCSHAPEWIPE, TransitionSubType::HEART));
// NEWSFLASH
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 73, TransitionType::ZOOM, TransitionSubType::ROTATEIN));
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 74, TransitionType::ZOOM, TransitionSubType::ROTATEIN));
}
CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
......
......@@ -597,6 +597,11 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
pPattern = "hexagon";
bOOXmlSpecificTransition = true;
break;
case animations::TransitionSubType::HEART: // Honeycomb
nTransition = XML_fade;
nTransition14 = XML_honeycomb;
bOOXmlSpecificTransition = true;
break;
}
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment