mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#94306 replace boost::noncopyable in c...

Browse Source 
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>
This commit is contained in:
Jochen Nitschke
2016-04-07 20:31:52 +02:00
committed by Michael Stahl
parent 98d7b02f2b
commit f781997ee1
13 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cppcanvas/source/mtfrenderer/textaction.cxx
View File

@@ -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;