animations/source/animcore/animcore.cxx | 14 +++++ include/xmloff/xmltoken.hxx | 2 offapi/com/sun/star/presentation/EffectPresetClass.idl | 1 sd/inc/strings.hrc | 1 sd/source/ui/animations/CustomAnimationList.cxx | 3 + slideshow/source/engine/animationnodes/animationnodefactory.cxx | 4 - xmloff/source/core/xmltoken.cxx | 2 xmloff/source/draw/animationexport.cxx | 24 ++++++++++ xmloff/source/draw/animationimport.cxx | 2 xmloff/source/token/tokens.txt | 2 10 files changed, 53 insertions(+), 2 deletions(-)
New commits: commit 3f22ecd6264f9a355a0b32ddfafba96c5dc4b8a4 Author: Sarper Akdemir <[email protected]> AuthorDate: Thu Jun 25 10:49:33 2020 +0300 Commit: Sarper Akdemir <[email protected]> CommitDate: Thu Jun 25 10:49:33 2020 +0300 work-in-progress import export simulatedanimations Change-Id: I141325c1b2317a435bca288b54cf274157b977ba diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index f3ffe8c4190a..48dd04ac5d5c 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -565,6 +565,16 @@ static OUString getImplementationName_ANIMATEMOTION() return "animcore::AnimateMotion"; } +static Sequence<OUString> getSupportedServiceNames_ANIMATESIMULATION() +{ + return { "com.sun.star.animations.AnimateSimulation" }; +} + +static OUString getImplementationName_ANIMATESIMULATION() +{ + return "animcore::AnimateSimulation"; +} + static Sequence<OUString> getSupportedServiceNames_ANIMATETRANSFORM() { return { "com.sun.star.animations.AnimateTransform" }; @@ -817,6 +827,8 @@ OUString AnimationNode::getImplementationName() return getImplementationName_ANIMATECOLOR(); case AnimationNodeType::ANIMATEMOTION: return getImplementationName_ANIMATEMOTION(); + case AnimationNodeType::ANIMATESIMULATED: + return getImplementationName_ANIMATESIMULATION(); case AnimationNodeType::TRANSITIONFILTER: return getImplementationName_TRANSITIONFILTER(); case AnimationNodeType::ANIMATETRANSFORM: @@ -854,6 +866,8 @@ Sequence< OUString > AnimationNode::getSupportedServiceNames() return getSupportedServiceNames_ANIMATECOLOR(); case AnimationNodeType::ANIMATEMOTION: return getSupportedServiceNames_ANIMATEMOTION(); + case AnimationNodeType::ANIMATESIMULATED: + return getSupportedServiceNames_ANIMATESIMULATION(); case AnimationNodeType::TRANSITIONFILTER: return getSupportedServiceNames_TRANSITIONFILTER(); case AnimationNodeType::ANIMATETRANSFORM: diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 49178ebdc996..4e3a23dacffd 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -2791,6 +2791,7 @@ namespace xmloff::token { XML_MULTIPLY, XML_ANIMATE, XML_ANIMATEMOTION, + XML_ANIMATESIMULATION, XML_ANIMATETRANSFORM, XML_ANIMATECOLOR, XML_TRANSITIONFILTER, @@ -2986,6 +2987,7 @@ namespace xmloff::token { XML_EXIT, XML_EMPHASIS, XML_MOTION_PATH, + XML_MOTION_SIMULATED, XML_OLE_ACTION, XML_MEDIA_CALL, XML_ON_CLICK, diff --git a/offapi/com/sun/star/presentation/EffectPresetClass.idl b/offapi/com/sun/star/presentation/EffectPresetClass.idl index 9ff0e1201a63..50b08d0913fd 100644 --- a/offapi/com/sun/star/presentation/EffectPresetClass.idl +++ b/offapi/com/sun/star/presentation/EffectPresetClass.idl @@ -40,6 +40,7 @@ constants EffectPresetClass const short EXIT = 2; const short EMPHASIS = 3; const short MOTIONPATH = 4; + const short MOTIONSIMULATION = 7; const short OLEACTION = 5; const short MEDIACALL = 6; }; diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 0e093d1da84b..436654321bb7 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -434,6 +434,7 @@ #define STR_CUSTOMANIMATION_EMPHASIS NC_("STR_CUSTOMANIMATION_EMPHASIS", "Emphasis: %1") #define STR_CUSTOMANIMATION_EXIT NC_("STR_CUSTOMANIMATION_EXIT", "Exit: %1") #define STR_CUSTOMANIMATION_MOTION_PATHS NC_("STR_CUSTOMANIMATION_MOTION_PATHS", "Motion Paths: %1") +#define STR_CUSTOMANIMATION_MOTION_SIMULATION NC_("STR_CUSTOMANIMATION_MOTION_SIMULATION", "Motion Simulation: %1") #define STR_CUSTOMANIMATION_MISC NC_("STR_CUSTOMANIMATION_MISC", "Misc: %1") #define STR_SLIDETRANSITION_NONE NC_("STR_SLIDETRANSITION_NONE", "None") diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 0e2762ce762e..2071708c4f84 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -252,6 +252,8 @@ CustomAnimationListEntryItem::CustomAnimationListEntryItem(const OUString& aDesc msEffectName = SdResId(STR_CUSTOMANIMATION_EMPHASIS); break; case EffectPresetClass::MOTIONPATH: msEffectName = SdResId(STR_CUSTOMANIMATION_MOTION_PATHS); break; + //case EffectPresetClass::MOTIONSIMULATION: + // msEffectName = SdResId(STR_CUSTOMANIMATION_MOTION_SIMULATION); break; default: msEffectName = SdResId(STR_CUSTOMANIMATION_MISC); break; } @@ -371,6 +373,7 @@ void CustomAnimationListEntryItem::PaintEffect(vcl::RenderContext& rRenderContex case EffectPresetClass::EMPHASIS: sImage = BMP_CUSTOMANIMATION_EMPHASIS_EFFECT; break; case EffectPresetClass::MOTIONPATH: + case EffectPresetClass::MOTIONSIMULATION: sImage = BMP_CUSTOMANIMATION_MOTION_PATH; break; case EffectPresetClass::OLEACTION: sImage = BMP_CUSTOMANIMATION_OLE; break; diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx index f07dfd2f3572..93eadc6495c3 100644 --- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx +++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx @@ -480,8 +480,8 @@ BaseNodeSharedPtr implCreateAnimationNode( break; case animations::AnimationNodeType::ANIMATEMOTION: -// pCreatedNode = std::make_shared<AnimationPathMotionNode>( - pCreatedNode = std::make_shared<AnimationSimulatedNode>( + pCreatedNode = std::make_shared<AnimationPathMotionNode>( +// pCreatedNode = std::make_shared<AnimationSimulatedNode>( xNode, rParent, rContext ); break; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 8d9a70f5e082..d0528ca80e33 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2792,6 +2792,7 @@ namespace xmloff::token { TOKEN( "multiply", XML_MULTIPLY ), TOKEN( "animate", XML_ANIMATE ), TOKEN( "animateMotion", XML_ANIMATEMOTION ), + TOKEN( "animateSimulation", XML_ANIMATESIMULATION ), TOKEN( "animateTransform", XML_ANIMATETRANSFORM ), TOKEN( "animateColor", XML_ANIMATECOLOR ), TOKEN( "transitionFilter", XML_TRANSITIONFILTER ), @@ -2987,6 +2988,7 @@ namespace xmloff::token { TOKEN( "exit", XML_EXIT ), TOKEN( "emphasis", XML_EMPHASIS ), TOKEN( "motion-path", XML_MOTION_PATH ), + TOKEN( "motion-simulated", XML_MOTION_SIMULATED ), TOKEN( "ole-action", XML_OLE_ACTION ), TOKEN( "media-call", XML_MEDIA_CALL ), TOKEN( "on-click", XML_ON_CLICK ), diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 7aa293e75716..e56f0d952177 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -947,6 +947,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod case AnimationNodeType::ANIMATE: case AnimationNodeType::SET: case AnimationNodeType::ANIMATEMOTION: + case AnimationNodeType::ANIMATESIMULATED: case AnimationNodeType::ANIMATECOLOR: case AnimationNodeType::ANIMATETRANSFORM: case AnimationNodeType::TRANSITIONFILTER: @@ -1089,6 +1090,10 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat { eAttributeName = XML_ANIMATEMOTION; } + else if( nNodeType == AnimationNodeType::ANIMATESIMULATED ) + { + eAttributeName = XML_ANIMATESIMULATION; + } else { OUString sTemp( xAnimate->getAttributeName() ); @@ -1234,6 +1239,24 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat } break; + case AnimationNodeType::ANIMATESIMULATED: + { + eElementToken = XML_ANIMATESIMULATION; + + Reference< XAnimateMotion > xAnimateMotion( xAnimate, UNO_QUERY_THROW ); + +// aTemp = xAnimateMotion->getPath(); +// if( aTemp.hasValue() ) +// { +// convertPath( sTmp, aTemp ); +// mxExport->AddAttribute( XML_NAMESPACE_SVG, XML_PATH, sTmp.makeStringAndClear() ); +// } + +// // TODO: origin = ( parent | layout ) +// aTemp = xAnimateMotion->getOrigin(); + } + break; + case AnimationNodeType::ANIMATECOLOR: { eElementToken = XML_ANIMATECOLOR; @@ -1437,6 +1460,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUString case XML_HEIGHT: case XML_ANIMATETRANSFORM: case XML_ANIMATEMOTION: + case XML_ANIMATESIMULATION: { if( auto aString = o3tl::tryAccess<OUString>(rValue) ) { diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index ebccff3d1a22..0cddb5169f80 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -460,6 +460,8 @@ AnimationNodeContext::AnimationNodeContext( pServiceName = "com.sun.star.animations.AnimateSet"; break; case XML_ANIMATEMOTION: pServiceName = "com.sun.star.animations.AnimateMotion"; break; + case XML_ANIMATESIMULATION: + pServiceName = "com.sun.star.animations.AnimateSimulation"; break; case XML_ANIMATECOLOR: pServiceName = "com.sun.star.animations.AnimateColor"; break; case XML_ANIMATETRANSFORM: diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index 34b9af91e03c..18f75351e199 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -2620,6 +2620,7 @@ additive multiply animate animateMotion +animateSimulation animateTransform animateColor transitionFilter @@ -2802,6 +2803,7 @@ entrance exit emphasis motion-path +motion-simulated ole-action media-call on-click _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
