summaryrefslogtreecommitdiff
path: root/canvas
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 /canvas
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 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvas.hxx2
-rw-r--r--canvas/source/cairo/cairo_textlayout.hxx2
-rw-r--r--canvas/source/factory/cf_service.cxx2
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx2
-rw-r--r--canvas/source/vcl/backbuffer.hxx2
-rw-r--r--canvas/source/vcl/bitmapbackbuffer.hxx2
-rw-r--r--canvas/source/vcl/canvas.hxx2
-rw-r--r--canvas/source/vcl/spritecanvas.hxx2
8 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index 920b37a2ebad..588b13e2d4cc 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -111,7 +111,7 @@ namespace cairocanvas
void initialize();
/// For resource tracking
- virtual ~Canvas();
+ virtual ~Canvas() override;
/// Dispose all internal references
virtual void disposeThis() override;
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index 1e4eafacf018..e39ce77457f0 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -94,7 +94,7 @@ namespace cairocanvas
const css::rendering::RenderState& renderState ) const;
protected:
- virtual ~TextLayout(); // we're a ref-counted UNO class. _We_ destroy ourselves.
+ virtual ~TextLayout() override; // we're a ref-counted UNO class. _We_ destroy ourselves.
private:
css::rendering::StringContext maText;
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index e617bbffd0ab..a174adaae6ee 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -85,7 +85,7 @@ class CanvasFactory
Reference<XComponentContext> const & xContext ) const;
public:
- virtual ~CanvasFactory();
+ virtual ~CanvasFactory() override;
explicit CanvasFactory( Reference<XComponentContext> const & xContext );
// XServiceInfo
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index f602777233ed..0ccf5b7df17f 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -551,7 +551,7 @@ namespace oglcanvas
mnDepthId, mnTextureId, false);
}
- virtual ~BufferContextImpl()
+ virtual ~BufferContextImpl() override
{
glDeleteTextures(1, &mnTextureId);
glDeleteRenderbuffers(1, &mnDepthId);
diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 7042798ed88f..926b25a8fe96 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.hxx
@@ -42,7 +42,7 @@ namespace vclcanvas
*/
BackBuffer( const OutputDevice& rRefDevice,
bool bMonochromeBuffer=false );
- virtual ~BackBuffer();
+ virtual ~BackBuffer() override;
virtual OutputDevice& getOutDev() override;
virtual const OutputDevice& getOutDev() const override;
diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx
index 84b6a38f3aa9..6f147b79756c 100644
--- a/canvas/source/vcl/bitmapbackbuffer.hxx
+++ b/canvas/source/vcl/bitmapbackbuffer.hxx
@@ -44,7 +44,7 @@ namespace vclcanvas
BitmapBackBuffer( const BitmapEx& rBitmap,
const OutputDevice& rRefDevice );
- virtual ~BitmapBackBuffer();
+ virtual ~BitmapBackBuffer() override;
virtual OutputDevice& getOutDev() override;
virtual const OutputDevice& getOutDev() const override;
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 638866b9ee1e..d4ae09097002 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -87,7 +87,7 @@ namespace vclcanvas
void initialize();
/// For resource tracking
- virtual ~Canvas();
+ virtual ~Canvas() override;
/// Dispose all internal references
virtual void disposeThis() override;
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index d74c330eea8c..f339eead496e 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -112,7 +112,7 @@ namespace vclcanvas
void initialize();
/// For resource tracking
- virtual ~SpriteCanvas();
+ virtual ~SpriteCanvas() override;
/// Dispose all internal references
virtual void disposeThis() override;