diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-28 16:14:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-29 08:51:55 +0200 |
commit | 5d5c4686badbf67aa25b18701f25d90fa8b4e42a (patch) | |
tree | 39d10e1f40b12ee20c50d5eed313d46df054783d /include/drawinglayer | |
parent | fbff75a64c7449aac85d640f67b1de147db35c3e (diff) |
remove boost::noncopyable from /include
Change-Id: I9fa22b06fabf79043ebc68be7afebc6e810f4db1
Diffstat (limited to 'include/drawinglayer')
-rw-r--r-- | include/drawinglayer/primitive2d/baseprimitive2d.hxx | 10 | ||||
-rw-r--r-- | include/drawinglayer/primitive3d/baseprimitive3d.hxx | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 12b4b83b66cc..860b9a422c99 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -23,7 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <cppuhelper/compbase1.hxx> -#include <boost/noncopyable.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <comphelper/broadcasthelper.hxx> #include <basegfx/range/b2drange.hxx> @@ -70,7 +69,7 @@ namespace drawinglayer This is by purpose, this base class shall not be incarnated and be used directly as a XPrimitive2D. - It is derived from boost::noncopyable to make clear that a primitive is a read-only + It is noncopyable to make clear that a primitive is a read-only instance and copying or changing values is not intended. The idea is to hold all data needed for visualisation of this primitive in unchangeable form. @@ -136,12 +135,11 @@ namespace drawinglayer in their get2DDecomposition/getB2DRange implementations. */ class DRAWINGLAYER_DLLPUBLIC BasePrimitive2D - : private boost::noncopyable, - protected comphelper::OBaseMutex, + : protected comphelper::OBaseMutex, public BasePrimitive2DImplBase { - private: - protected: + BasePrimitive2D(const BasePrimitive2D&) = delete; + BasePrimitive2D& operator=( const BasePrimitive2D& ) = delete; public: // constructor/destructor BasePrimitive2D(); diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index 1cf0374109d6..159108835fde 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -23,7 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <cppuhelper/compbase1.hxx> -#include <boost/noncopyable.hpp> #include <com/sun/star/graphic/XPrimitive3D.hpp> #include <comphelper/broadcasthelper.hxx> #include <basegfx/range/b3drange.hxx> @@ -77,12 +76,11 @@ namespace drawinglayer That's all for 3D! */ class DRAWINGLAYER_DLLPUBLIC BasePrimitive3D - : private boost::noncopyable, - protected comphelper::OBaseMutex, + : protected comphelper::OBaseMutex, public BasePrimitive3DImplBase { - private: - protected: + BasePrimitive3D(const BasePrimitive3D&) = delete; + BasePrimitive3D& operator=( const BasePrimitive3D& ) = delete; public: // constructor/destructor BasePrimitive3D(); |