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

loplugin:deletedspecial

Browse Source 
Change-Id: I988d7cdfa048a3b093ebc34f9016ac42440daa4b
This commit is contained in:
Stephan Bergmann
2015-02-07 12:10:50 +01:00
parent c6be3cf03b
commit b13b01a2bc
16 changed files with 47 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cppcanvas/source/inc/implrenderer.hxx
View File

@@ -228,9 +228,8 @@ static float GetSwapFloat( SvStream& rSt )
void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, OutDevState& rState); void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, OutDevState& rState);
private: private:
// default: disabled copy/assignment ImplRenderer(const ImplRenderer&) SAL_DELETED_FUNCTION;
ImplRenderer(const ImplRenderer&); ImplRenderer& operator=( const ImplRenderer& ) SAL_DELETED_FUNCTION;
ImplRenderer& operator=( const ImplRenderer& );
void updateClipping( const ::basegfx::B2DPolyPolygon& rClipPoly, void updateClipping( const ::basegfx::B2DPolyPolygon& rClipPoly,
const ActionFactoryParameters& rParms, const ActionFactoryParameters& rParms,

18
cppcanvas/source/mtfrenderer/bitmapaction.hxx
View File

@@ -29,7 +29,7 @@ namespace basegfx {
} }
class BitmapEx; class BitmapEx;
/* Definition of internal::BitmapActionFactory class */ /* Definition of internal::BitmapActionFactory */
namespace cppcanvas namespace cppcanvas
{ {
@@ -44,29 +44,21 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts, handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent. text layout) is Canvas-dependent.
*/ */
class BitmapActionFactory namespace BitmapActionFactory
{ {
public:
/// Unscaled bitmap action, only references destination point /// Unscaled bitmap action, only references destination point
static ActionSharedPtr createBitmapAction( const ::BitmapEx&, ActionSharedPtr createBitmapAction( const ::BitmapEx&,
const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DPoint& rDstPoint,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Scaled bitmap action, dest point and dest size /// Scaled bitmap action, dest point and dest size
static ActionSharedPtr createBitmapAction( const ::BitmapEx&, ActionSharedPtr createBitmapAction( const ::BitmapEx&,
const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize, const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
}
private:
// static factory, disable big four
BitmapActionFactory();
~BitmapActionFactory();
BitmapActionFactory(const BitmapActionFactory&);
BitmapActionFactory& operator=( const BitmapActionFactory& );
};
} }
} }

16
cppcanvas/source/mtfrenderer/lineaction.hxx
View File

@@ -28,7 +28,7 @@ namespace basegfx {
} }
/* Definition of internal::LineActionFactory class */ /* Definition of internal::LineActionFactory */
namespace cppcanvas namespace cppcanvas
{ {
@@ -43,22 +43,14 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts, handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent. text layout) is Canvas-dependent.
*/ */
class LineActionFactory namespace LineActionFactory
{ {
public:
/// Plain hair line from point 1 to point 2 /// Plain hair line from point 1 to point 2
static ActionSharedPtr createLineAction( const ::basegfx::B2DPoint&, ActionSharedPtr createLineAction( const ::basegfx::B2DPoint&,
const ::basegfx::B2DPoint&, const ::basegfx::B2DPoint&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
}
private:
// static factory, disable big four
LineActionFactory();
~LineActionFactory();
LineActionFactory(const LineActionFactory&);
LineActionFactory& operator=( const LineActionFactory& );
};
} }
} }

18
cppcanvas/source/mtfrenderer/pointaction.hxx
View File

@@ -28,7 +28,7 @@ namespace basegfx {
class B2DPoint; class B2DPoint;
} }
/* Definition of internal::PointActionFactory class */ /* Definition of internal::PointActionFactory */
namespace cppcanvas namespace cppcanvas
{ {
@@ -43,27 +43,19 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts, handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent. text layout) is Canvas-dependent.
*/ */
class PointActionFactory namespace PointActionFactory
{ {
public:
/// Point in current color /// Point in current color
static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&, ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Point in given color /// Point in given color
static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&, ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const ::Color& ); const ::Color& );
}
private:
// static factory, disable big four
PointActionFactory();
~PointActionFactory();
PointActionFactory(const PointActionFactory&);
PointActionFactory& operator=( const PointActionFactory& );
};
} }
} }

