summaryrefslogtreecommitdiff
path: root/drawinglayer
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 /drawinglayer
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 'drawinglayer')
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx2
-rw-r--r--drawinglayer/source/primitive2d/textlayoutdevice.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclhelperbufferdevice.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx2
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.hxx2
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.hxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 2d7be59624f9..1092de8d796d 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -52,7 +52,7 @@ namespace drawinglayer
{
public:
XPrimitive2DRenderer();
- virtual ~XPrimitive2DRenderer();
+ virtual ~XPrimitive2DRenderer() override;
XPrimitive2DRenderer(const XPrimitive2DRenderer&) = delete;
const XPrimitive2DRenderer& operator=(const XPrimitive2DRenderer&) = delete;
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 4f6d40701c79..3c64903a64b6 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -65,7 +65,7 @@ namespace
public:
explicit ImpTimedRefDev(scoped_timed_RefDev& rOwnerofMe);
- virtual ~ImpTimedRefDev();
+ virtual ~ImpTimedRefDev() override;
virtual void Invoke() override;
VirtualDevice& acquireVirtualDevice();
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index bf735d7be1bd..aadf09f080ee 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -56,7 +56,7 @@ namespace
public:
VDevBuffer();
- virtual ~VDevBuffer();
+ virtual ~VDevBuffer() override;
VirtualDevice* alloc(OutputDevice& rOutDev, const Size& rSizePixel, bool bClear, bool bMonoChrome);
void free(VirtualDevice& rDevice);
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
index d216fcc3f3c9..360c0433518e 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
@@ -138,7 +138,7 @@ namespace drawinglayer
VclMetafileProcessor2D(
const geometry::ViewInformation2D& rViewInformation,
OutputDevice& rOutDev);
- virtual ~VclMetafileProcessor2D();
+ virtual ~VclMetafileProcessor2D() override;
};
} // end of namespace processor2d
} // end of namespace drawinglayer
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
index f7b6748bb3e2..0a8e97d748b8 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
@@ -71,7 +71,7 @@ namespace drawinglayer
VclPixelProcessor2D(
const geometry::ViewInformation2D& rViewInformation,
OutputDevice& rOutDev);
- virtual ~VclPixelProcessor2D();
+ virtual ~VclPixelProcessor2D() override;
};
} // end of namespace processor2d
} // end of namespace drawinglayer
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx b/drawinglayer/source/processor2d/vclprocessor2d.hxx
index 019043b0bc38..48de1b903d5d 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx
@@ -117,7 +117,7 @@ namespace drawinglayer
VclProcessor2D(
const geometry::ViewInformation2D& rViewInformation,
OutputDevice& rOutDev);
- virtual ~VclProcessor2D();
+ virtual ~VclProcessor2D() override;
// access to Drawinglayer configuration options
const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return maDrawinglayerOpt; }