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

[Mario J. Rugiero]

 canvas/source/simplecanvas/simplecanvasimpl.cxx |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 707f416192d5a0ca5fa96f7e141c988060b0f292
Author: Mario J. Rugiero <mrugiero at gmail.com>
Date:   Sat Oct 31 14:44:18 2015 -0300

    boost::bind -> lambdas in canvas/source/simplecanvas/simplecanvasimpl.cxx
    
    Change-Id: If768595d3c3ec294d5a59ad42f26aacfd6e0fda3
    Reviewed-on: https://gerrit.libreoffice.org/19708
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index bed82b8..e6308a8 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