summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-06 01:50:01 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-08 19:39:14 +0100
commit4115cb18362810d7b92c5a259fe3399c5e760970 (patch)
treebfd4eec391f8730c4101ef794431c3784ae52431 /oox
parent6c4247979d32d7765c0fa892024f62bdae6dfd48 (diff)
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
Diffstat (limited to 'oox')
-rw-r--r--oox/source/ppt/slidetransition.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index e4950c419edf..4380bbd054c6 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -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." );