summaryrefslogtreecommitdiff
path: root/cppcanvas/source/mtfrenderer
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/mtfrenderer
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/mtfrenderer')
-rw-r--r--cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx2
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx10
2 files changed, 6 insertions, 6 deletions
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;