diff options
| author | Tor Lillqvist <tml@openoffice.org> | 2010-03-23 14:53:41 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@openoffice.org> | 2010-03-23 14:53:41 +0200 |
| commit | c8ae599787fdf54c1e44d52545966309e1b30eba (patch) | |
| tree | 9646ada5b6832fd12525c15153ba788bf65f5bdb /oox | |
| parent | 4ae3da9fd3ffe94757b52847f6e853e5555b5851 (diff) | |
ooxml10: oox-pptx-import-fix-wipe-transition.diff from ooo-build
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/ppt/slidetransition.hxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/slidetransition.cxx | 36 |
2 files changed, 37 insertions, 1 deletions
diff --git a/oox/inc/oox/ppt/slidetransition.hxx b/oox/inc/oox/ppt/slidetransition.hxx index 5427d90a5e35..df2eed4d6083 100644 --- a/oox/inc/oox/ppt/slidetransition.hxx +++ b/oox/inc/oox/ppt/slidetransition.hxx @@ -56,6 +56,8 @@ namespace oox { namespace ppt { static sal_Int16 ooxToOdpEightDirections( ::sal_Int32 nOoxType ); static sal_Int16 ooxToOdpCornerDirections( ::sal_Int32 nOoxType ); static sal_Int16 ooxToOdpBorderDirections( ::sal_Int32 nOoxType ); + static sal_Int16 ooxToOdpSideDirections( ::sal_Int32 nOoxType ); + static sal_Bool ooxToOdpSideDirectionsDirectionNormal( ::sal_Int32 nOoxType ); void setOoxTransitionType( ::sal_Int32 OoxType, ::sal_Int32 param1, ::sal_Int32 param2 ); diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index bdfc1621e486..ee889e13d840 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -176,6 +176,39 @@ namespace oox { namespace ppt { return nOdpDirection; } + sal_Int16 SlideTransition::ooxToOdpSideDirections( ::sal_Int32 nOoxType ) + { + sal_Int16 nOdpDirection; + switch( nOoxType ) + { + case XML_d: + case XML_u: + nOdpDirection = TransitionSubType::TOPTOBOTTOM; + break; + case XML_l: + case XML_r: + nOdpDirection = TransitionSubType::LEFTTORIGHT; + break; + default: + nOdpDirection= 0; + break; + } + return nOdpDirection; + } + + sal_Bool SlideTransition::ooxToOdpSideDirectionsDirectionNormal( ::sal_Int32 nOoxType ) + { + sal_Bool nOdpDirection = true; + switch( nOoxType ) + { + case XML_u: + case XML_l: + nOdpDirection = false; + break; + } + return nOdpDirection; + } + sal_Int16 SlideTransition::ooxToOdpCornerDirections( ::sal_Int32 nOoxType ) { sal_Int16 nOdpDirection; @@ -291,7 +324,8 @@ namespace oox { namespace ppt { break; case NMSP_PPT|XML_wipe: mnTransitionType = TransitionType::BARWIPE; - mnTransitionSubType = ooxToOdpBorderDirections( param1 ); + mnTransitionSubType = ooxToOdpSideDirections( param1 ); + mbTransitionDirectionNormal = ooxToOdpSideDirectionsDirectionNormal( param1 ); break; case NMSP_PPT|XML_split: mnTransitionType = TransitionType::BARNDOORWIPE; |