diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:03:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:03:39 +0000 |
| commit | a18f4c6a92845fbec7ee70c3920a4aa34e58b6ad (patch) | |
| tree | 0da239900bf9fd9ffe2e7bca48f3cd0ffe769791 /svx/source/sdr | |
| parent | a2b85bf81c99e552c0b431a531ee9dd7d7bff951 (diff) | |
INTEGRATION: CWS aw033 (1.4.16); FILE MERGED
2008/05/14 13:59:49 aw 1.4.16.4: RESYNC: (1.5-1.6); FILE MERGED
2008/01/22 12:29:29 aw 1.4.16.3: adaptions and 1st stripping
2006/09/26 19:19:34 aw 1.4.16.2: RESYNC: (1.4-1.5); FILE MERGED
2006/08/09 17:08:56 aw 1.4.16.1: #i39532#
Diffstat (limited to 'svx/source/sdr')
| -rw-r--r-- | svx/source/sdr/animation/objectanimator.cxx | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx index eec1a0e45402..2d4f0fdf0333 100644 --- a/svx/source/sdr/animation/objectanimator.cxx +++ b/svx/source/sdr/animation/objectanimator.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: objectanimator.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -34,50 +34,19 @@ #include <tools/debug.hxx> #include <svx/sdr/animation/animationstate.hxx> -// for SOLARIS compiler include of algorithm part of _STL is necesary to -// get access to basic algos like ::std::find -#include <algorithm> - ////////////////////////////////////////////////////////////////////////////// namespace sdr { namespace animation { - ObjectAnimator::ObjectAnimator() - { - } - - ObjectAnimator::~ObjectAnimator() + primitiveAnimator::primitiveAnimator() + : Scheduler() { } - // get the list count - sal_uInt32 ObjectAnimator::Count() const - { - return maAnimationStates.size(); - } - - // Remove AnimationState member - void ObjectAnimator::RemoveAnimationState(AnimationState& rAnimationState) - { - const AnimationStateVector::iterator aFindResult = ::std::find( - maAnimationStates.begin(), maAnimationStates.end(), &rAnimationState); - - if(aFindResult != maAnimationStates.end()) - { - // #114376# remember content for next call - AnimationState* pErasedState = *aFindResult; - maAnimationStates.erase(aFindResult); - RemoveEvent(pErasedState); - } - } - - // Add AnimationState member - void ObjectAnimator::AddAnimationState(AnimationState& rAnimationState) + primitiveAnimator::~primitiveAnimator() { - maAnimationStates.push_back(&rAnimationState); - InsertEvent(&rAnimationState); } } // end of namespace animation } // end of namespace sdr |