mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS presfixes08 (1.2.36); FILE MERGED

Browse Source 
2005/08/08 09:52:45 dbo 1.2.36.2: #i45197#
calling end() upon destruction
Issue number:
Submitted by:
Reviewed by:
2005/08/02 08:02:44 dbo 1.2.36.1: #i37786# missing const
Issue number:
Submitted by:
Reviewed by:
This commit is contained in:
Oliver Bolte
2005-10-11 07:45:36 +00:00
parent c6b0c7feac
commit 476185bff3
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
slideshow/source/engine/transitions/shapetransitionfactory.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: shapetransitionfactory.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2005-09-07 20:57:24 $
* last change: $Author: obo $ $Date: 2005-10-11 08:45:36 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -73,6 +73,8 @@ public:
bool bDirectionForward,
bool bModeIn );
~ClippingAnimation();
// Animation interface
// -------------------
virtual void start( const AnimatableShapeSharedPtr& rShape,
@@ -85,6 +87,8 @@ public:
virtual double getUnderlyingValue() const;
private:
void end_();
AnimatableShapeSharedPtr mpShape;
ShapeAttributeLayerSharedPtr mpAttrLayer;
LayerManagerSharedPtr mpLayerManager;
@@ -112,6 +116,11 @@ ClippingAnimation::ClippingAnimation(
"ClippingAnimation::ClippingAnimation(): Invalid LayerManager" );
}
ClippingAnimation::~ClippingAnimation()
{
end_();
}
void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape,
const ShapeAttributeLayerSharedPtr& rAttrLayer )
{
@@ -139,11 +148,19 @@ void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape,
}
void ClippingAnimation::end()
{
end_();
}
void ClippingAnimation::end_()
{
if( mbSpriteActive )
{
mbSpriteActive = false;
mpLayerManager->leaveAnimationMode( mpShape );
if( mpShape->isUpdateNecessary() )
mpLayerManager->notifyShapeUpdate( mpShape );
}
}
@@ -182,7 +199,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition(
const ActivitiesFactory::CommonParameters& rParms,
const AnimatableShapeSharedPtr& rShape,
const LayerManagerSharedPtr& rLayerManager,
uno::Reference< animations::XTransitionFilter >& xTransition )
uno::Reference< animations::XTransitionFilter > const& xTransition )
{
return createShapeTransition( rParms,
rShape,
@@ -197,7 +214,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition(
const AnimatableShapeSharedPtr& rShape,
const LayerManagerSharedPtr& rLayerManager,
::com::sun::star::uno::Reference<
::com::sun::star::animations::XTransitionFilter >& xTransition,
::com::sun::star::animations::XTransitionFilter > const& xTransition,
sal_Int16 nType,
sal_Int16 nSubType )
{