diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
| commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
| tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /canvas | |
| parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) | |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvas.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/bitmapbackbuffer.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvas.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/spritecanvas.hxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 21c343d70194..82f3e7d6c3ef 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -113,7 +113,7 @@ namespace cairocanvas void initialize(); /// For resource tracking - ~Canvas(); + virtual ~Canvas(); /// Dispose all internal references virtual void disposeThis() SAL_OVERRIDE; diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index d28af85054f7..cdad9311f4bf 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.hxx @@ -93,7 +93,7 @@ namespace cairocanvas const ::com::sun::star::rendering::RenderState& renderState ) const; protected: - ~TextLayout(); // we're a ref-counted UNO class. _We_ destroy ourselves. + virtual ~TextLayout(); // we're a ref-counted UNO class. _We_ destroy ourselves. private: ::com::sun::star::rendering::StringContext maText; diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index c6accde3e94d..34ce27b54af5 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -1208,7 +1208,7 @@ namespace oglcanvas #endif } - ~BufferContextImpl() + virtual ~BufferContextImpl() { #if 0 glBindTexture(GL_TEXTURE_2D, 0); diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx index d8aecf063710..c3f2a27a7ba7 100644 --- a/canvas/source/vcl/bitmapbackbuffer.hxx +++ b/canvas/source/vcl/bitmapbackbuffer.hxx @@ -45,7 +45,7 @@ namespace vclcanvas BitmapBackBuffer( const BitmapEx& rBitmap, const OutputDevice& rRefDevice ); - ~BitmapBackBuffer(); + virtual ~BitmapBackBuffer(); virtual OutputDevice& getOutDev() SAL_OVERRIDE; virtual const OutputDevice& getOutDev() const SAL_OVERRIDE; diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 91c7d7166c80..a2ac127f4d0d 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -87,7 +87,7 @@ namespace vclcanvas void initialize(); /// For resource tracking - ~Canvas(); + virtual ~Canvas(); /// Dispose all internal references virtual void disposeThis() SAL_OVERRIDE; diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index 3a4fffb0d98d..2343f38f2b52 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -112,7 +112,7 @@ namespace vclcanvas void initialize(); /// For resource tracking - ~SpriteCanvas(); + virtual ~SpriteCanvas(); /// Dispose all internal references virtual void disposeThis() SAL_OVERRIDE; |