summaryrefslogtreecommitdiff
path: root/include/drawinglayer/processor2d
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 /include/drawinglayer/processor2d
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 'include/drawinglayer/processor2d')
-rw-r--r--include/drawinglayer/processor2d/contourextractor2d.hxx2
-rw-r--r--include/drawinglayer/processor2d/hittestprocessor2d.hxx2
-rw-r--r--include/drawinglayer/processor2d/linegeometryextractor2d.hxx2
-rw-r--r--include/drawinglayer/processor2d/objectinfoextractor2d.hxx2
-rw-r--r--include/drawinglayer/processor2d/textaspolygonextractor2d.hxx2
5 files changed, 5 insertions, 5 deletions
diff --git a/include/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx
index 8414167a5e43..6520c2c378fe 100644
--- a/include/drawinglayer/processor2d/contourextractor2d.hxx
+++ b/include/drawinglayer/processor2d/contourextractor2d.hxx
@@ -52,7 +52,7 @@ namespace drawinglayer
const geometry::ViewInformation2D& rViewInformation,
bool bExtractFillOnly);
- virtual ~ContourExtractor2D();
+ virtual ~ContourExtractor2D() override;
const basegfx::B2DPolyPolygonVector& getExtractedContour() const { return maExtractedContour; }
};
diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
index 56a87c53e3c5..237818694347 100644
--- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
@@ -68,7 +68,7 @@ namespace drawinglayer
const basegfx::B2DPoint& rLogicHitPosition,
double fLogicHitTolerance,
bool bHitTextOnly);
- virtual ~HitTestProcessor2D();
+ virtual ~HitTestProcessor2D() override;
/// data read access
const basegfx::B2DPoint& getDiscreteHitPosition() const { return maDiscreteHitPosition; }
diff --git a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx
index 8d527d52bd55..c2213ea4231b 100644
--- a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx
+++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx
@@ -49,7 +49,7 @@ namespace drawinglayer
public:
LineGeometryExtractor2D(const geometry::ViewInformation2D& rViewInformation);
- virtual ~LineGeometryExtractor2D();
+ virtual ~LineGeometryExtractor2D() override;
const basegfx::B2DPolygonVector& getExtractedHairlines() const { return maExtractedHairlines; }
const basegfx::B2DPolyPolygonVector& getExtractedLineFills() const { return maExtractedLineFills; }
diff --git a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
index 32d204fb8a1e..293fdd0ca3a6 100644
--- a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
+++ b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
@@ -44,7 +44,7 @@ namespace drawinglayer
public:
ObjectInfoPrimitiveExtractor2D(const geometry::ViewInformation2D& rViewInformation);
- virtual ~ObjectInfoPrimitiveExtractor2D();
+ virtual ~ObjectInfoPrimitiveExtractor2D() override;
const primitive2d::ObjectInfoPrimitive2D* getResult() const { return mpFound; }
};
diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
index b7900b29e882..cdd3e854b78e 100644
--- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
+++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
@@ -82,7 +82,7 @@ namespace drawinglayer
public:
explicit TextAsPolygonExtractor2D(const geometry::ViewInformation2D& rViewInformation);
- virtual ~TextAsPolygonExtractor2D();
+ virtual ~TextAsPolygonExtractor2D() override;
// data read access
const TextAsPolygonDataNodeVector& getTarget() const { return maTarget; }