summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-08-03 16:13:43 +0200
committerMichael Stahl <mstahl@redhat.com>2015-08-03 16:16:52 +0200
commit81f94ae79c7f5f3b49427dc7a8063a08baa797cf (patch)
treef4d3081895c2d56feb0d3671524b6d3f83533e35 /sd
parenta6fbbfd2f42f5361d53bd4b330a507d94d636923 (diff)
sd: try to fix libc++/MSVC build by replacing boost::bind
Change-Id: Ib33fbe9792c35924ac61ed6b54af85d95689a8e3
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/drviews1.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index f1ec203f12ca..c3f0acfc7943 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -80,7 +80,6 @@
#include "ViewShellHint.hxx"
#include <sfx2/request.hxx>
-#include <boost/bind.hpp>
using namespace com::sun::star;
@@ -772,9 +771,6 @@ bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
* Switch to desired page.
* nSelectPage refers to the current EditMode
*/
-
-void LclResetFlag (bool& rbFlag) {rbFlag = false;}
-
bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
{
/** Under some circumstances there are nested calls to SwitchPage() and
@@ -786,16 +782,15 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
if (mbIsInSwitchPage)
return false;
mbIsInSwitchPage = true;
- comphelper::ScopeGuard aGuard (::boost::bind(LclResetFlag, ::boost::ref(mbIsInSwitchPage)));
+ comphelper::ScopeGuard aGuard(
+ [this] () { this->mbIsInSwitchPage = false; } );
if (GetActiveWindow()->IsInPaint())
{
// Switching the current page while a Paint is being executed is
// dangerous. So, post it for later execution and return.
- maAsynchronousSwitchPageCall.Post(::boost::bind(
- ::std::mem_fun(&DrawViewShell::SwitchPage),
- this,
- nSelectedPage));
+ maAsynchronousSwitchPageCall.Post(
+ [this, nSelectedPage] () { this->SwitchPage(nSelectedPage); } );
return false;
}