summaryrefslogtreecommitdiff
path: root/include/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 /include/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 'include/drawinglayer')
-rw-r--r--include/drawinglayer/animation/animationtiming.hxx8
-rw-r--r--include/drawinglayer/primitive2d/animatedprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/baseprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/svggradientprimitive2d.hxx6
-rw-r--r--include/drawinglayer/primitive3d/baseprimitive3d.hxx2
-rw-r--r--include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx2
-rw-r--r--include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx2
-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
-rw-r--r--include/drawinglayer/processor3d/defaultprocessor3d.hxx2
-rw-r--r--include/drawinglayer/processor3d/shadow3dextractor.hxx2
-rw-r--r--include/drawinglayer/processor3d/zbufferprocessor3d.hxx2
-rw-r--r--include/drawinglayer/texture/texture.hxx18
-rw-r--r--include/drawinglayer/texture/texture3d.hxx4
17 files changed, 31 insertions, 31 deletions
diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx
index 0fcd2867cddb..59c3960008dc 100644
--- a/include/drawinglayer/animation/animationtiming.hxx
+++ b/include/drawinglayer/animation/animationtiming.hxx
@@ -57,7 +57,7 @@ namespace drawinglayer
public:
AnimationEntryFixed(double fDuration, double fState = 0.0);
- virtual ~AnimationEntryFixed();
+ virtual ~AnimationEntryFixed() override;
virtual AnimationEntry* clone() const override;
virtual bool operator==(const AnimationEntry& rCandidate) const override;
@@ -77,7 +77,7 @@ namespace drawinglayer
public:
AnimationEntryLinear(double fDuration, double fFrequency = 250.0, double fStart = 0.0, double fStop = 1.0);
- virtual ~AnimationEntryLinear();
+ virtual ~AnimationEntryLinear() override;
virtual AnimationEntry* clone() const override;
virtual bool operator==(const AnimationEntry& rCandidate) const override;
@@ -98,7 +98,7 @@ namespace drawinglayer
public:
AnimationEntryList();
- virtual ~AnimationEntryList();
+ virtual ~AnimationEntryList() override;
virtual AnimationEntry* clone() const override;
virtual bool operator==(const AnimationEntry& rCandidate) const override;
@@ -116,7 +116,7 @@ namespace drawinglayer
public:
AnimationEntryLoop(sal_uInt32 nRepeat = 0xffffffff);
- virtual ~AnimationEntryLoop();
+ virtual ~AnimationEntryLoop() override;
virtual AnimationEntry* clone() const override;
virtual bool operator==(const AnimationEntry& rCandidate) const override;
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
index 6241671f0607..89782b62c864 100644
--- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
@@ -82,7 +82,7 @@ namespace drawinglayer
bool bIsTextAnimation);
/// destructor - needed due to mpAnimationEntry
- virtual ~AnimatedSwitchPrimitive2D();
+ virtual ~AnimatedSwitchPrimitive2D() override;
/// data read access
const animation::AnimationEntry& getAnimationEntry() const { return *mpAnimationEntry; }
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 945ebde3c9f1..195de7720423 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -165,7 +165,7 @@ namespace drawinglayer
public:
// constructor/destructor
BasePrimitive2D();
- virtual ~BasePrimitive2D();
+ virtual ~BasePrimitive2D() override;
/** the ==operator is mainly needed to allow testing newly-created primitives against their last
incarnation which buffers/holds the made decompositions. The default implementation
diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
index d44cb72b1dfb..9fa2cd4be8b8 100644
--- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
@@ -208,7 +208,7 @@ namespace drawinglayer
const basegfx::B2DPoint& rEnd,
bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod = SpreadMethod::Pad);
- virtual ~SvgLinearGradientPrimitive2D();
+ virtual ~SvgLinearGradientPrimitive2D() override;
/// data read access
const basegfx::B2DPoint& getEnd() const { return maEnd; }
@@ -277,7 +277,7 @@ namespace drawinglayer
bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod = SpreadMethod::Pad,
const basegfx::B2DPoint* pFocal = nullptr);
- virtual ~SvgRadialGradientPrimitive2D();
+ virtual ~SvgRadialGradientPrimitive2D() override;
/// data read access
double getRadius() const { return mfRadius; }
@@ -391,7 +391,7 @@ namespace drawinglayer
SvgRadialAtomPrimitive2D(
const basegfx::BColor& aColorA, double fScaleA,
const basegfx::BColor& aColorB, double fScaleB);
- virtual ~SvgRadialAtomPrimitive2D();
+ virtual ~SvgRadialAtomPrimitive2D() override;
/// data read access
const basegfx::BColor& getColorA() const { return maColorA; }
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 5326d58a3252..ef75d4e808e1 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -101,7 +101,7 @@ namespace drawinglayer
public:
// constructor/destructor
BasePrimitive3D();
- virtual ~BasePrimitive3D();
+ virtual ~BasePrimitive3D() override;
/** the ==operator is mainly needed to allow testing newly-created high level primitives against their last
incarnation which buffers/holds the decompositions. The default implementation
diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
index fc4e7bc9ede9..5e67ffe45d0e 100644
--- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
@@ -90,7 +90,7 @@ namespace drawinglayer
bool bCharacterMode,
bool bCloseFront,
bool bCloseBack);
- virtual ~SdrExtrudePrimitive3D();
+ virtual ~SdrExtrudePrimitive3D() override;
/// data read access
const basegfx::B2DPolyPolygon& getPolyPolygon() const { return maPolyPolygon; }
diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
index 3da2ac367e19..d4fabef127b4 100644
--- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
@@ -94,7 +94,7 @@ namespace drawinglayer
bool bCharacterMode,
bool bCloseFront,
bool bCloseBack);
- virtual ~SdrLathePrimitive3D();
+ virtual ~SdrLathePrimitive3D() override;
/// data read access
const basegfx::B2DPolyPolygon& getPolyPolygon() const { return maPolyPolygon; }
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; }
diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx
index 53725d89a236..cbe6a613292c 100644
--- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx
@@ -126,7 +126,7 @@ namespace drawinglayer
const geometry::ViewInformation3D& rViewInformation,
const attribute::SdrSceneAttribute& rSdrSceneAttribute,
const attribute::SdrLightingAttribute& rSdrLightingAttribute);
- virtual ~DefaultProcessor3D();
+ virtual ~DefaultProcessor3D() override;
/// data read access
const attribute::SdrSceneAttribute& getSdrSceneAttribute() const { return mrSdrSceneAttribute; }
diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx
index 019a75f85d78..0a6d65ad79c5 100644
--- a/include/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx
@@ -92,7 +92,7 @@ namespace drawinglayer
const basegfx::B3DVector& rLightNormal,
double fShadowSlant,
const basegfx::B3DRange& rContained3DRange);
- virtual ~Shadow3DExtractingProcessor();
+ virtual ~Shadow3DExtractingProcessor() override;
/// data read access
const primitive2d::Primitive2DContainer& getPrimitive2DSequence() const;
diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 0f58a7f1f0ab..9c1109eecaac 100644
--- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
@@ -94,7 +94,7 @@ namespace drawinglayer
basegfx::BZPixelRaster& rBZPixelRaster,
sal_uInt32 nStartLine,
sal_uInt32 nStopLine);
- virtual ~ZBufferProcessor3D();
+ virtual ~ZBufferProcessor3D() override;
void finish();
};
diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx
index 6c70343989be..95bd5daf5d8e 100644
--- a/include/drawinglayer/texture/texture.hxx
+++ b/include/drawinglayer/texture/texture.hxx
@@ -86,7 +86,7 @@ namespace drawinglayer
const basegfx::BColor& rEnd,
sal_uInt32 nSteps,
double fBorder);
- virtual ~GeoTexSvxGradient();
+ virtual ~GeoTexSvxGradient() override;
// compare operator
virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const override;
@@ -120,7 +120,7 @@ namespace drawinglayer
sal_uInt32 nSteps,
double fBorder,
double fAngle);
- virtual ~GeoTexSvxGradientLinear();
+ virtual ~GeoTexSvxGradientLinear() override;
virtual void appendTransformationsAndColors(
std::vector< B2DHomMatrixAndBColor >& rEntries,
@@ -150,7 +150,7 @@ namespace drawinglayer
sal_uInt32 nSteps,
double fBorder,
double fAngle);
- virtual ~GeoTexSvxGradientAxial();
+ virtual ~GeoTexSvxGradientAxial() override;
virtual void appendTransformationsAndColors(
std::vector< B2DHomMatrixAndBColor >& rEntries,
@@ -176,7 +176,7 @@ namespace drawinglayer
double fBorder,
double fOffsetX,
double fOffsetY);
- virtual ~GeoTexSvxGradientRadial();
+ virtual ~GeoTexSvxGradientRadial() override;
virtual void appendTransformationsAndColors(
std::vector< B2DHomMatrixAndBColor >& rEntries,
@@ -203,7 +203,7 @@ namespace drawinglayer
double fOffsetX,
double fOffsetY,
double fAngle);
- virtual ~GeoTexSvxGradientElliptical();
+ virtual ~GeoTexSvxGradientElliptical() override;
virtual void appendTransformationsAndColors(
std::vector< B2DHomMatrixAndBColor >& rEntries,
@@ -230,7 +230,7 @@ namespace drawinglayer
double fOffsetX,
double fOffsetY,
double fAngle);
- virtual ~GeoTexSvxGradientSquare();
+ virtual ~GeoTexSvxGradientSquare() override;
virtual void appendTransformationsAndColors(
std::vector< B2DHomMatrixAndBColor >& rEntries,
@@ -257,7 +257,7 @@ namespace drawinglayer
double fOffsetX,
double fOffsetY,
double fAngle);
- virtual ~GeoTexSvxGradientRect();
+ virtual ~GeoTexSvxGradientRect() override;
virtual void appendTransformationsAndColors(
std::vector< B2DHomMatrixAndBColor >& rEntries,
@@ -290,7 +290,7 @@ namespace drawinglayer
const basegfx::B2DRange& rOutputRange,
double fDistance,
double fAngle);
- virtual ~GeoTexSvxHatch();
+ virtual ~GeoTexSvxHatch() override;
// compare operator
virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const override;
@@ -331,7 +331,7 @@ namespace drawinglayer
const basegfx::B2DRange& rRange,
double fOffsetX = 0.0,
double fOffsetY = 0.0);
- virtual ~GeoTexSvxTiled();
+ virtual ~GeoTexSvxTiled() override;
// compare operator
virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const override;
diff --git a/include/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx
index 72145ac3a461..dd21e0664ff7 100644
--- a/include/drawinglayer/texture/texture3d.hxx
+++ b/include/drawinglayer/texture/texture3d.hxx
@@ -79,7 +79,7 @@ namespace drawinglayer
GeoTexSvxBitmapEx(
const BitmapEx& rBitmapEx,
const basegfx::B2DRange& rRange);
- virtual ~GeoTexSvxBitmapEx();
+ virtual ~GeoTexSvxBitmapEx() override;
virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override;
virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override;
@@ -136,7 +136,7 @@ namespace drawinglayer
public:
GeoTexSvxMultiHatch(const primitive3d::HatchTexturePrimitive3D& rPrimitive, double fLogicPixelSize);
- virtual ~GeoTexSvxMultiHatch();
+ virtual ~GeoTexSvxMultiHatch() override;
virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override;
virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override;
};