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

Michael Stahl mstahl at redhat.com
Fri May 13 21:51:23 UTC 2016


 filter/source/svg/svgreader.cxx |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 577b4e499b870a8afd56f2d9ac1fe0313162bf8d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 13 20:58:22 2016 +0200

    filter: convert boost::bind
    
    Change-Id: Ib17cfa114b7a218c31690c780cf14e128a7992c2
    Reviewed-on: https://gerrit.libreoffice.org/24981
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 8b09bad..79c9636 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -42,7 +42,6 @@
 #include <vcl/graphicfilter.hxx>
 #include <tools/zcodec.hxx>
 
-#include <boost/bind.hpp>
 #include <map>
 
 #define OASIS_STR "urn:oasis:names:tc:opendocument:xmlns:"
@@ -1718,11 +1717,10 @@ struct ShapeWritingVisitor
             {
                 // collect text from all TEXT_NODE children into sText
                 OUStringBuffer sText;
-                visitChildren(boost::bind(
-                                  (OUStringBuffer& (OUStringBuffer::*)(const OUString& str))&OUStringBuffer::append,
-                                  boost::ref(sText),
-                                  boost::bind(&xml::dom::XNode::getNodeValue,
-                                              _1)),
+                visitChildren(
+                    [&sText] (xml::dom::XNode & rNode) {
+                        return sText.append(rNode.getNodeValue());
+                    },
                               xElem,
                               xml::dom::NodeType_TEXT_NODE);
 
@@ -1875,9 +1873,10 @@ struct ShapeWritingVisitor
         // TODO(F2): separate out shear, rotate etc.
         // apply transformation to polygon, to keep draw
         // import in 100th mm
-        std::for_each(aPolys.begin(),aPolys.end(),
-                      boost::bind(&basegfx::B2DPolyPolygon::transform,
-                                  _1,boost::cref(aState.maCTM)));
+        for (basegfx::B2DPolyPolygon & aPoly : aPolys)
+        {
+            aPoly.transform(aState.maCTM);
+        }
 
         for(basegfx::B2DPolyPolygon & aPoly : aPolys)
         {


More information about the Libreoffice-commits mailing list