sd/source/core/CustomAnimationEffect.cxx | 8 --------
1 file changed, 8 deletions(-)
New commits:
commit adc8f8d3c2df51aff9b73b4824b71b15e719098e
Author: Zhe Wang <wangz...@apache.org>
Date: Wed Jun 20 05:58:35 2012 +0000
Resolves: #i119951# Animation effect still exist after the shape grouped
(cherry picked from commit 164d3096008c529462adc06099795fe037c0d2a7)
Change-Id: I29956f976e7ac38a9d06d973bb2b3d2d06e1e341
diff --git a/sd/source/core/CustomAnimationEffect.cxx
b/sd/source/core/CustomAnimationEffect.cxx
index dc73646..1d56eb7 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
