diff options
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 1 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/simplecanvas/simplecanvasimpl.cxx | 1 | ||||
| -rw-r--r-- | canvas/source/tools/propertysethelper.cxx | 4 | ||||
| -rw-r--r-- | include/canvas/propertysethelper.hxx | 6 |
5 files changed, 8 insertions, 6 deletions
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 3861c4aaa489..6fb306f4d5fa 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -37,6 +37,7 @@ #include <GL/glew.h> #include <boost/bind.hpp> +#include <boost/function.hpp> #include <memory> diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 876400407661..25c9e9ba794e 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -297,7 +297,7 @@ namespace oglcanvas SpriteComparator()); std::for_each(aSprites.begin(), aSprites.end(), - boost::mem_fn(&CanvasCustomSprite::renderSprite)); + std::mem_fn(&CanvasCustomSprite::renderSprite)); // frame counter, other info diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index af7f9dfb439d..1579fcd9fd1e 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -38,6 +38,7 @@ #include <canvas/canvastools.hxx> #include <boost/bind.hpp> +#include <boost/function.hpp> #define SERVICE_NAME "com.sun.star.rendering.SimpleCanvas" diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx index 477fda9ee19c..33ddcbd1543f 100644 --- a/canvas/source/tools/propertysethelper.cxx +++ b/canvas/source/tools/propertysethelper.cxx @@ -110,7 +110,7 @@ namespace canvas throwUnknown( aPropertyName ); } - if( aCallbacks.setter.empty() ) + if (!aCallbacks.setter) throwVeto( aPropertyName ); aCallbacks.setter(aValue); @@ -126,7 +126,7 @@ namespace canvas throwUnknown( aPropertyName ); } - if( !aCallbacks.getter.empty() ) + if (aCallbacks.getter) return aCallbacks.getter(); // TODO(Q1): subtlety, empty getter method silently returns diff --git a/include/canvas/propertysethelper.hxx b/include/canvas/propertysethelper.hxx index 37aea9313f4a..22560979a308 100644 --- a/include/canvas/propertysethelper.hxx +++ b/include/canvas/propertysethelper.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <canvas/canvastools.hxx> -#include <boost/function.hpp> +#include <functional> #include <vector> #include <memory> @@ -50,8 +50,8 @@ namespace canvas class CANVASTOOLS_DLLPUBLIC PropertySetHelper { public: - typedef boost::function0< ::com::sun::star::uno::Any > GetterType; - typedef boost::function1<void, const ::com::sun::star::uno::Any&> SetterType; + typedef std::function<::com::sun::star::uno::Any ()> GetterType; + typedef std::function<void (const ::com::sun::star::uno::Any&)> SetterType; struct Callbacks { GetterType getter; |