Kaydet (Commit) 707f4161 authored tarafından Mario J. Rugiero's avatar Mario J. Rugiero Kaydeden (comit) Noel Grandin

boost::bind -> lambdas in canvas/source/simplecanvas/simplecanvasimpl.cxx

Change-Id: If768595d3c3ec294d5a59ad42f26aacfd6e0fda3
Reviewed-on: https://gerrit.libreoffice.org/19708Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 0e654490
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <boost/bind.hpp>
#include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp>
#include <com/sun/star/rendering/PanoseLetterForm.hpp> #include <com/sun/star/rendering/PanoseLetterForm.hpp>
...@@ -96,9 +95,7 @@ namespace ...@@ -96,9 +95,7 @@ namespace
explicit SimpleRenderState( uno::Reference<rendering::XGraphicDevice> const& xDevice ) : explicit SimpleRenderState( uno::Reference<rendering::XGraphicDevice> const& xDevice ) :
m_aPenColor( &color2Sequence), m_aPenColor( &color2Sequence),
m_aFillColor( &color2Sequence ), m_aFillColor( &color2Sequence ),
m_aRectClip( boost::bind( &rect2Poly, m_aRectClip( [&xDevice](geometry::RealRectangle2D const& rRect) { return rect2Poly(xDevice, rRect); } ),
xDevice,
_1 )),
m_aTransformation() m_aTransformation()
{ {
tools::setIdentityAffineMatrix2D( m_aTransformation ); tools::setIdentityAffineMatrix2D( m_aTransformation );
...@@ -161,11 +158,10 @@ namespace ...@@ -161,11 +158,10 @@ namespace
const uno::Reference< uno::XComponentContext >& ) : const uno::Reference< uno::XComponentContext >& ) :
SimpleCanvasBase( m_aMutex ), SimpleCanvasBase( m_aMutex ),
mxCanvas( grabCanvas(aArguments) ), mxCanvas( grabCanvas(aArguments) ),
maFont(boost::bind( &rendering::XCanvas::createFont, maFont([this](rendering::FontRequest const& rFontRequest) {
boost::cref(mxCanvas), return mxCanvas->createFont(rFontRequest,
_1, uno::Sequence< beans::PropertyValue >(),
uno::Sequence< beans::PropertyValue >(), geometry::Matrix2D()); } ),
geometry::Matrix2D() )),
maViewState(), maViewState(),
maRenderState( mxCanvas->getDevice() ) maRenderState( mxCanvas->getDevice() )
{ {
...@@ -173,7 +169,6 @@ namespace ...@@ -173,7 +169,6 @@ namespace
} }
private: private:
// Ifc XServiceName // Ifc XServiceName
virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException, std::exception) override virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException, std::exception) override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment