diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2010-10-26 16:25:58 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2010-10-26 16:25:58 +0200 |
| commit | 7f5ebf8baeafd72ccc1fe81c99a4effa2c357712 (patch) | |
| tree | 7b8f04ede8d87805bead488d755306a326337db9 /sd | |
| parent | 8eddddda1d8e0a9401ae16e5c1fe422b2105f42a (diff) | |
MS interop: support for cutblack slidetransition added
Adds CUTBLACK slide transition to ppt import and slideshow
Diffstat (limited to 'sd')
| -rwxr-xr-x[-rw-r--r--] | sd/source/filter/ppt/pptin.cxx | 6 | ||||
| -rw-r--r-- | sd/xml/transitions.xml | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 1934e7142ffb..f1df8f80750b 100644..100755 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1622,7 +1622,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat if ( nDirection == 0 ) pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt else if ( nDirection == 1 ) - pPage->SetFadeEffect( ::com::sun::star::presentation::FadeEffect_NONE ); // Direkt ueber Schwarz + { + pPage->setTransitionType( animations::TransitionType::BARWIPE ); + pPage->setTransitionSubtype( animations::TransitionSubType::FADEOVERCOLOR ); + pPage->setTransitionFadeColor( 0 ); + } } else pPage->setTransitionType( 0 ); diff --git a/sd/xml/transitions.xml b/sd/xml/transitions.xml index 1b77c3ec4732..556eb6f504e8 100644 --- a/sd/xml/transitions.xml +++ b/sd/xml/transitions.xml @@ -111,6 +111,9 @@ <anim:par pres:preset-id="fade-through-black"> <anim:transitionFilter smil:type="fade" smil:subtype="fadeOverColor" smil:fadeColor="#000000"/> </anim:par> + <anim:par pres:preset-id="cut-through-black"> + <anim:transitionFilter smil:type="barWipe" smil:subtype="fadeOverColor" smil:fadeColor="#000000"/> + </anim:par> <anim:par pres:preset-id="cover-down"> <anim:transitionFilter smil:type="slideWipe" smil:subtype="fromTop"/> </anim:par> |