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

Mario J. Rugiero mrugiero at gmail.com
Sun Nov 1 03:31:44 PST 2015


 canvas/source/vcl/canvashelper_texturefill.cxx |    7 +++----
 canvas/source/vcl/spritecanvas.cxx             |   16 ++++------------
 2 files changed, 7 insertions(+), 16 deletions(-)

New commits:
commit ce69d6e9e1b776b9cd60b2db5ca002234ea36d8f
Author: Mario J. Rugiero <mrugiero at gmail.com>
Date:   Sat Oct 31 14:57:09 2015 -0300

    boost::bind -> lambdas in canvas/source/vcl subtree
    
    Change-Id: I2b2e746197b94222c73b78379d64086adfb5e693
    Reviewed-on: https://gerrit.libreoffice.org/19712
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index e87a26b..155498f 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -701,9 +700,9 @@ namespace vclcanvas
                         std::transform(&rValues.maColors[0],
                                        &rValues.maColors[0]+rValues.maColors.getLength(),
                                        aColors.begin(),
-                                       boost::bind(
-                                           &vcl::unotools::stdColorSpaceSequenceToColor,
-                                           _1));
+                                       [](const uno::Sequence< double >& aColor) {
+                                           return vcl::unotools::stdColorSpaceSequenceToColor( aColor );
+                                       } );
 
                         // TODO(E1): Return value
                         // TODO(F1): FillRule
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index f6eb7c6..39e3ad7 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -21,8 +21,6 @@
 
 #include <algorithm>
 
-#include <boost/bind.hpp>
-
 #include <basegfx/tools/canvastools.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
@@ -64,17 +62,11 @@ namespace vclcanvas
         maPropHelper.addProperties(
             ::canvas::PropertySetHelper::MakeMap
             ("UnsafeScrolling",
-             boost::bind(&SpriteCanvasHelper::isUnsafeScrolling,
-                         boost::ref(maCanvasHelper)),
-             boost::bind(&SpriteCanvasHelper::enableUnsafeScrolling,
-                         boost::ref(maCanvasHelper),
-                         _1))
+             [this]() { return this->maCanvasHelper.isUnsafeScrolling(); },
+             [this](css::uno::Any const& aAny) mutable { this->maCanvasHelper.enableUnsafeScrolling(aAny); } )
             ("SpriteBounds",
-             boost::bind(&SpriteCanvasHelper::isSpriteBounds,
-                         boost::ref(maCanvasHelper)),
-             boost::bind(&SpriteCanvasHelper::enableSpriteBounds,
-                         boost::ref(maCanvasHelper),
-                         _1)));
+             [this]() { return this->maCanvasHelper.isSpriteBounds(); },
+             [this](css::uno::Any const& aAny) mutable { this->maCanvasHelper.enableSpriteBounds(aAny); } ));
 
         SAL_INFO("canvas.vcl", "VCLSpriteCanvas::initialize called" );
 


More information about the Libreoffice-commits mailing list