From 4cf0869b694fc9c4f2de4cfac3433c01a4a60184 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 31 Jul 2015 21:40:11 +0200 Subject: framework: replace boost::function with std::function Change-Id: I9342bbdaa626c88592d3a7bdf12f150cc2a605b1 --- framework/inc/pch/precompiled_fwe.hxx | 2 +- framework/source/fwe/helper/undomanagerhelper.cxx | 10 +++++----- 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 -#include +#include #include #include #include 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 #include -#include +#include #include #include @@ -138,7 +138,7 @@ namespace framework class UndoManagerRequest : public ::comphelper::AnyEvent { public: - UndoManagerRequest( ::boost::function0< void > const& i_request ) + UndoManagerRequest( ::std::function 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 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 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 const& i_request, IMutexGuard& i_instanceLock) { // create the request, and add it to our queue ::rtl::Reference< UndoManagerRequest > pRequest( new UndoManagerRequest( i_request ) ); -- cgit