From 68fae1d7da6519e2085d6f175ea8085fddd6d65d Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 26 Jul 2006 06:32:58 +0000 Subject: INTEGRATION: CWS presfixes10 (1.3.8); FILE MERGED 2005/11/07 15:26:50 dbo 1.3.8.1: #i45197# revised code Issue number: Submitted by: Reviewed by: --- .../animationnodes/animationtransformnode.cxx | 177 ++++++++------------- 1 file changed, 70 insertions(+), 107 deletions(-) diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index 094f416f4209..103fbb533a17 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: animationtransformnode.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:42:25 $ + * last change: $Author: rt $ $Date: 2006-07-26 07:32:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,118 +34,81 @@ ************************************************************************/ // must be first -#include -#include +#include "canvas/debug.hxx" +#include "canvas/verbosetrace.hxx" +#include "animationtransformnode.hxx" +#include "animationfactory.hxx" +#include "activitiesfactory.hxx" +#include "com/sun/star/animations/AnimationTransformType.hpp" -#include -#include -#include +using namespace com::sun::star; -#ifndef _COM_SUN_STAR_ANIMATIONS_ANIMATIONTRANSFORMTYPE_HPP_ -#include -#endif +namespace presentation { +namespace internal { - -using namespace ::com::sun::star; - -namespace presentation +void AnimationTransformNode::dispose() { - namespace internal - { - AnimationTransformNode::AnimationTransformNode( const uno::Reference< animations::XAnimationNode >& xNode, - const BaseContainerNodeSharedPtr& rParent, - const NodeContext& rContext ) : - ActivityAnimationBaseNode( xNode, rParent, rContext ), - mxTransformNode( xNode, uno::UNO_QUERY_THROW ) - { - } - - void AnimationTransformNode::dispose() - { - mxTransformNode.clear(); - - ActivityAnimationBaseNode::dispose(); - } - - bool AnimationTransformNode::init() - { - if( !ActivityAnimationBaseNode::init() ) - return false; - - try - { - // TODO(F2): For restart functionality, we must regenerate activities, - // since they are not able to reset their state (or implement _that_) - getActivity() = createTransformActivity(); - } - catch( uno::Exception& ) - { - // catch and ignore. We later handle empty activities, but for - // other nodes to function properly, the core functionality of - // this node must remain up and running. - } - - return true; - } - -#if defined(VERBOSE) && defined(DBG_UTIL) - const char* AnimationTransformNode::getDescription() const - { - return "AnimationTransformNode"; - } -#endif - - AnimationActivitySharedPtr AnimationTransformNode::createTransformActivity() - { - ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); - - const sal_Int16 nTransformType( mxTransformNode->getTransformType() ); - - const AttributableShapeSharedPtr& rShape( getShape() ); - - switch( nTransformType ) - { - default: - ENSURE_AND_THROW( false, - "AnimationTransformNode::createTransformActivity(): Unknown transform type" ); + mxTransformNode.clear(); + AnimationBaseNode::dispose(); +} - case animations::AnimationTransformType::TRANSLATE: - // FALLTHROUGH intended - case animations::AnimationTransformType::SCALE: - return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createPairPropertyAnimation( - rShape, - getContext().mpLayerManager, - nTransformType ), - getXAnimateNode() ); +AnimationActivitySharedPtr AnimationTransformNode::createActivity() const +{ + ActivitiesFactory::CommonParameters aParms( fillCommonParameters() ); - case animations::AnimationTransformType::ROTATE: - return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Rotate") ), - rShape, - getContext().mpLayerManager ), - getXAnimateNode() ); + const sal_Int16 nTransformType( mxTransformNode->getTransformType() ); - case animations::AnimationTransformType::SKEWX: - return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SkewX") ), - rShape, - getContext().mpLayerManager ), - getXAnimateNode() ); + const AttributableShapeSharedPtr& rShape( getShape() ); - case animations::AnimationTransformType::SKEWY: - return ActivitiesFactory::createAnimateActivity( aParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SkewY") ), - rShape, - getContext().mpLayerManager ), - getXAnimateNode() ); - } - } + switch( nTransformType ) + { + default: + ENSURE_AND_THROW( + false, "AnimationTransformNode::createTransformActivity(): " + "Unknown transform type" ); + + case animations::AnimationTransformType::TRANSLATE: + // FALLTHROUGH intended + case animations::AnimationTransformType::SCALE: + return ActivitiesFactory::createAnimateActivity( + aParms, + AnimationFactory::createPairPropertyAnimation( + rShape, + getContext().mpLayerManager, + nTransformType ), + getXAnimateNode() ); + + case animations::AnimationTransformType::ROTATE: + return ActivitiesFactory::createAnimateActivity( + aParms, + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("Rotate") ), + rShape, + getContext().mpLayerManager ), + getXAnimateNode() ); + + case animations::AnimationTransformType::SKEWX: + return ActivitiesFactory::createAnimateActivity( + aParms, + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("SkewX") ), + rShape, + getContext().mpLayerManager ), + getXAnimateNode() ); + + case animations::AnimationTransformType::SKEWY: + return ActivitiesFactory::createAnimateActivity( + aParms, + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("SkewY") ), + rShape, + getContext().mpLayerManager ), + getXAnimateNode() ); } } + +} // namespace internal +} // namespace presentation -- cgit v1.2.3