diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-30 15:37:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-30 15:37:50 +0000 |
| commit | 7168fa353e1e7aab66e5f232a1f7015e725a263c (patch) | |
| tree | 31e5a5f87b541328c9ff9c8178882937e3bace72 /slideshow/source/engine/animationnodes | |
| parent | 5caa4326854d346e40b9d052255effa446e54513 (diff) | |
| parent | cdc081ea0e30b4ffc1ad7cb8453c259fdf628eb0 (diff) | |
slideshow1: merge with DEV300 m61
Diffstat (limited to 'slideshow/source/engine/animationnodes')
| -rw-r--r-- | slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx index 66ff0c40ceee..79046f50251a 100644 --- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx @@ -34,11 +34,11 @@ #include <canvas/debug.hxx> #include <canvas/verbosetrace.hxx> +#include "delayevent.hxx" #include "eventqueue.hxx" #include "usereventqueue.hxx" #include "sequentialtimecontainer.hxx" #include "tools.hxx" -#include "delayevent.hxx" #include <boost/bind.hpp> #include <algorithm> @@ -63,8 +63,9 @@ void SequentialTimeContainer::activate_st() { // deactivate ASAP: scheduleDeactivationEvent( - makeEvent( boost::bind( &AnimationNode::deactivate, getSelf() ), - "SequentialTimeContainer::deactivate") ); + makeEvent( + boost::bind< void >( boost::mem_fn( &AnimationNode::deactivate ), getSelf() ), + "SequentialTimeContainer::deactivate") ); } else // use default scheduleDeactivationEvent(); @@ -90,8 +91,9 @@ void SequentialTimeContainer::skipEffect( // empty all events ignoring timings => until next effect getContext().mrEventQueue.forceEmpty(); getContext().mrEventQueue.addEvent( - makeEvent( boost::bind(&AnimationNode::deactivate, pChildNode), - "SequentialTimeContainer::deactivate, skipEffect with delay") ); + makeEvent( + boost::bind<void>( boost::mem_fn( &AnimationNode::deactivate ), pChildNode ), + "SequentialTimeContainer::deactivate, skipEffect with delay") ); } else OSL_ENSURE( false, "unknown notifier!" ); |