diff options
| author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-08-01 11:27:08 -0400 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-08-08 12:27:55 +0000 |
| commit | 717b23ef2765678a5598d652956edd77d2d62fc5 (patch) | |
| tree | e2a539af458ffec65bd34be119e0b4754a7c18b2 /slideshow/test | |
| parent | 0257b5c9edba1fda1c8ada32fc9e2378c3847726 (diff) | |
tdf#92459 replace deprecated o3tl features
Replace deprecated features from the o3tl including select1st and
select2nd with lambda expressions.
Change-Id: I0cb1aedc3e193c52d25e2837a47d9d90c898079e
Reviewed-on: https://gerrit.libreoffice.org/17459
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'slideshow/test')
| -rw-r--r-- | slideshow/test/testshape.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index 46173d9dcc5a..a64ac20cebd2 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -33,8 +33,6 @@ #include "tests.hxx" #include "com/sun/star/presentation/XSlideShowView.hpp" -#include <o3tl/compat_functional.hxx> - #include <boost/bind.hpp> namespace target = slideshow::internal; @@ -130,20 +128,18 @@ private: if( std::none_of( maViewLayers.begin(), maViewLayers.end(), - boost::bind( std::equal_to< target::ViewLayerSharedPtr >(), - boost::cref( rNewLayer ), - boost::bind( o3tl::select1st<ViewVector::value_type>(), - _1 ))) ) + [&rNewLayer] + ( const ::std::pair< ViewVector::key_type, ViewVector::mapped_type >& cp ) + { return cp.first == rNewLayer; } ) ) throw std::exception(); maViewLayers.erase( std::remove_if( maViewLayers.begin(), maViewLayers.end(), - boost::bind( std::equal_to< target::ViewLayerSharedPtr >(), - boost::cref( rNewLayer ), - boost::bind( o3tl::select1st<ViewVector::value_type>(), - _1 )))); + [&rNewLayer] + ( const ::std::pair< ViewVector::key_type, ViewVector::mapped_type >& cp ) + { return cp.first == rNewLayer; } ) ); return true; } virtual bool clearAllViewLayers() |