24
cppcanvas/source/mtfrenderer/polypolyaction.hxx
View File

@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace rendering
} } } } } } } }
/* Definition of internal::PolyPolyActionFactory class */ /* Definition of internal::PolyPolyActionFactory */
namespace cppcanvas namespace cppcanvas
{ {
@@ -49,44 +49,36 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts, handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent. text layout) is Canvas-dependent.
*/ */
class PolyPolyActionFactory namespace PolyPolyActionFactory
{ {
public:
/// Create polygon, fill/stroke according to state /// Create polygon, fill/stroke according to state
static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Create texture-filled polygon /// Create texture-filled polygon
static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const ::com::sun::star::rendering::Texture& ); const ::com::sun::star::rendering::Texture& );
/// Create line polygon (always stroked, not filled) /// Create line polygon (always stroked, not filled)
static ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Create stroked polygon /// Create stroked polygon
static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const ::com::sun::star::rendering::StrokeAttributes& ); const ::com::sun::star::rendering::StrokeAttributes& );
/// For transparent painting of the given polygon (normally, we take the colors always opaque) /// For transparent painting of the given polygon (normally, we take the colors always opaque)
static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
int nTransparency ); int nTransparency );
}
private:
// static factory, disable big four
PolyPolyActionFactory();
~PolyPolyActionFactory();
PolyPolyActionFactory(const PolyPolyActionFactory&);
PolyPolyActionFactory& operator=( const PolyPolyActionFactory& );
};
} }
} }

16
cppcanvas/source/mtfrenderer/textaction.hxx
View File

@@ -33,7 +33,7 @@ class Size;
class Color; class Color;
/* Definition of internal::TextActionFactory class */ /* Definition of internal::TextActionFactory */
namespace cppcanvas namespace cppcanvas
{ {
@@ -48,9 +48,8 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts, handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent. text layout) is Canvas-dependent.
*/ */
class TextActionFactory namespace TextActionFactory
{ {
public:
/** Create text action, optionally shadow/relief effect /** Create text action, optionally shadow/relief effect
Note that this method accepts all coordinates in Note that this method accepts all coordinates in
@@ -65,7 +64,7 @@ namespace cppcanvas
subsettable (Action::render( Subset ) works on subsettable (Action::render( Subset ) works on
characters) characters)
*/ */
static ActionSharedPtr createTextAction( const ::Point& rStartPoint, ActionSharedPtr createTextAction( const ::Point& rStartPoint,
const ::Size& rReliefOffset, const ::Size& rReliefOffset,
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::Size& rShadowOffset, const ::Size& rShadowOffset,
@@ -79,14 +78,7 @@ namespace cppcanvas
const OutDevState& rState, const OutDevState& rState,
const Renderer::Parameters& rParms, const Renderer::Parameters& rParms,
bool bSubsettable ); bool bSubsettable );
}
private:
// static factory, disable big four
TextActionFactory();
~TextActionFactory();
TextActionFactory(const TextActionFactory&);
TextActionFactory& operator=( const TextActionFactory& );
};
} }
} }

16
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
View File

@@ -35,7 +35,7 @@ class GDIMetaFile;
class Gradient; class Gradient;
/* Definition of internal::TransparencyGroupActionFactory class */ /* Definition of internal::TransparencyGroupActionFactory */
namespace cppcanvas namespace cppcanvas
{ {
@@ -59,9 +59,8 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts, handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent. text layout) is Canvas-dependent.
*/ */
class TransparencyGroupActionFactory namespace TransparencyGroupActionFactory
{ {
public:
/** Create new transparency group action. /** Create new transparency group action.
@param rGroupMtf @param rGroupMtf
@@ -83,21 +82,14 @@ namespace cppcanvas
Size of the transparency group object, in current Size of the transparency group object, in current
state coordinate system. state coordinate system.
*/ */
static ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf, ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
GradientAutoPtr&& rAlphaGradient, GradientAutoPtr&& rAlphaGradient,
const Renderer::Parameters& rParms, const Renderer::Parameters& rParms,
const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize, const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ); const OutDevState& rState );
}
private:
// static factory, disable big four
TransparencyGroupActionFactory();
~TransparencyGroupActionFactory();
TransparencyGroupActionFactory(const TransparencyGroupActionFactory&);
TransparencyGroupActionFactory& operator=( const TransparencyGroupActionFactory& );
};
} }
} }

