summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-01-29 12:59:35 +0100
committerMichael Stahl <mstahl@redhat.com>2016-01-29 13:47:08 +0100
commit0e57d54e1f8fe81d870ae18d6401f5ce104deb17 (patch)
tree88fbddfb4160e18290b32ed859e8de637bd898fb /include/oox
parent12ebf6f72b2b3c9f66be767933835cde848d8e48 (diff)
oox: replace boost::bind with std::bind
Change-Id: Ic402cfd6900cdf1741264b409f6fbe8f2db7e17a
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/helper/refmap.hxx11
-rw-r--r--include/oox/helper/refvector.hxx13
2 files changed, 13 insertions, 11 deletions
diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx
index 1a40634fa117..ef20d37acb94 100644
--- a/include/oox/helper/refmap.hxx
+++ b/include/oox/helper/refmap.hxx
@@ -21,10 +21,11 @@
#define INCLUDED_OOX_HELPER_REFMAP_HXX
#include <sal/types.h>
+
+#include <functional>
#include <algorithm>
#include <map>
#include <memory>
-#include <boost/bind.hpp>
namespace oox {
@@ -77,7 +78,7 @@ public:
template< typename FuncType >
void forEachMem( FuncType pFunc ) const
{
- forEach( ::boost::bind( pFunc, _1 ) );
+ forEach( ::std::bind( pFunc, std::placeholders::_1 ) );
}
/** Calls the passed member function of ObjType on every contained object,
@@ -85,7 +86,7 @@ public:
template< typename FuncType, typename ParamType1, typename ParamType2 >
void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
{
- forEach( ::boost::bind( pFunc, _1, aParam1, aParam2 ) );
+ forEach( ::std::bind( pFunc, std::placeholders::_1, aParam1, aParam2 ) );
}
/** Calls the passed member function of ObjType on every contained object,
@@ -93,7 +94,7 @@ public:
template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
{
- forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
+ forEach( ::std::bind( pFunc, std::placeholders::_1, aParam1, aParam2, aParam3 ) );
}
@@ -110,7 +111,7 @@ public:
template< typename FuncType >
void forEachMemWithKey( FuncType pFunc ) const
{
- forEachWithKey( ::boost::bind( pFunc, _2, _1 ) );
+ forEachWithKey( ::std::bind( pFunc, std::placeholders::_2, std::placeholders::_1 ) );
}
diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx
index e7aca3953f67..81920328d577 100644
--- a/include/oox/helper/refvector.hxx
+++ b/include/oox/helper/refvector.hxx
@@ -21,7 +21,8 @@
#define INCLUDED_OOX_HELPER_REFVECTOR_HXX
#include <sal/types.h>
-#include <boost/bind.hpp>
+
+#include <functional>
#include <algorithm>
#include <memory>
#include <vector>
@@ -67,7 +68,7 @@ public:
template< typename FuncType >
void forEachMem( FuncType pFunc ) const
{
- forEach( ::boost::bind( pFunc, _1 ) );
+ forEach( ::std::bind( pFunc, std::placeholders::_1 ) );
}
/** Calls the passed member function of ObjType on every contained object,
@@ -75,7 +76,7 @@ public:
template< typename FuncType, typename ParamType >
void forEachMem( FuncType pFunc, ParamType aParam ) const
{
- forEach( ::boost::bind( pFunc, _1, aParam ) );
+ forEach( ::std::bind( pFunc, std::placeholders::_1, aParam ) );
}
/** Calls the passed member function of ObjType on every contained object,
@@ -83,7 +84,7 @@ public:
template< typename FuncType, typename ParamType1, typename ParamType2 >
void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
{
- forEach( ::boost::bind( pFunc, _1, aParam1, aParam2 ) );
+ forEach( ::std::bind( pFunc, std::placeholders::_1, aParam1, aParam2 ) );
}
/** Calls the passed member function of ObjType on every contained object,
@@ -91,7 +92,7 @@ public:
template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
{
- forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
+ forEach( ::std::bind( pFunc, std::placeholders::_1, aParam1, aParam2, aParam3 ) );
}
/** Calls the passed functor for every contained object. Passes the index as
@@ -107,7 +108,7 @@ public:
template< typename FuncType, typename ParamType1, typename ParamType2 >
void forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
{
- forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) );
+ forEachWithIndex( ::std::bind( pFunc, std::placeholders::_2, std::placeholders::_1, aParam1, aParam2 ) );
}
/** Searches for an element by using the passed functor that takes a