diff options
author | Mario J. Rugiero <mrugiero@gmail.com> | 2015-10-31 14:44:18 -0300 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-01 15:28:41 +0000 |
commit | 707f416192d5a0ca5fa96f7e141c988060b0f292 (patch) | |
tree | dca5afa5a7ab42903a1e3d449ad8b49869d19ee6 | |
parent | 0e6544903bc572d1d6051cbb89a4cfb727401159 (diff) |
boost::bind -> lambdas in canvas/source/simplecanvas/simplecanvasimpl.cxx
Change-Id: If768595d3c3ec294d5a59ad42f26aacfd6e0fda3
Reviewed-on: https://gerrit.libreoffice.org/19708
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r-- | canvas/source/simplecanvas/simplecanvasimpl.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index bed82b850ba4..e6308a8accb4 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -21,7 +21,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <boost/bind.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/PanoseLetterForm.hpp> @@ -96,9 +95,7 @@ namespace explicit SimpleRenderState( uno::Reference<rendering::XGraphicDevice> const& xDevice ) : m_aPenColor( &color2Sequence), m_aFillColor( &color2Sequence ), - m_aRectClip( boost::bind( &rect2Poly, - xDevice, - _1 )), + m_aRectClip( [&xDevice](geometry::RealRectangle2D const& rRect) { return rect2Poly(xDevice, rRect); } ), m_aTransformation() { tools::setIdentityAffineMatrix2D( m_aTransformation ); @@ -161,11 +158,10 @@ namespace const uno::Reference< uno::XComponentContext >& ) : SimpleCanvasBase( m_aMutex ), mxCanvas( grabCanvas(aArguments) ), - maFont(boost::bind( &rendering::XCanvas::createFont, - boost::cref(mxCanvas), - _1, - uno::Sequence< beans::PropertyValue >(), - geometry::Matrix2D() )), + maFont([this](rendering::FontRequest const& rFontRequest) { + return mxCanvas->createFont(rFontRequest, + uno::Sequence< beans::PropertyValue >(), + geometry::Matrix2D()); } ), maViewState(), maRenderState( mxCanvas->getDevice() ) { @@ -173,7 +169,6 @@ namespace } - private: // Ifc XServiceName virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException, std::exception) override |