diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-06-20 05:58:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-23 16:29:27 +0100 |
| commit | adc8f8d3c2df51aff9b73b4824b71b15e719098e (patch) | |
| tree | bc7257f04b26bcafe5fbc49905ccb0f4f3e45468 /sd | |
| parent | f975e0050110c7f713162d13b65787bbb6627baa (diff) | |
Resolves: #i119951# Animation effect still exist after the shape grouped
(cherry picked from commit 164d3096008c529462adc06099795fe037c0d2a7)
Change-Id: I29956f976e7ac38a9d06d973bb2b3d2d06e1e341
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index dc73646245cf..1d56eb7ffa0d 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -3442,15 +3442,7 @@ bool MainSequence::disposeShape( const Reference< XShape >& xShape ) InteractiveSequenceList::iterator aIter; for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); ) { - if( (*aIter)->getTriggerShape() == xShape ) - { - aIter = maInteractiveSequenceList.erase( aIter ); - bChanges = true; - } - else - { bChanges |= (*aIter++)->disposeShape( xShape ); - } } if( bChanges ) |