diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 10:54:59 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 10:54:59 +0000 |
| commit | b5c3f7a8065af689e4bac192f2d3bcd93703d096 (patch) | |
| tree | 03cc65b41add00e84efe512c93a53e9fdc5a2a8c /slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | |
| parent | f162188c4ef8997ac432a644ffad88dd1d5bf7a9 (diff) | |
INTEGRATION: CWS thbpp8 (1.9.32); FILE MERGED
2007/07/22 23:09:50 thb 1.9.32.2: RESYNC: (1.9-1.10); FILE MERGED
2007/07/16 14:26:40 thb 1.9.32.1: #147454# Giving queue event a shared ptr to this to avoid lifetime issues
Diffstat (limited to 'slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx')
| -rw-r--r-- | slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index dd4cf33a730b..c26f6361a53e 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sequentialtimecontainer.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2007-07-17 14:50:28 $ + * last change: $Author: hr $ $Date: 2007-08-03 11:54:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -119,11 +119,13 @@ bool SequentialTimeContainer::resolveChild( // event that will deactivate the resolved/running child: mpCurrentSkipEvent = makeEvent( - boost::bind( &SequentialTimeContainer::skipEffect, this, + boost::bind( &SequentialTimeContainer::skipEffect, + boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ), pChildNode ) ); // event that will reresolve the resolved/activated child: mpCurrentRewindEvent = makeEvent( - boost::bind( &SequentialTimeContainer::rewindEffect, this, + boost::bind( &SequentialTimeContainer::rewindEffect, + boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ), pChildNode ) ); // deactivate child node when skip event occurs: |