Skip to content

C
core
Kaydet (Commit) b13b01a2 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

loplugin:deletedspecial 

Change-Id: I988d7cdfa048a3b093ebc34f9016ac42440daa4b
üst c6be3cf0
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 105 deletions
cppcanvas/source/inc/implrenderer.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -228,9 +228,8 @@ static float GetSwapFloat( SvStream& rSt )
void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, OutDevState& rState);
private:
// default: disabled copy/assignment
ImplRenderer(const ImplRenderer&);
ImplRenderer& operator=( const ImplRenderer& );
ImplRenderer(const ImplRenderer&) SAL_DELETED_FUNCTION;
ImplRenderer& operator=( const ImplRenderer& ) SAL_DELETED_FUNCTION;
void updateClipping( const ::basegfx::B2DPolyPolygon& rClipPoly,
const ActionFactoryParameters& rParms,
......
cppcanvas/source/mtfrenderer/bitmapaction.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -29,7 +29,7 @@ namespace basegfx {
}
class BitmapEx;
/* Definition of internal::BitmapActionFactory class */
/* Definition of internal::BitmapActionFactory */
namespace cppcanvas
{
......@@ -44,29 +44,21 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent.
*/
class BitmapActionFactory
namespace BitmapActionFactory
{
public:
/// Unscaled bitmap action, only references destination point
static ActionSharedPtr createBitmapAction( const ::BitmapEx&,
ActionSharedPtr createBitmapAction( const ::BitmapEx&,
const ::basegfx::B2DPoint& rDstPoint,
const CanvasSharedPtr&,
const OutDevState& );
/// Scaled bitmap action, dest point and dest size
static ActionSharedPtr createBitmapAction( const ::BitmapEx&,
ActionSharedPtr createBitmapAction( const ::BitmapEx&,
const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr&,
const OutDevState& );
private:
// static factory, disable big four
BitmapActionFactory();
~BitmapActionFactory();
BitmapActionFactory(const BitmapActionFactory&);
BitmapActionFactory& operator=( const BitmapActionFactory& );
};
}
}
}
......
cppcanvas/source/mtfrenderer/lineaction.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -28,7 +28,7 @@ namespace basegfx {
}
/* Definition of internal::LineActionFactory class */
/* Definition of internal::LineActionFactory */
namespace cppcanvas
{
......@@ -43,22 +43,14 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent.
*/
class LineActionFactory
namespace LineActionFactory
{
public:
/// Plain hair line from point 1 to point 2
static ActionSharedPtr createLineAction( const ::basegfx::B2DPoint&,
ActionSharedPtr createLineAction( const ::basegfx::B2DPoint&,
const ::basegfx::B2DPoint&,
const CanvasSharedPtr&,
const OutDevState& );
private:
// static factory, disable big four
LineActionFactory();
~LineActionFactory();
LineActionFactory(const LineActionFactory&);
LineActionFactory& operator=( const LineActionFactory& );
};
}
}
}
......
cppcanvas/source/mtfrenderer/pointaction.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -28,7 +28,7 @@ namespace basegfx {
class B2DPoint;
}
/* Definition of internal::PointActionFactory class */
/* Definition of internal::PointActionFactory */
namespace cppcanvas
{
......@@ -43,27 +43,19 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent.
*/
class PointActionFactory
namespace PointActionFactory
{
public:
/// Point in current color
static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
const CanvasSharedPtr&,
const OutDevState& );
/// Point in given color
static ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
const CanvasSharedPtr&,
const OutDevState&,
const ::Color& );
private:
// static factory, disable big four
PointActionFactory();
~PointActionFactory();
PointActionFactory(const PointActionFactory&);
PointActionFactory& operator=( const PointActionFactory& );
};
}
}
}
......
cppcanvas/source/mtfrenderer/polypolyaction.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace rendering
} } } }
/* Definition of internal::PolyPolyActionFactory class */
/* Definition of internal::PolyPolyActionFactory */
namespace cppcanvas
{
......@@ -49,44 +49,36 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent.
*/
class PolyPolyActionFactory
namespace PolyPolyActionFactory
{
public:
/// Create polygon, fill/stroke according to state
static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState& );
/// Create texture-filled polygon
static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState&,
const ::com::sun::star::rendering::Texture& );
/// Create line polygon (always stroked, not filled)
static ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState& );
/// Create stroked polygon
static ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState&,
const ::com::sun::star::rendering::StrokeAttributes& );
/// 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 OutDevState&,
int nTransparency );
private:
// static factory, disable big four
PolyPolyActionFactory();
~PolyPolyActionFactory();
PolyPolyActionFactory(const PolyPolyActionFactory&);
PolyPolyActionFactory& operator=( const PolyPolyActionFactory& );
};
}
}
}
......
cppcanvas/source/mtfrenderer/textaction.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -33,7 +33,7 @@ class Size;
class Color;
/* Definition of internal::TextActionFactory class */
/* Definition of internal::TextActionFactory */
namespace cppcanvas
{
......@@ -48,9 +48,8 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent.
*/
class TextActionFactory
namespace TextActionFactory
{
public:
/** Create text action, optionally shadow/relief effect
Note that this method accepts all coordinates in
......@@ -65,7 +64,7 @@ namespace cppcanvas
subsettable (Action::render( Subset ) works on
characters)
*/
static ActionSharedPtr createTextAction( const ::Point& rStartPoint,
ActionSharedPtr createTextAction( const ::Point& rStartPoint,
const ::Size& rReliefOffset,
const ::Color& rReliefColor,
const ::Size& rShadowOffset,
......@@ -79,14 +78,7 @@ namespace cppcanvas
const OutDevState& rState,
const Renderer::Parameters& rParms,
bool bSubsettable );
private:
// static factory, disable big four
TextActionFactory();
~TextActionFactory();
TextActionFactory(const TextActionFactory&);
TextActionFactory& operator=( const TextActionFactory& );
};
}
}
}
......
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -35,7 +35,7 @@ class GDIMetaFile;
class Gradient;
/* Definition of internal::TransparencyGroupActionFactory class */
/* Definition of internal::TransparencyGroupActionFactory */
namespace cppcanvas
{
......@@ -59,9 +59,8 @@ namespace cppcanvas
handling, since a lot of the internal state (e.g. fonts,
text layout) is Canvas-dependent.
*/
class TransparencyGroupActionFactory
namespace TransparencyGroupActionFactory
{
public:
/** Create new transparency group action.
@param rGroupMtf
......@@ -83,21 +82,14 @@ namespace cppcanvas
Size of the transparency group object, in current
state coordinate system.
*/
static ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
GradientAutoPtr&& rAlphaGradient,
const Renderer::Parameters& rParms,
const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState );
private:
// static factory, disable big four
TransparencyGroupActionFactory();
~TransparencyGroupActionFactory();
TransparencyGroupActionFactory(const TransparencyGroupActionFactory&);
TransparencyGroupActionFactory& operator=( const TransparencyGroupActionFactory& );
};
}
}
}
......
cppcanvas/source/wrapper/implbitmap.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -57,9 +57,8 @@ namespace cppcanvas
::com::sun::star::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE;
private:
// default: disabled copy/assignment
ImplBitmap(const ImplBitmap&);
ImplBitmap& operator=( const ImplBitmap& );
ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap;
BitmapCanvasSharedPtr mpBitmapCanvas;
......
cppcanvas/source/wrapper/implbitmapcanvas.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -50,8 +50,7 @@ namespace cppcanvas
//ImplBitmapCanvas(const ImplBitmapCanvas&);
private:
// default: disabled assignment
ImplBitmapCanvas& operator=( const ImplBitmapCanvas& );
ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > mxBitmapCanvas;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > mxBitmap;
......
cppcanvas/source/wrapper/implcanvas.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -78,8 +78,7 @@ namespace cppcanvas
//ImplCanvas(const ImplCanvas&);
private:
// default: disabled assignment
ImplCanvas& operator=( const ImplCanvas& );
ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
mutable ::com::sun::star::rendering::ViewState maViewState;
boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
......
cppcanvas/source/wrapper/implcustomsprite.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -48,9 +48,8 @@ namespace cppcanvas
virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE;
private:
// default: disabled copy/assignment
ImplCustomSprite(const ImplCustomSprite&);
ImplCustomSprite& operator=( const ImplCustomSprite& );
ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION;
mutable CanvasSharedPtr mpLastCanvas;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > mxCustomSprite;
......
cppcanvas/source/wrapper/implpolypolygon.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -65,9 +65,8 @@ namespace cppcanvas
::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
private:
// default: disabled copy/assignment
ImplPolyPolygon(const ImplPolyPolygon&);
ImplPolyPolygon& operator= ( const ImplPolyPolygon& );
ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) SAL_DELETED_FUNCTION;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > mxPolyPoly;
......
cppcanvas/source/wrapper/implsprite.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -61,9 +61,8 @@ namespace cppcanvas
::com::sun::star::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE;
private:
// default: disabled copy/assignment
ImplSprite(const ImplSprite&);
ImplSprite& operator=( const ImplSprite& );
ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION;
ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION;
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > mxSprite;
......
cppcanvas/source/wrapper/implspritecanvas.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -80,8 +80,7 @@ namespace cppcanvas
typedef ::boost::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr;
private:
// default: disabled assignment
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& );
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > mxSpriteCanvas;
TransformationArbiterSharedPtr mpTransformArbiter;
......
include/cppcanvas/basegfxfactory.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -76,9 +76,8 @@ namespace cppcanvas
// singleton
BaseGfxFactory();
// default: disabled copy/assignment
BaseGfxFactory(const BaseGfxFactory&);
BaseGfxFactory& operator=( const BaseGfxFactory& );
BaseGfxFactory(const BaseGfxFactory&) SAL_DELETED_FUNCTION;
BaseGfxFactory& operator=( const BaseGfxFactory& ) SAL_DELETED_FUNCTION;
};
}
......
include/cppcanvas/vclfactory.hxx
Dosyayı görüntüle @ b13b01a2
......@@ -92,9 +92,8 @@ namespace cppcanvas
// singleton
VCLFactory();
// default: disabled copy/assignment
VCLFactory(const VCLFactory&);
VCLFactory& operator=( const VCLFactory& );
VCLFactory(const VCLFactory&) SAL_DELETED_FUNCTION;
VCLFactory& operator=( const VCLFactory& ) SAL_DELETED_FUNCTION;
};
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment