diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-08 14:58:51 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2016-04-08 17:42:57 +0000 |
commit | 922ee9a9da62febfe38a7780b11cf0d7ea0d5685 (patch) | |
tree | c9e59d34db8a32b17894991b6f377101990bc7fe /drawinglayer | |
parent | 25934decf8bfd94506bccd48ac66be9d7eb4dce2 (diff) |
tdf#94306 replace boost::noncopyable in d...
dbaccess, desktop and drawinglayer.
Replace with C++11 delete copy-constructur
and copy-assignment.
Nothing special, only one unused include in
dbaccess/source/filter/xml/xmlfilter.cxx.
Change-Id: Iebabbc658215162450d4caf08d4fb2f116c456d9
Reviewed-on: https://gerrit.libreoffice.org/23918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'drawinglayer')
-rw-r--r-- | drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 7 | ||||
-rw-r--r-- | drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 16 |
2 files changed, 16 insertions, 7 deletions
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index fca73e137884..2d7be59624f9 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <boost/noncopyable.hpp> #include <com/sun/star/graphic/XPrimitive2DRenderer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -49,13 +48,15 @@ namespace drawinglayer { class XPrimitive2DRenderer: public cppu::WeakAggImplHelper2< - css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>, - private boost::noncopyable + css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo> { public: XPrimitive2DRenderer(); virtual ~XPrimitive2DRenderer(); + XPrimitive2DRenderer(const XPrimitive2DRenderer&) = delete; + const XPrimitive2DRenderer& operator=(const XPrimitive2DRenderer&) = delete; + // XPrimitive2DRenderer virtual uno::Reference< rendering::XBitmap > SAL_CALL rasterize( const uno::Sequence< uno::Reference< graphic::XPrimitive2D > >& Primitive2DSequence, diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 8d411b277eb3..2db0aa891823 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <boost/noncopyable.hpp> #include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx> #include <drawinglayer/attribute/materialattribute3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> @@ -35,7 +34,7 @@ namespace drawinglayer { namespace // anonymous namespace { - class TubeBuffer : private boost::noncopyable + class TubeBuffer { private: // data for buffered tube primitives @@ -49,6 +48,9 @@ namespace drawinglayer { } + TubeBuffer(const TubeBuffer&) = delete; + const TubeBuffer& operator=(const TubeBuffer&) = delete; + Primitive3DContainer getLineTubeSegments( sal_uInt32 nSegments, const attribute::MaterialAttribute3D& rMaterial) @@ -117,7 +119,7 @@ namespace drawinglayer return rTheBuffer.getLineTubeSegments(nSegments, rMaterial); } - class CapBuffer : private boost::noncopyable + class CapBuffer { private: // data for buffered cap primitives @@ -130,6 +132,9 @@ namespace drawinglayer : m_nLineCapSegments(0) { } + CapBuffer(const CapBuffer&) = delete; + const CapBuffer& operator=(const CapBuffer&) = delete; + Primitive3DContainer getLineCapSegments( sal_uInt32 nSegments, const attribute::MaterialAttribute3D& rMaterial) @@ -192,7 +197,7 @@ namespace drawinglayer return rTheBuffer.getLineCapSegments(nSegments, rMaterial); } - class CapRoundBuffer : private boost::noncopyable + class CapRoundBuffer { private: // data for buffered capround primitives @@ -205,6 +210,9 @@ namespace drawinglayer : m_nLineCapRoundSegments(0) { } + CapRoundBuffer(const CapRoundBuffer&) = delete; + const CapRoundBuffer& operator=(const CapRoundBuffer&) = delete; + Primitive3DContainer getLineCapRoundSegments( sal_uInt32 nSegments, const attribute::MaterialAttribute3D& rMaterial) |