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

1
cppcanvas/source/mtfrenderer/bitmapaction.cxx
View File

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

7
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
View File

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

7
cppcanvas/source/mtfrenderer/lineaction.cxx
View File

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

7
cppcanvas/source/mtfrenderer/pointaction.cxx
View File

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

2
cppcanvas/source/mtfrenderer/polypolyaction.cxx
View File

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

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;

7
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
View File

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