diff options
Diffstat (limited to 'slideshow/source/engine/animationnodes/basecontainernode.cxx')
-rw-r--r-- | slideshow/source/engine/animationnodes/basecontainernode.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index df4b09716763..229e26dd5c7b 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -24,7 +24,7 @@ #include "nodetools.hxx" #include "delayevent.hxx" -#include <boost/mem_fn.hpp> +#include <functional> #include <algorithm> using namespace com::sun::star; @@ -47,7 +47,7 @@ BaseContainerNode::BaseContainerNode( void BaseContainerNode::dispose() { - forEachChildNode( boost::mem_fn(&Disposable::dispose) ); + forEachChildNode( std::mem_fn(&Disposable::dispose) ); maChildren.clear(); BaseNode::dispose(); } @@ -66,7 +66,7 @@ bool BaseContainerNode::init_children() // initialize all children return (std::count_if( maChildren.begin(), maChildren.end(), - boost::mem_fn(&AnimationNode::init) ) == + std::mem_fn(&AnimationNode::init) ) == static_cast<VectorOfNodes::difference_type>(maChildren.size())); } @@ -75,12 +75,12 @@ void BaseContainerNode::deactivate_st( NodeState eDestState ) mnLeftIterations = 0; // in order to make skip effect work correctly if (eDestState == FROZEN) { // deactivate all children that are not FROZEN or ENDED: - forEachChildNode( boost::mem_fn(&AnimationNode::deactivate), + forEachChildNode( std::mem_fn(&AnimationNode::deactivate), ~(FROZEN | ENDED) ); } else { // end all children that are not ENDED: - forEachChildNode( boost::mem_fn(&AnimationNode::end), ~ENDED ); + forEachChildNode( std::mem_fn(&AnimationNode::end), ~ENDED ); } } @@ -91,7 +91,7 @@ bool BaseContainerNode::hasPendingAnimation() const // If yes, we, too, return true return std::any_of( maChildren.begin(), maChildren.end(), - boost::mem_fn(&AnimationNode::hasPendingAnimation) ); + std::mem_fn(&AnimationNode::hasPendingAnimation) ); } void BaseContainerNode::appendChildNode( AnimationNodeSharedPtr const& pNode ) @@ -165,7 +165,7 @@ bool BaseContainerNode::notifyDeactivatedChild( void BaseContainerNode::repeat() { - forEachChildNode( boost::mem_fn(&AnimationNode::end), ~ENDED ); + forEachChildNode( std::mem_fn(&AnimationNode::end), ~ENDED ); bool bState = init_children(); if( bState ) activate_st(); |