slideshow/source/engine/animationnodes/basenode.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit c05bf5e494faad57400f9c04079cb99ff6b805dd Author: Michael Stahl <[email protected]> Date: Mon Aug 3 17:32:25 2015 +0200 slideshow: convert generateEvent args from boost::bind Change-Id: I85d240989e41a45b62a4631bb847daccd1919f34 diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 0aced6f..4c06a80 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -463,8 +463,9 @@ bool BaseNode::resolve() // shape). uno::Any const aBegin( mxAnimationNode->getBegin() ); if (aBegin.hasValue()) { + auto self(mpSelf); mpCurrentEvent = generateEvent( - aBegin, boost::bind( &AnimationNode::activate, mpSelf ), + aBegin, [self] () { self->activate(); }, maContext, mnStartDelay ); } else { @@ -545,9 +546,10 @@ void BaseNode::scheduleDeactivationEvent( EventSharedPtr const& pEvent ) // but what if it does not schedule anything? // TODO(F2): Handle end time attribute, too + auto self(mpSelf); mpCurrentEvent = generateEvent( mxAnimationNode->getDuration(), - boost::bind( &AnimationNode::deactivate, mpSelf ), + [self] () { self->deactivate(); }, maContext, 0.0 ); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
