Skip to content

C
core
Kaydet (Commit) 4115cb18 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl
Dosyalara gözat
Seçenekler

pptx: import/export of "cut through black" transition 

"Cut through black" is not supported in ppt so we detectit only
in pptx specific export code. This needed some changes in the
pptx code for exporting transitions.

Change-Id: Ibc7361311017b3ffadd289db4e8ae233e1101ea8
üst 6c424797
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 95 deletions
oox/source/ppt/slidetransition.cxx
Dosyayı görüntüle @ 4115cb18
......@@ -288,11 +288,9 @@ namespace oox { namespace ppt {
mbTransitionDirectionNormal = false;
break;
case PPT_TOKEN( cut ):
// The binfilter seems to ignore this transition.
// Fade to black instead if thrBlk is true.
if( param1 )
{
mnTransitionType = TransitionType::FADE;
mnTransitionType = TransitionType::BARWIPE;
mnTransitionSubType = TransitionSubType::FADEOVERCOLOR;
}
OSL_TRACE( "OOX: cut transition fallback." );
......
sd/qa/unit/export-tests.cxx
Dosyayı görüntüle @ 4115cb18
......@@ -1401,6 +1401,9 @@ void SdExportTest::testExportTransitionsPPTX()
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 03, TransitionType::BARWIPE, TransitionSubType::LEFTTORIGHT, false));
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 04, TransitionType::BARWIPE, TransitionSubType::TOPTOBOTTOM, true));
// CUT THROUGH BLACK
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 31, TransitionType::BARWIPE, TransitionSubType::FADEOVERCOLOR));
// COMB
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 41, TransitionType::PUSHWIPE, TransitionSubType::COMBHORIZONTAL));
CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 42, TransitionType::PUSHWIPE, TransitionSubType::COMBVERTICAL));
......
sd/source/filter/eppt/pptx-epptooxml.cxx
Dosyayı görüntüle @ 4115cb18
......@@ -515,7 +515,34 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
if( !nPPTTransitionType && eFadeEffect != FadeEffect_NONE )
nPPTTransitionType = GetTransition( eFadeEffect, nDirection );
if( nPPTTransitionType ) {
bool bOOXmlSpecificTransition = false;
sal_Int32 nTransition = 0;
const char* pDirection = NULL;
const char* pOrientation = NULL;
const char* pThruBlk = NULL;
const char* pSpokes = NULL;
char pSpokesTmp[2] = "0";
if (!nPPTTransitionType)
{
switch(nTransitionType)
{
case animations::TransitionType::BARWIPE:
{
if (animations::TransitionSubType::FADEOVERCOLOR)
{
nTransition = XML_cut;
pThruBlk = "true";
bOOXmlSpecificTransition = true;
}
}
break;
}
}
if (nPPTTransitionType || bOOXmlSpecificTransition)
{
AnimationSpeed animationSpeed = AnimationSpeed_MEDIUM;
const char* speed = NULL;
sal_Int32 advanceTiming = -1;
......@@ -549,99 +576,97 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
XML_advTm, advanceTiming != -1 ? I32S( advanceTiming*1000 ) : NULL,
FSEND );
sal_Int32 nTransition = 0;
const char* pDirection = NULL;
const char* pOrientation = NULL;
const char* pThruBlk = NULL;
const char* pSpokes = NULL;
char pSpokesTmp[2] = "0";
switch( nPPTTransitionType ) {
case PPT_TRANSITION_TYPE_BLINDS:
nTransition = XML_blinds;
pDirection = ( nDirection == 0) ? "vert" : "horz";
break;
case PPT_TRANSITION_TYPE_CHECKER:
nTransition = XML_checker;
pDirection = ( nDirection == 1) ? "vert" : "horz";
break;
case PPT_TRANSITION_TYPE_CIRCLE:
nTransition = XML_circle;
break;
case PPT_TRANSITION_TYPE_COMB:
nTransition = XML_comb;
pDirection = ( nDirection == 1) ? "vert" : "horz";
break;
case PPT_TRANSITION_TYPE_COVER:
nTransition = XML_cover;
pDirection = Get8Direction( nDirection );
break;
case PPT_TRANSITION_TYPE_DIAMOND:
nTransition = XML_diamond;
break;
case PPT_TRANSITION_TYPE_DISSOLVE:
nTransition = XML_dissolve;
break;
case PPT_TRANSITION_TYPE_FADE:
nTransition = XML_fade;
pThruBlk = "true";
break;
case PPT_TRANSITION_TYPE_SMOOTHFADE:
nTransition = XML_fade;
break;
case PPT_TRANSITION_TYPE_NEWSFLASH:
nTransition = XML_newsflash;
break;
case PPT_TRANSITION_TYPE_PLUS:
nTransition = XML_plus;
break;
case PPT_TRANSITION_TYPE_PULL:
nTransition = XML_pull;
pDirection = Get8Direction( nDirection );
break;
case PPT_TRANSITION_TYPE_PUSH:
nTransition = XML_push;
pDirection = GetSideDirection( nDirection );
break;
case PPT_TRANSITION_TYPE_RANDOM:
nTransition = XML_random;
break;
case PPT_TRANSITION_TYPE_RANDOM_BARS:
nTransition = XML_randomBar;
pDirection = ( nDirection == 1) ? "vert" : "horz";
break;
case PPT_TRANSITION_TYPE_SPLIT:
nTransition = XML_split;
pDirection = ( nDirection & 1) ? "in" : "out";
pOrientation = ( nDirection < 2) ? "horz" : "vert";
break;
case PPT_TRANSITION_TYPE_STRIPS:
nTransition = XML_strips;
pDirection = GetCornerDirection( nDirection );
break;
case PPT_TRANSITION_TYPE_WEDGE:
nTransition = XML_wedge;
break;
case PPT_TRANSITION_TYPE_WHEEL:
nTransition = XML_wheel;
if( nDirection != 4 && nDirection <= 9 ) {
pSpokesTmp[0] = '0' + nDirection;
pSpokes = pSpokesTmp;
if (!bOOXmlSpecificTransition)
{
switch(nPPTTransitionType)
{
case PPT_TRANSITION_TYPE_BLINDS:
nTransition = XML_blinds;
pDirection = (nDirection == 0) ? "vert" : "horz";
break;
case PPT_TRANSITION_TYPE_CHECKER:
nTransition = XML_checker;
pDirection = ( nDirection == 1) ? "vert" : "horz";
break;
case PPT_TRANSITION_TYPE_CIRCLE:
nTransition = XML_circle;
break;
case PPT_TRANSITION_TYPE_COMB:
nTransition = XML_comb;
pDirection = (nDirection == 1) ? "vert" : "horz";
break;
case PPT_TRANSITION_TYPE_COVER:
nTransition = XML_cover;
pDirection = Get8Direction( nDirection );
break;
case PPT_TRANSITION_TYPE_DIAMOND:
nTransition = XML_diamond;
break;
case PPT_TRANSITION_TYPE_DISSOLVE:
nTransition = XML_dissolve;
break;
case PPT_TRANSITION_TYPE_FADE:
nTransition = XML_fade;
pThruBlk = "true";
break;
case PPT_TRANSITION_TYPE_SMOOTHFADE:
nTransition = XML_fade;
break;
case PPT_TRANSITION_TYPE_NEWSFLASH:
nTransition = XML_newsflash;
break;
case PPT_TRANSITION_TYPE_PLUS:
nTransition = XML_plus;
break;
case PPT_TRANSITION_TYPE_PULL:
nTransition = XML_pull;
pDirection = Get8Direction(nDirection);
break;
case PPT_TRANSITION_TYPE_PUSH:
nTransition = XML_push;
pDirection = GetSideDirection(nDirection);
break;
case PPT_TRANSITION_TYPE_RANDOM:
nTransition = XML_random;
break;
case PPT_TRANSITION_TYPE_RANDOM_BARS:
nTransition = XML_randomBar;
pDirection = (nDirection == 1) ? "vert" : "horz";
break;
case PPT_TRANSITION_TYPE_SPLIT:
nTransition = XML_split;
pDirection = (nDirection & 1) ? "in" : "out";
pOrientation = (nDirection < 2) ? "horz" : "vert";
break;
case PPT_TRANSITION_TYPE_STRIPS:
nTransition = XML_strips;
pDirection = GetCornerDirection( nDirection );
break;
case PPT_TRANSITION_TYPE_WEDGE:
nTransition = XML_wedge;
break;
case PPT_TRANSITION_TYPE_WHEEL:
nTransition = XML_wheel;
if( nDirection != 4 && nDirection <= 9 ) {
pSpokesTmp[0] = '0' + nDirection;
pSpokes = pSpokesTmp;
}
break;
case PPT_TRANSITION_TYPE_WIPE:
nTransition = XML_wipe;
pDirection = GetSideDirection( nDirection );
break;
case PPT_TRANSITION_TYPE_ZOOM:
nTransition = XML_zoom;
pDirection = (nDirection == 1) ? "in" : "out";
break;
// coverity[dead_error_line] - following conditions exist to avoid compiler warning
case PPT_TRANSITION_TYPE_NONE:
default:
nTransition = 0;
break;
}
break;
case PPT_TRANSITION_TYPE_WIPE:
nTransition = XML_wipe;
pDirection = GetSideDirection( nDirection );
break;
case PPT_TRANSITION_TYPE_ZOOM:
nTransition = XML_zoom;
pDirection = ( nDirection == 1) ? "in" : "out";
break;
// coverity[dead_error_line] - following conditions exist to avoid compiler warning
case PPT_TRANSITION_TYPE_NONE:
default:
nTransition = 0;
break;
}
if( nTransition )
......
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