summaryrefslogtreecommitdiff
path: root/cppcanvas/source/mtfrenderer/textaction.cxx
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/source/mtfrenderer/textaction.cxx
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/source/mtfrenderer/textaction.cxx')
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx29
1 files changed, 20 insertions, 9 deletions
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;