summaryrefslogtreecommitdiff
path: root/cppcanvas/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /cppcanvas/source
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'cppcanvas/source')
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx2
-rw-r--r--cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx2
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx10
-rw-r--r--cppcanvas/source/wrapper/implbitmap.hxx2
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.hxx2
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx2
-rw-r--r--cppcanvas/source/wrapper/implcolor.hxx2
-rw-r--r--cppcanvas/source/wrapper/implcustomsprite.hxx2
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx2
-rw-r--r--cppcanvas/source/wrapper/implpolypolygon.hxx2
-rw-r--r--cppcanvas/source/wrapper/implsprite.hxx2
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.hxx2
12 files changed, 16 insertions, 16 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index f0fa80135b92..ba18b76c4cbd 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -168,7 +168,7 @@ static float GetSwapFloat( SvStream& rSt )
const GDIMetaFile& rMtf,
const Parameters& rParms );
- virtual ~ImplRenderer();
+ virtual ~ImplRenderer() override;
virtual bool draw() const override;
virtual bool drawSubset( sal_Int32 nStartIndex,
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 5fc7e0aeb0b3..86568ecb8be8 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -61,7 +61,7 @@ namespace cppcanvas
*/
CachedPrimitiveBase( const CanvasSharedPtr& rCanvas,
bool bOnlyRedrawWithSameTransform );
- virtual ~CachedPrimitiveBase() {}
+ virtual ~CachedPrimitiveBase() override {}
CachedPrimitiveBase(const CachedPrimitiveBase&) = delete;
const CachedPrimitiveBase& operator=(const CachedPrimitiveBase&) = delete;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index bc82c84c0609..3fda67848ee6 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -254,7 +254,7 @@ namespace cppcanvas
pPointTypes = nullptr;
}
- virtual ~EMFPPath ()
+ virtual ~EMFPPath () override
{
delete [] pPoints;
delete [] pPointTypes;
@@ -402,7 +402,7 @@ namespace cppcanvas
{
}
- virtual ~EMFPRegion ()
+ virtual ~EMFPRegion () override
{
if (combineMode) {
delete [] combineMode;
@@ -486,7 +486,7 @@ namespace cppcanvas
{
}
- virtual ~EMFPBrush ()
+ virtual ~EMFPBrush () override
{
if (blendPositions != nullptr) {
delete[] blendPositions;
@@ -780,7 +780,7 @@ namespace cppcanvas
{
}
- virtual ~EMFPCustomLineCap()
+ virtual ~EMFPCustomLineCap() override
{
}
@@ -922,7 +922,7 @@ namespace cppcanvas
{
}
- virtual ~EMFPPen()
+ virtual ~EMFPPen() override
{
delete[] dashPattern;
delete[] compoundArray;
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 24d8af50a3db..aabfd331a4dc 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -43,7 +43,7 @@ namespace cppcanvas
ImplBitmap( const CanvasSharedPtr& rParentCanvas,
const css::uno::Reference< css::rendering::XBitmap >& rBitmap );
- virtual ~ImplBitmap();
+ virtual ~ImplBitmap() override;
// CanvasGraphic implementation (that was not already implemented by CanvasGraphicHelper)
virtual bool draw() const override;
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 75931bd575f5..3b6a72d1d8e4 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -37,7 +37,7 @@ namespace cppcanvas
{
public:
explicit ImplBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& rCanvas );
- virtual ~ImplBitmapCanvas();
+ virtual ~ImplBitmapCanvas() override;
virtual ::basegfx::B2ISize getSize() const override;
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 0499280fbedd..d1162d605ea4 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -51,7 +51,7 @@ namespace cppcanvas
{
public:
explicit ImplCanvas( const css::uno::Reference< css::rendering::XCanvas >& rCanvas );
- virtual ~ImplCanvas();
+ virtual ~ImplCanvas() override;
virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override;
virtual ::basegfx::B2DHomMatrix getTransformation() const override;
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 7f6409b291ff..a53834c3228c 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -35,7 +35,7 @@ namespace cppcanvas
public:
explicit ImplColor( const css::uno::Reference<
css::rendering::XGraphicDevice >& rDevice );
- virtual ~ImplColor();
+ virtual ~ImplColor() override;
virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const override;
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index 785eb5cb3409..0c4a64e1922e 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -39,7 +39,7 @@ namespace cppcanvas
const css::uno::Reference<
css::rendering::XCustomSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
- virtual ~ImplCustomSprite();
+ virtual ~ImplCustomSprite() override;
virtual CanvasSharedPtr getContentCanvas() const override;
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index bb8793ca26ed..fb4ccca64077 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -44,7 +44,7 @@ namespace cppcanvas
const OUString& rFontName,
const double& rCellSize );
- virtual ~ImplFont();
+ virtual ~ImplFont() override;
private:
css::uno::Reference< css::rendering::XCanvas > mxCanvas;
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index cfaed772696b..431561a6b3d8 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -46,7 +46,7 @@ namespace cppcanvas
const css::uno::Reference<
css::rendering::XPolyPolygon2D >& rPolyPoly );
- virtual ~ImplPolyPolygon();
+ virtual ~ImplPolyPolygon() override;
virtual void setRGBAFillColor( Color::IntSRGBA ) override;
virtual void setRGBALineColor( Color::IntSRGBA ) override;
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index 05d05635ee49..82011e71f220 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -38,7 +38,7 @@ namespace cppcanvas
const css::uno::Reference<
css::rendering::XSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
- virtual ~ImplSprite();
+ virtual ~ImplSprite() override;
virtual void setAlpha( const double& rAlpha ) override;
virtual void movePixel( const ::basegfx::B2DPoint& rNewPos ) override;
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 89b0fc300a8e..49fcc9891265 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -37,7 +37,7 @@ namespace cppcanvas
css::rendering::XSpriteCanvas >& rCanvas );
ImplSpriteCanvas(const ImplSpriteCanvas&);
- virtual ~ImplSpriteCanvas();
+ virtual ~ImplSpriteCanvas() override;
virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override;