[Libreoffice-commits] core.git: sd/source

[Michael Stahl]

 sd/source/ui/view/drviews1.cxx |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 81f94ae79c7f5f3b49427dc7a8063a08baa797cf
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Aug 3 16:13:43 2015 +0200

    sd: try to fix libc++/MSVC build by replacing boost::bind
    
    Change-Id: Ib33fbe9792c35924ac61ed6b54af85d95689a8e3

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index f1ec203..c3f0acf 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;
     }