mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd: replace boost::bind with C++11 lambdas

Browse Source 
Change-Id: Idfac081e0b8aecde488166fe741d5b34cfcc66fe
This commit is contained in:
Michael Stahl
2016-03-03 11:36:09 +01:00
parent 6153a30e1e
commit 944cdf5fa8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sd/source/core/stlsheet.cxx
View File

@@ -25,7 +25,6 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/interfacecontainer.hxx>
#include <boost/bind.hpp>
#include <editeng/outliner.hxx> #include <editeng/outliner.hxx>
#include <editeng/eeitem.hxx> #include <editeng/eeitem.hxx>
@@ -842,7 +841,10 @@ void SdStyleSheet::notifyModifyListener()
if( pContainer ) if( pContainer )
{ {
EventObject aEvt( static_cast< OWeakObject * >( this ) ); 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);
} );
} }
} }

3
sd/source/ui/dlg/NavigatorChildWindow.cxx
View File

@@ -25,7 +25,6 @@
#include <sfx2/bindings.hxx> #include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx> #include <sfx2/dispatch.hxx>
#include <svl/eitem.hxx> #include <svl/eitem.hxx>
#include <boost/bind.hpp>
namespace sd { namespace sd {
@@ -58,7 +57,7 @@ NavigatorChildWindow::NavigatorChildWindow (
pBindings); pBindings);
pNavWin->SetUpdateRequestFunctor( pNavWin->SetUpdateRequestFunctor(
::boost::bind(RequestNavigatorUpdate, pBindings)); [pBindings] () { return RequestNavigatorUpdate(pBindings); });
SetWindow( pNavWin ); SetWindow( pNavWin );
} }

4
sd/source/ui/sidebar/NavigatorWrapper.cxx
View File

@@ -23,7 +23,6 @@
#include <sfx2/sidebar/Theme.hxx> #include <sfx2/sidebar/Theme.hxx>
#include <boost/bind.hpp>
namespace sd { namespace sidebar { namespace sd { namespace sidebar {
@@ -38,7 +37,8 @@ NavigatorWrapper::NavigatorWrapper (
SdResId(FLT_NAVIGATOR), SdResId(FLT_NAVIGATOR),
pBindings)) pBindings))
{ {
maNavigator->SetUpdateRequestFunctor(::boost::bind(&NavigatorWrapper::UpdateNavigator, this)); maNavigator->SetUpdateRequestFunctor(
[this] () { return this->UpdateNavigator(); });
maNavigator->SetPosSizePixel( maNavigator->SetPosSizePixel(
Point(0,0), Point(0,0),
GetSizePixel()); GetSizePixel());

3
sd/source/ui/view/drviewsa.cxx
View File

@@ -69,7 +69,6 @@
#include "annotationmanager.hxx" #include "annotationmanager.hxx"
#include "DrawController.hxx" #include "DrawController.hxx"
#include <boost/bind.hpp>
#include <memory> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -114,7 +113,7 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
, mbIsLayerModeActive(false) , mbIsLayerModeActive(false)
, mbIsInSwitchPage(false) , mbIsInSwitchPage(false)
, mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler( , mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler(
::boost::bind(&DrawViewShell::GetSidebarContextName, this), [this] () { return this->GetSidebarContextName(); },
uno::Reference<frame::XController>(&rViewShellBase.GetDrawController()), uno::Reference<frame::XController>(&rViewShellBase.GetDrawController()),
sfx2::sidebar::EnumContext::Context_Default)) sfx2::sidebar::EnumContext::Context_Default))
{ {