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

Michael Stahl mstahl at redhat.com
Thu Mar 3 12:04:07 UTC 2016


 sd/source/core/stlsheet.cxx               |    6 ++++--
 sd/source/ui/dlg/NavigatorChildWindow.cxx |    3 +--
 sd/source/ui/sidebar/NavigatorWrapper.cxx |    4 ++--
 sd/source/ui/view/drviewsa.cxx            |    3 +--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 944cdf5fa830e1d85b72c0d815e8fee29410e742
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 3 11:36:09 2016 +0100

    sd: replace boost::bind with C++11 lambdas
    
    Change-Id: Idfac081e0b8aecde488166fe741d5b34cfcc66fe

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 3765775..fe4f0a2 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -25,7 +25,6 @@
 #include <vcl/svapp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <boost/bind.hpp>
 
 #include <editeng/outliner.hxx>
 #include <editeng/eeitem.hxx>
@@ -842,7 +841,10 @@ void SdStyleSheet::notifyModifyListener()
     if( pContainer )
     {
         EventObject aEvt( static_cast< OWeakObject * >( this ) );
-        pContainer->forEach<XModifyListener>( boost::bind( &XModifyListener::modified, _1, boost::cref( aEvt ) ) );
+        pContainer->forEach<XModifyListener>(
+            [&] (Reference<XModifyListener> const& xListener) {
+                return xListener->modified(aEvt);
+            } );
     }
 }
 
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 8a9094c..6796e23 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -25,7 +25,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/eitem.hxx>
-#include <boost/bind.hpp>
 
 namespace sd {
 
@@ -58,7 +57,7 @@ NavigatorChildWindow::NavigatorChildWindow (
         pBindings);
 
     pNavWin->SetUpdateRequestFunctor(
-        ::boost::bind(RequestNavigatorUpdate, pBindings));
+        [pBindings] () { return RequestNavigatorUpdate(pBindings); });
 
     SetWindow( pNavWin );
 }
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index 7c270c5..eb6fe20 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -23,7 +23,6 @@
 
 #include <sfx2/sidebar/Theme.hxx>
 
-#include <boost/bind.hpp>
 
 namespace sd { namespace sidebar {
 
@@ -38,7 +37,8 @@ NavigatorWrapper::NavigatorWrapper (
         SdResId(FLT_NAVIGATOR),
         pBindings))
 {
-    maNavigator->SetUpdateRequestFunctor(::boost::bind(&NavigatorWrapper::UpdateNavigator, this));
+    maNavigator->SetUpdateRequestFunctor(
+            [this] () { return this->UpdateNavigator(); });
     maNavigator->SetPosSizePixel(
         Point(0,0),
         GetSizePixel());
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 3bfe60f..10ce82e 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -69,7 +69,6 @@
 #include "annotationmanager.hxx"
 #include "DrawController.hxx"
 
-#include <boost/bind.hpp>
 #include <memory>
 
 using namespace ::com::sun::star;
@@ -114,7 +113,7 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
     , mbIsLayerModeActive(false)
     , mbIsInSwitchPage(false)
     , mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
-          ::boost::bind(&DrawViewShell::GetSidebarContextName, this),
+          [this] () { return this->GetSidebarContextName(); },
           uno::Reference<frame::XController>(&rViewShellBase.GetDrawController()),
           sfx2::sidebar::EnumContext::Context_Default))
 {


More information about the Libreoffice-commits mailing list