mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ucb: replace boost::bind with C++11 lambdas

Browse Source 
... and remove now unused comphelper::TNamedValueEqualFunctor.

Change-Id: Ia6cac4ae4e34d2ba134e2f2a4a5b4daea58bf0b3
This commit is contained in:
Michael Stahl
2016-03-03 14:28:30 +01:00
parent b184b4249d
commit c96dc8822d
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/comphelper/stl_types.hxx
View File

@@ -29,7 +29,6 @@
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
namespace comphelper namespace comphelper
{ {
@@ -76,17 +75,6 @@ public:
} }
}; };
class TNamedValueEqualFunctor : public ::std::binary_function< css::beans::NamedValue,OUString,bool>
{
public:
TNamedValueEqualFunctor()
{}
bool operator() (const css::beans::NamedValue& lhs, const OUString& rhs) const
{
return !!(lhs.Name == rhs);
}
};
/// by-value less functor for std::set<std::unique_ptr<T>> /// by-value less functor for std::set<std::unique_ptr<T>>
template<class T> struct UniquePtrValueLess template<class T> struct UniquePtrValueLess
: public ::std::binary_function<std::unique_ptr<T>, std::unique_ptr<T>, bool> : public ::std::binary_function<std::unique_ptr<T>, std::unique_ptr<T>, bool>

6
ucb/source/ucp/webdav-neon/NeonSession.cxx
View File

@@ -47,7 +47,6 @@ extern "C" {
#include "rtl/ustrbuf.hxx" #include "rtl/ustrbuf.hxx"
#include "comphelper/processfactory.hxx" #include "comphelper/processfactory.hxx"
#include "comphelper/sequence.hxx" #include "comphelper/sequence.hxx"
#include <comphelper/stl_types.hxx>
#include "ucbhelper/simplecertificatevalidationrequest.hxx" #include "ucbhelper/simplecertificatevalidationrequest.hxx"
#include "DAVAuthListener.hxx" #include "DAVAuthListener.hxx"
@@ -71,7 +70,6 @@ extern "C" {
#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/xml/crypto/SEInitializer.hpp> #include <com/sun/star/xml/crypto/SEInitializer.hpp>
#include <boost/bind.hpp>
using namespace com::sun::star; using namespace com::sun::star;
using namespace webdav_ucp; using namespace webdav_ucp;
@@ -148,9 +146,7 @@ static bool noKeepAlive( const uno::Sequence< beans::NamedValue >& rFlags )
const sal_Int32 nLen(rFlags.getLength()); const sal_Int32 nLen(rFlags.getLength());
const beans::NamedValue* pValue( const beans::NamedValue* pValue(
std::find_if(pAry,pAry+nLen, std::find_if(pAry,pAry+nLen,
boost::bind(comphelper::TNamedValueEqualFunctor(), [] (beans::NamedValue const& rNV) { return rNV.Name == OUString("KeepAlive"); } ));
_1,
OUString("KeepAlive"))));
if ( pValue != pAry+nLen && !pValue->Value.get<sal_Bool>() ) if ( pValue != pAry+nLen && !pValue->Value.get<sal_Bool>() )
return true; return true;