From 944cdf5fa830e1d85b72c0d815e8fee29410e742 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 3 Mar 2016 11:36:09 +0100 Subject: sd: replace boost::bind with C++11 lambdas Change-Id: Idfac081e0b8aecde488166fe741d5b34cfcc66fe --- sd/source/ui/dlg/NavigatorChildWindow.cxx | 3 +-- sd/source/ui/sidebar/NavigatorWrapper.cxx | 4 ++-- sd/source/ui/view/drviewsa.cxx | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'sd/source/ui') diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index 8a9094c05ded..6796e23f9dec 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -25,7 +25,6 @@ #include #include #include -#include 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 7c270c5bb431..eb6fe20a098c 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -23,7 +23,6 @@ #include -#include 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 3bfe60fc63c9..10ce82e29bc5 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 #include 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(&rViewShellBase.GetDrawController()), sfx2::sidebar::EnumContext::Context_Default)) { -- cgit