diff options
Diffstat (limited to 'slideshow/source/engine/transitions')
| -rw-r--r-- | slideshow/source/engine/transitions/slidechangebase.cxx | 23 | ||||
| -rw-r--r-- | slideshow/source/engine/transitions/slidetransitionfactory.cxx | 9 |
2 files changed, 9 insertions, 23 deletions
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index 0a99eeb6e719..a39d40162147 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -29,7 +29,6 @@ #include "slidechangebase.hxx" #include "tools.hxx" -#include <boost/bind.hpp> #include <algorithm> using namespace com::sun::star; @@ -180,11 +179,8 @@ void SlideChangeBase::prefetch( const AnimatableShapeSharedPtr&, mrEventMultiplexer.addViewHandler( shared_from_this() ); // init views and create slide bitmaps - std::for_each( mrViewContainer.begin(), - mrViewContainer.end(), - boost::bind( &SlideChangeBase::viewAdded, - this, - _1 )); + for( const auto& rView : mrViewContainer ) + this->viewAdded( rView ); mbPrefetched = true; } @@ -415,11 +411,9 @@ void SlideChangeBase::viewRemoved( const UnoViewSharedPtr& rView ) std::remove_if( maViewData.begin(), maViewData.end(), - boost::bind( - std::equal_to<UnoViewSharedPtr>(), - rView, - // select view: - boost::bind( &ViewEntry::getView, _1 ))), + [&rView]( const ViewEntry& rViewEntry ) + // select and compare view + { return rView == rViewEntry.getView(); } ), maViewData.end() ); } @@ -434,11 +428,8 @@ void SlideChangeBase::viewChanged( const UnoViewSharedPtr& rView ) std::find_if( maViewData.begin(), maViewData.end(), - boost::bind( - std::equal_to<UnoViewSharedPtr>(), - rView, - // select view: - boost::bind( &ViewEntry::getView, _1 ) ))); + [&rView]( const ViewEntry& rViewEntry ) + { return rView == rViewEntry.getView(); } ) ); OSL_ASSERT( aModifiedEntry != maViewData.end() ); if( aModifiedEntry == maViewData.end() ) diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index fbe7001c0be4..103757d9c46f 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -45,9 +45,6 @@ #include "combtransition.hxx" #include "tools.hxx" -#include <boost/bind.hpp> - - /*************************************************** *** *** *** Slide Transition Effects *** @@ -189,10 +186,8 @@ public: virtual bool operator()( double t ) SAL_OVERRIDE { - std::for_each(maTransitions.begin(), - maTransitions.end(), - boost::bind( &TransitionViewPair::update, - _1, t) ); + for( const auto& pTransition : maTransitions ) + pTransition->update( t ); return true; } |