5
cppcanvas/source/wrapper/implbitmap.hxx
View File

@@ -57,9 +57,8 @@ namespace cppcanvas
::com::sun::star::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE; ::com::sun::star::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE;
private: private:
// default: disabled copy/assignment ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
ImplBitmap(const ImplBitmap&); ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
ImplBitmap& operator=( const ImplBitmap& );
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap; const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap;
BitmapCanvasSharedPtr mpBitmapCanvas; BitmapCanvasSharedPtr mpBitmapCanvas;

3
cppcanvas/source/wrapper/implbitmapcanvas.hxx
View File

@@ -50,8 +50,7 @@ namespace cppcanvas
//ImplBitmapCanvas(const ImplBitmapCanvas&); //ImplBitmapCanvas(const ImplBitmapCanvas&);
private: private:
// default: disabled assignment ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION;
ImplBitmapCanvas& operator=( const ImplBitmapCanvas& );
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > mxBitmapCanvas; const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > mxBitmapCanvas;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap; const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap;

3
cppcanvas/source/wrapper/implcanvas.hxx
View File

@@ -78,8 +78,7 @@ namespace cppcanvas
//ImplCanvas(const ImplCanvas&); //ImplCanvas(const ImplCanvas&);
private: private:
// default: disabled assignment ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
ImplCanvas& operator=( const ImplCanvas& );
mutable ::com::sun::star::rendering::ViewState maViewState; mutable ::com::sun::star::rendering::ViewState maViewState;
boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;

5
cppcanvas/source/wrapper/implcustomsprite.hxx
View File

@@ -48,9 +48,8 @@ namespace cppcanvas
virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE; virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE;
private: private:
// default: disabled copy/assignment ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
ImplCustomSprite(const ImplCustomSprite&); ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION;
ImplCustomSprite& operator=( const ImplCustomSprite& );
mutable CanvasSharedPtr mpLastCanvas; mutable CanvasSharedPtr mpLastCanvas;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > mxCustomSprite; const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > mxCustomSprite;

5
cppcanvas/source/wrapper/implpolypolygon.hxx
View File

@@ -65,9 +65,8 @@ namespace cppcanvas
::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE; ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
private: private:
// default: disabled copy/assignment ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
ImplPolyPolygon(const ImplPolyPolygon&); ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) SAL_DELETED_FUNCTION;
ImplPolyPolygon& operator= ( const ImplPolyPolygon& );
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly; const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly;

5
cppcanvas/source/wrapper/implsprite.hxx
View File

@@ -61,9 +61,8 @@ namespace cppcanvas
::com::sun::star::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE; ::com::sun::star::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE;
private: private:
// default: disabled copy/assignment ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION;
ImplSprite(const ImplSprite&); ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION;
ImplSprite& operator=( const ImplSprite& );
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice; ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > mxSprite; const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > mxSprite;

3
cppcanvas/source/wrapper/implspritecanvas.hxx
View File

@@ -80,8 +80,7 @@ namespace cppcanvas
typedef ::boost::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr; typedef ::boost::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr;
private: private:
// default: disabled assignment ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& );
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas; const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas;
TransformationArbiterSharedPtr mpTransformArbiter; TransformationArbiterSharedPtr mpTransformArbiter;

5
include/cppcanvas/basegfxfactory.hxx
View File

@@ -76,9 +76,8 @@ namespace cppcanvas
// singleton // singleton
BaseGfxFactory(); BaseGfxFactory();
// default: disabled copy/assignment BaseGfxFactory(const BaseGfxFactory&) SAL_DELETED_FUNCTION;
BaseGfxFactory(const BaseGfxFactory&); BaseGfxFactory& operator=( const BaseGfxFactory& ) SAL_DELETED_FUNCTION;
BaseGfxFactory& operator=( const BaseGfxFactory& );
}; };
} }

5
include/cppcanvas/vclfactory.hxx
View File

@@ -92,9 +92,8 @@ namespace cppcanvas
// singleton // singleton
VCLFactory(); VCLFactory();
// default: disabled copy/assignment VCLFactory(const VCLFactory&) SAL_DELETED_FUNCTION;
VCLFactory(const VCLFactory&); VCLFactory& operator=( const VCLFactory& ) SAL_DELETED_FUNCTION;
VCLFactory& operator=( const VCLFactory& );
}; };
} }