summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-07 20:31:52 +0200
committerMichael Stahl <mstahl@redhat.com>2016-04-08 09:58:36 +0000
commitf781997ee1dcb61b01b04cc050001e2f46b12dfe (patch)
tree83be657f44225dc68fd0a47d129ab0a27817273c /cppcanvas
parent98d7b02f2b69f2f88a03054183933df7f190017d (diff)
tdf#94306 replace boost::noncopyable in c...
comphelper, connectivity and cppcanvas. Replace with C++11 delete copy-constructur and copy-assignment. Removed unused boost/noncopyable.hpp includes from some source files in cppcanvas. Change-Id: I90780820e21fbfd291ac10c266e7d16616e3a81b Reviewed-on: https://gerrit.libreoffice.org/23905 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/mtfrenderer/bitmapaction.cxx1
-rw-r--r--cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx7
-rw-r--r--cppcanvas/source/mtfrenderer/lineaction.cxx7
-rw-r--r--cppcanvas/source/mtfrenderer/pointaction.cxx7
-rw-r--r--cppcanvas/source/mtfrenderer/polypolyaction.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx29
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.cxx7
7 files changed, 36 insertions, 24 deletions
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 941690c03069..2777abb7e24c 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -30,7 +30,6 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/tools/canvastools.hxx>
-#include <boost/noncopyable.hpp>
#include "cachedprimitivebase.hxx"
#include "bitmapaction.hxx"
#include "outdevstate.hxx"
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index fb69778b183b..5fc7e0aeb0b3 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <cppcanvas/canvas.hxx>
-#include <boost/noncopyable.hpp>
#include "action.hxx"
@@ -46,8 +45,7 @@ namespace cppcanvas
class' public render() method gets called, the cached
representation is taken.
*/
- class CachedPrimitiveBase : public Action,
- private ::boost::noncopyable
+ class CachedPrimitiveBase : public Action
{
public:
/** Constructor
@@ -65,6 +63,9 @@ namespace cppcanvas
bool bOnlyRedrawWithSameTransform );
virtual ~CachedPrimitiveBase() {}
+ CachedPrimitiveBase(const CachedPrimitiveBase&) = delete;
+ const CachedPrimitiveBase& operator=(const CachedPrimitiveBase&) = delete;
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
protected:
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index abda71d5c2c7..5d9acd23ef05 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -31,8 +31,6 @@
#include <basegfx/tools/canvastools.hxx>
#include <canvas/canvastools.hxx>
-#include <boost/noncopyable.hpp>
-
#include <cppcanvas/canvas.hxx>
#include <mtftools.hxx>
@@ -46,7 +44,7 @@ namespace cppcanvas
{
namespace
{
- class LineAction : public Action, private ::boost::noncopyable
+ class LineAction : public Action
{
public:
LineAction( const ::basegfx::B2DPoint&,
@@ -54,6 +52,9 @@ namespace cppcanvas
const CanvasSharedPtr&,
const OutDevState& );
+ LineAction(const LineAction&) = delete;
+ const LineAction& operator=(const LineAction&) = delete;
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const override;
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index b8e37885c8da..65cd910fe82c 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -28,8 +28,6 @@
#include <basegfx/tools/canvastools.hxx>
#include <canvas/canvastools.hxx>
-#include <boost/noncopyable.hpp>
-
#include "pointaction.hxx"
#include "outdevstate.hxx"
#include "cppcanvas/canvas.hxx"
@@ -44,7 +42,7 @@ namespace cppcanvas
{
namespace
{
- class PointAction : public Action, private ::boost::noncopyable
+ class PointAction : public Action
{
public:
PointAction( const ::basegfx::B2DPoint&,
@@ -55,6 +53,9 @@ namespace cppcanvas
const OutDevState&,
const ::Color& );
+ PointAction(const PointAction&) = delete;
+ const PointAction& operator=(const PointAction&) = delete;
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const override;
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 5c94513bce7f..e5363a649826 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -31,8 +31,6 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <canvas/canvastools.hxx>
-#include <boost/noncopyable.hpp>
-
#include "cachedprimitivebase.hxx"
#include "polypolyaction.hxx"
#include "outdevstate.hxx"
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index b29e7def6f83..14588d6b6f15 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -41,7 +41,6 @@
#include <canvas/canvastools.hxx>
#include <memory>
-#include <boost/noncopyable.hpp>
#include "textaction.hxx"
#include "outdevstate.hxx"
@@ -606,7 +605,7 @@ namespace cppcanvas
}
- class TextAction : public Action, private ::boost::noncopyable
+ class TextAction : public Action
{
public:
TextAction( const ::basegfx::B2DPoint& rStartPoint,
@@ -624,6 +623,9 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
+ TextAction(const TextAction&) = delete;
+ const TextAction& operator=(const TextAction&) = delete;
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const override;
@@ -759,8 +761,7 @@ namespace cppcanvas
class EffectTextAction :
public Action,
- public TextRenderer,
- private ::boost::noncopyable
+ public TextRenderer
{
public:
EffectTextAction( const ::basegfx::B2DPoint& rStartPoint,
@@ -788,6 +789,9 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
+ EffectTextAction(const EffectTextAction&) = delete;
+ const EffectTextAction& operator=(const EffectTextAction&) = delete;
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const override;
@@ -996,7 +1000,7 @@ namespace cppcanvas
}
- class TextArrayAction : public Action, private ::boost::noncopyable
+ class TextArrayAction : public Action
{
public:
TextArrayAction( const ::basegfx::B2DPoint& rStartPoint,
@@ -1016,6 +1020,9 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
+ TextArrayAction(const TextArrayAction&) = delete;
+ const TextArrayAction& operator=(const TextArrayAction&) = delete;
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const override;
@@ -1174,8 +1181,7 @@ namespace cppcanvas
class EffectTextArrayAction :
public Action,
- public TextRenderer,
- private ::boost::noncopyable
+ public TextRenderer
{
public:
EffectTextArrayAction( const ::basegfx::B2DPoint& rStartPoint,
@@ -1204,6 +1210,9 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
+ EffectTextArrayAction(const EffectTextArrayAction&) = delete;
+ const EffectTextArrayAction& operator=(const EffectTextArrayAction&);
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const override;
@@ -1510,8 +1519,7 @@ namespace cppcanvas
class OutlineAction :
public Action,
- public TextRenderer,
- private ::boost::noncopyable
+ public TextRenderer
{
public:
OutlineAction( const ::basegfx::B2DPoint& rStartPoint,
@@ -1538,6 +1546,9 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
+ OutlineAction(const OutlineAction&) = delete;
+ const OutlineAction& operator=(const OutlineAction&);
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const override;
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index a8f61f266256..474d22b7dfae 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -48,8 +48,6 @@
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <boost/noncopyable.hpp>
-
#include "transparencygroupaction.hxx"
#include "outdevstate.hxx"
#include "mtftools.hxx"
@@ -66,7 +64,7 @@ namespace cppcanvas
// ======================
namespace
{
- class TransparencyGroupAction : public Action, private ::boost::noncopyable
+ class TransparencyGroupAction : public Action
{
public:
/** Create new transparency group action.
@@ -94,6 +92,9 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas,
const OutDevState& rState );
+ TransparencyGroupAction(const TransparencyGroupAction&) = delete;
+ const TransparencyGroupAction& operator=(const TransparencyGroupAction&) = delete;
+
virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const override;