diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-31 21:35:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-31 21:35:42 +0200 |
| commit | c2966acc465086b164b36e3366f164554f83ad21 (patch) | |
| tree | a1428a7eed2a7002ca0ee7c6aed2daa9a6841065 /canvas | |
| parent | 701cfbd696a8bbea9296de0b32bb80b007c04496 (diff) | |
canvas: replace boost::function with std::function
Change-Id: I1a4a3007a07a796d80d06ab7554953925bb8be3d
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 6 | ||||
| -rw-r--r-- | canvas/source/simplecanvas/simplecanvasimpl.cxx | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 6fb306f4d5fa..63acd3cc9a7f 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -37,9 +37,9 @@ #include <GL/glew.h> #include <boost/bind.hpp> -#include <boost/function.hpp> #include <memory> +#include <functional> using namespace ::com::sun::star; @@ -85,13 +85,13 @@ namespace oglcanvas rendering::ARGBColor maARGBColor; ::basegfx::B2DPolyPolygonVector maPolyPolys; - ::boost::function6< bool, + ::std::function< bool ( const CanvasHelper&, const ::basegfx::B2DHomMatrix&, GLenum, GLenum, const rendering::ARGBColor&, - const ::basegfx::B2DPolyPolygonVector& > maFunction; + const ::basegfx::B2DPolyPolygonVector&)> maFunction; }; namespace diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 1579fcd9fd1e..92332a6c1fb9 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -38,7 +38,8 @@ #include <canvas/canvastools.hxx> #include <boost/bind.hpp> -#include <boost/function.hpp> + +#include <functional> #define SERVICE_NAME "com.sun.star.rendering.SimpleCanvas" @@ -91,7 +92,7 @@ namespace decltype(&color2Sequence)> m_aFillColor; o3tl::LazyUpdate<geometry::RealRectangle2D, uno::Reference< rendering::XPolyPolygon2D >, - boost::function1<uno::Reference<rendering::XPolyPolygon2D>, geometry::RealRectangle2D> > m_aRectClip; + std::function<uno::Reference<rendering::XPolyPolygon2D> (geometry::RealRectangle2D)> > m_aRectClip; geometry::AffineMatrix2D m_aTransformation; explicit SimpleRenderState( uno::Reference<rendering::XGraphicDevice> const& xDevice ) : @@ -368,7 +369,7 @@ namespace typedef o3tl::LazyUpdate< rendering::FontRequest, uno::Reference< rendering::XCanvasFont >, - boost::function1<uno::Reference<rendering::XCanvasFont>, rendering::FontRequest> > SimpleFont; + std::function<uno::Reference<rendering::XCanvasFont> (rendering::FontRequest)> > SimpleFont; uno::Reference<rendering::XCanvas> mxCanvas; SimpleFont maFont; |