summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-07-31 21:40:11 +0200
committerMichael Stahl <mstahl@redhat.com>2015-07-31 21:54:27 +0200
commit4cf0869b694fc9c4f2de4cfac3433c01a4a60184 (patch)
treed1fe50d1c675e62ecc16f910154bc91d70b1555d /framework
parentfb038a0d0d36799c169db778b6d47ac1a73f1c0d (diff)
framework: replace boost::function with std::function
Change-Id: I9342bbdaa626c88592d3a7bdf12f150cc2a605b1
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/pch/precompiled_fwe.hxx2
-rw-r--r--framework/source/fwe/helper/undomanagerhelper.cxx10
2 files changed, 6 insertions, 6 deletions
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index ec8ec98a2602..55820ecfb8fd 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -15,7 +15,7 @@
*/
#include <algorithm>
-#include <boost/function.hpp>
+#include <functional>
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 36d84b5ba7f2..07b911233234 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -30,8 +30,8 @@
#include <osl/conditn.hxx>
#include <boost/bind.hpp>
-#include <boost/function.hpp>
+#include <functional>
#include <stack>
#include <queue>
@@ -138,7 +138,7 @@ namespace framework
class UndoManagerRequest : public ::comphelper::AnyEvent
{
public:
- UndoManagerRequest( ::boost::function0< void > const& i_request )
+ UndoManagerRequest( ::std::function<void ()> const& i_request )
:m_request( i_request )
,m_caughtException()
,m_finishCondition()
@@ -181,7 +181,7 @@ namespace framework
}
private:
- ::boost::function0< void > m_request;
+ ::std::function<void ()> m_request;
Any m_caughtException;
::osl::Condition m_finishCondition;
};
@@ -302,7 +302,7 @@ namespace framework
private:
/// adds a function to be called to the request processor's queue
- void impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock );
+ void impl_processRequest(::std::function<void ()> const& i_request, IMutexGuard& i_instanceLock);
/// impl-versions of the XUndoManager API.
void impl_enterUndoContext( const OUString& i_title, const bool i_hidden );
@@ -473,7 +473,7 @@ namespace framework
// <--- SYNCHRONIZED
}
- void UndoManagerHelper_Impl::impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock )
+ void UndoManagerHelper_Impl::impl_processRequest(::std::function<void ()> const& i_request, IMutexGuard& i_instanceLock)
{
// create the request, and add it to our queue
::rtl::Reference< UndoManagerRequest > pRequest( new UndoManagerRequest( i_request ) );