Kaydet (Commit) 81f94ae7 authored tarafından Michael Stahl's avatar Michael Stahl

sd: try to fix libc++/MSVC build by replacing boost::bind

Change-Id: Ib33fbe9792c35924ac61ed6b54af85d95689a8e3
üst a6fbbfd2
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
#include "ViewShellHint.hxx" #include "ViewShellHint.hxx"
#include <sfx2/request.hxx> #include <sfx2/request.hxx>
#include <boost/bind.hpp>
using namespace com::sun::star; using namespace com::sun::star;
...@@ -772,9 +771,6 @@ bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) ...@@ -772,9 +771,6 @@ bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
* Switch to desired page. * Switch to desired page.
* nSelectPage refers to the current EditMode * nSelectPage refers to the current EditMode
*/ */
void LclResetFlag (bool& rbFlag) {rbFlag = false;}
bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
{ {
/** Under some circumstances there are nested calls to SwitchPage() and /** Under some circumstances there are nested calls to SwitchPage() and
...@@ -786,16 +782,15 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) ...@@ -786,16 +782,15 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
if (mbIsInSwitchPage) if (mbIsInSwitchPage)
return false; return false;
mbIsInSwitchPage = true; mbIsInSwitchPage = true;
comphelper::ScopeGuard aGuard (::boost::bind(LclResetFlag, ::boost::ref(mbIsInSwitchPage))); comphelper::ScopeGuard aGuard(
[this] () { this->mbIsInSwitchPage = false; } );
if (GetActiveWindow()->IsInPaint()) if (GetActiveWindow()->IsInPaint())
{ {
// Switching the current page while a Paint is being executed is // Switching the current page while a Paint is being executed is
// dangerous. So, post it for later execution and return. // dangerous. So, post it for later execution and return.
maAsynchronousSwitchPageCall.Post(::boost::bind( maAsynchronousSwitchPageCall.Post(
::std::mem_fun(&DrawViewShell::SwitchPage), [this, nSelectedPage] () { this->SwitchPage(nSelectedPage); } );
this,
nSelectedPage));
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment