diff options
| -rw-r--r-- | canvas/source/cairo/cairo_spritecanvashelper.cxx | 1 | ||||
| -rw-r--r-- | canvas/source/directx/dx_spritecanvashelper.cxx | 1 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/spritecanvas.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 1 | ||||
| -rw-r--r-- | include/canvas/base/bufferedgraphicdevicebase.hxx | 7 | ||||
| -rw-r--r-- | include/canvas/base/graphicdevicebase.hxx | 24 | ||||
| -rw-r--r-- | include/canvas/spriteredrawmanager.hxx | 1 | ||||
| -rw-r--r-- | include/canvas/verifyinput.hxx | 1 |
9 files changed, 19 insertions, 21 deletions
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index 3f638a894834..a07fc1e23b3b 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -29,6 +29,7 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> +#include <boost/bind.hpp> #include <boost/cast.hpp> #include "cairo_spritecanvashelper.hxx" diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx index 67f0d8184114..6a06c6a6b225 100644 --- a/canvas/source/directx/dx_spritecanvashelper.cxx +++ b/canvas/source/directx/dx_spritecanvashelper.cxx @@ -28,6 +28,7 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> +#include <boost/bind.hpp> #include <boost/cast.hpp> #include "dx_spritecanvashelper.hxx" diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 15bac809a099..3861c4aaa489 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -36,6 +36,8 @@ #include <GL/glew.h> +#include <boost/bind.hpp> + #include <memory> diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 91e21038900d..bcbaffbb19b3 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -34,6 +34,8 @@ #include <basegfx/tools/canvastools.hxx> +#include <boost/bind.hpp> + #include <algorithm> #include "spritecanvas.hxx" diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index e6fa3e7f7280..d7a7fee8904b 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -31,6 +31,7 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> +#include <boost/bind.hpp> #include <boost/cast.hpp> #include "spritecanvashelper.hxx" diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx index 102f0482f434..c9aec5f29eee 100644 --- a/include/canvas/base/bufferedgraphicdevicebase.hxx +++ b/include/canvas/base/bufferedgraphicdevicebase.hxx @@ -87,10 +87,9 @@ namespace canvas mbIsVisible( false ), mbIsTopLevel( false ) { - BaseType::maPropHelper.addProperties( PropertySetHelper::MakeMap - ("Window", - boost::bind(&OurType::getXWindow, - this))); + BaseType::maPropHelper.addProperties( + PropertySetHelper::MakeMap("Window", + [this] () { return this->getXWindow(); })); } // XGraphicDevice diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index e7c75c80c552..83b5adc69fd4 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/include/canvas/base/graphicdevicebase.hxx @@ -119,21 +119,15 @@ namespace canvas mbDumpScreenContent(false) { maPropHelper.initProperties( PropertySetHelper::MakeMap - ("HardwareAcceleration", - boost::bind(&DeviceHelper::isAccelerated, - boost::ref(maDeviceHelper))) - ("DeviceHandle", - boost::bind(&DeviceHelper::getDeviceHandle, - boost::ref(maDeviceHelper))) - ("SurfaceHandle", - boost::bind(&DeviceHelper::getSurfaceHandle, - boost::ref(maDeviceHelper))) - ("DumpScreenContent", - boost::bind(&ThisType::getDumpScreenContent, - this), - boost::bind(&ThisType::setDumpScreenContent, - this, - _1))); + ("HardwareAcceleration", + [this] () { return this->maDeviceHelper.isAccelerated(); } ) + ("DeviceHandle", + [this] () { return this->maDeviceHelper.getDeviceHandle(); } ) + ("SurfaceHandle", + [this] () { return this->maDeviceHelper.getSurfaceHandle(); } ) + ("DumpScreenContent", + [this] () { return this->getDumpScreenContent(); }, + [this] (css::uno::Any const& rAny) { this->setDumpScreenContent(rAny); })); } virtual void disposeThis() SAL_OVERRIDE diff --git a/include/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx index 7609b4f8f4a6..f56970de2237 100644 --- a/include/canvas/spriteredrawmanager.hxx +++ b/include/canvas/spriteredrawmanager.hxx @@ -33,7 +33,6 @@ #include <algorithm> #include <boost/utility.hpp> -#include <boost/bind.hpp> #include <canvas/canvastoolsdllapi.h> diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx index 14f86769b299..e3a2c1f39829 100644 --- a/include/canvas/verifyinput.hxx +++ b/include/canvas/verifyinput.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <algorithm> -#include <boost/bind.hpp> #include <boost/current_function.hpp> #include <canvas/canvastoolsdllapi.h> |