diff options
Diffstat (limited to 'slideshow/source/engine/transitions/shapetransitionfactory.cxx')
-rw-r--r-- | slideshow/source/engine/transitions/shapetransitionfactory.cxx | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 6d2a43ae7119..755ef8acbca2 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,28 +74,28 @@ public: bool bModeIn ); ~ClippingAnimation(); - + // Animation interface // ------------------- virtual void prefetch( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ); - virtual void start( const AnimatableShapeSharedPtr& rShape, + virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ); virtual void end(); - + // NumberAnimation interface // ----------------------- virtual bool operator()( double nValue ); virtual double getUnderlyingValue() const; - + private: void end_(); AnimatableShapeSharedPtr mpShape; ShapeAttributeLayerSharedPtr mpAttrLayer; ShapeManagerSharedPtr mpShapeManager; - ClippingFunctor maClippingFunctor; - bool mbSpriteActive; + ClippingFunctor maClippingFunctor; + bool mbSpriteActive; }; ClippingAnimation::ClippingAnimation( @@ -107,9 +107,9 @@ ClippingAnimation::ClippingAnimation( mpShape(), mpAttrLayer(), mpShapeManager( rShapeManager ), - maClippingFunctor( rPolygon, - rTransitionInfo, - bDirectionForward, + maClippingFunctor( rPolygon, + rTransitionInfo, + bDirectionForward, bModeIn ), mbSpriteActive(false) { @@ -124,7 +124,7 @@ ClippingAnimation::~ClippingAnimation() { end_(); } - catch (uno::Exception &) + catch (uno::Exception &) { OSL_ENSURE( false, rtl::OUStringToOString( comphelper::anyToString( @@ -138,8 +138,8 @@ void ClippingAnimation::prefetch( const AnimatableShapeSharedPtr&, { } -void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) +void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape, + const ShapeAttributeLayerSharedPtr& rAttrLayer ) { OSL_ENSURE( !mpShape, "ClippingAnimation::start(): Shape already set" ); @@ -186,14 +186,14 @@ bool ClippingAnimation::operator()( double nValue ) ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape, "ClippingAnimation::operator(): Invalid ShapeAttributeLayer" ); - + // set new clip mpAttrLayer->setClip( maClippingFunctor( nValue, mpShape->getDomBounds().getRange() ) ); - + if( mpShape->isContentChanged() ) mpShapeManager->notifyShapeUpdate( mpShape ); - + return true; } @@ -202,8 +202,8 @@ double ClippingAnimation::getUnderlyingValue() const ENSURE_OR_THROW( mpAttrLayer, "ClippingAnimation::getUnderlyingValue(): Invalid ShapeAttributeLayer" ); - - return 0.0; // though this should be used in concert with + + return 0.0; // though this should be used in concert with // ActivitiesFactory::createSimpleActivity, better // explicitely name our start value. // Permissible range for operator() above is [0,1] @@ -219,30 +219,30 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( const ::basegfx::B2DVector& rSlideSize, uno::Reference< animations::XTransitionFilter > const& xTransition ) { - return createShapeTransition( rParms, - rShape, - rShapeManager, + return createShapeTransition( rParms, + rShape, + rShapeManager, rSlideSize, - xTransition, - xTransition->getTransition(), + xTransition, + xTransition->getTransition(), xTransition->getSubtype() ); } AnimationActivitySharedPtr TransitionFactory::createShapeTransition( - const ActivitiesFactory::CommonParameters& rParms, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + const ActivitiesFactory::CommonParameters& rParms, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > const& xTransition, - sal_Int16 nType, - sal_Int16 nSubType ) + sal_Int16 nType, + sal_Int16 nSubType ) { ENSURE_OR_THROW( xTransition.is(), "TransitionFactory::createShapeTransition(): Invalid XTransition" ); - - const TransitionInfo* pTransitionInfo( + + const TransitionInfo* pTransitionInfo( getTransitionInfo( nType, nSubType ) ); AnimationActivitySharedPtr pGeneratedActivity; @@ -252,24 +252,24 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( { default: case TransitionInfo::TRANSITION_INVALID: - OSL_ENSURE( false, + OSL_ENSURE( false, "TransitionFactory::createShapeTransition(): Invalid transition type. " "Don't ask me for a 0 TransitionType, have no XTransitionFilter node instead!" ); return AnimationActivitySharedPtr(); - + case TransitionInfo::TRANSITION_CLIP_POLYPOLYGON: { // generate parametric poly-polygon - ParametricPolyPolygonSharedPtr pPoly( - ParametricPolyPolygonFactory::createClipPolyPolygon( + ParametricPolyPolygonSharedPtr pPoly( + ParametricPolyPolygonFactory::createClipPolyPolygon( nType, nSubType ) ); - + // create a clip activity from that pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - NumberAnimationSharedPtr( - new ClippingAnimation( + NumberAnimationSharedPtr( + new ClippingAnimation( pPoly, rShapeManager, *pTransitionInfo, @@ -278,7 +278,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( true ); } break; - + case TransitionInfo::TRANSITION_SPECIAL: { switch( nType ) @@ -289,7 +289,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( // TransitionFactoryTable const TransitionInfo* pRandomTransitionInfo( getRandomTransitionInfo() ); - + ENSURE_OR_THROW( pRandomTransitionInfo != NULL, "TransitionFactory::createShapeTransition(): Got invalid random transition info" ); @@ -306,12 +306,12 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( pRandomTransitionInfo->mnTransitionSubType ); } break; - + // TODO(F3): Implement slidewipe for shape case animations::TransitionType::SLIDEWIPE: { sal_Int16 nBarWipeSubType(0); - bool bDirectionForward(true); + bool bDirectionForward(true); // map slidewipe to BARWIPE, for now switch( nSubType ) @@ -343,19 +343,19 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( } // generate parametric poly-polygon - ParametricPolyPolygonSharedPtr pPoly( - ParametricPolyPolygonFactory::createClipPolyPolygon( - animations::TransitionType::BARWIPE, + ParametricPolyPolygonSharedPtr pPoly( + ParametricPolyPolygonFactory::createClipPolyPolygon( + animations::TransitionType::BARWIPE, nBarWipeSubType ) ); - + // create a clip activity from that pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - NumberAnimationSharedPtr( - new ClippingAnimation( + NumberAnimationSharedPtr( + new ClippingAnimation( pPoly, rShapeManager, - *getTransitionInfo( animations::TransitionType::BARWIPE, + *getTransitionInfo( animations::TransitionType::BARWIPE, nBarWipeSubType ), bDirectionForward, xTransition->getMode() ) ), @@ -372,10 +372,10 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( // for now, map all to fade effect pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, - AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( + AnimationFactory::createNumberPropertyAnimation( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Opacity") ), - rShape, + rShape, rShapeManager, rSlideSize ), xTransition->getMode() ); @@ -389,7 +389,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( if( !pGeneratedActivity ) { - // No animation generated, maybe no table entry for given + // No animation generated, maybe no table entry for given // transition? OSL_TRACE( "TransitionFactory::createShapeTransition(): Unknown type/subtype (%d/%d) " @@ -401,7 +401,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( "TransitionFactory::createShapeTransition(): Unknown type/subtype " "combination encountered" ); } - + return pGeneratedActivity; } |