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 /slideshow | |
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 'slideshow')
5 files changed, 11 insertions, 11 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx index a51596d5085f..41e4cf3ef278 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx @@ -413,7 +413,7 @@ public: */ SRotate(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1); - ~SRotate(){} + virtual ~SRotate(){} private: /** axis to rotate CCW about */ @@ -457,7 +457,7 @@ public: */ SScale(const basegfx::B3DVector& Scale, const basegfx::B3DVector& Origin,bool bInter, double T0, double T1); - ~SScale(){} + virtual ~SScale(){} private: basegfx::B3DVector scale; basegfx::B3DVector origin; @@ -489,7 +489,7 @@ public: */ STranslate(const basegfx::B3DVector& Vector,bool bInter, double T0, double T1); - ~STranslate(){} + virtual ~STranslate(){} private: /** vector to translate by */ @@ -522,7 +522,7 @@ public: */ SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1); - ~SEllipseTranslate(){} + virtual ~SEllipseTranslate(){} private: /** width and length of the ellipse */ @@ -545,7 +545,7 @@ public: virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const SAL_OVERRIDE; RotateAndScaleDepthByWidth(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1); - ~RotateAndScaleDepthByWidth(){} + virtual ~RotateAndScaleDepthByWidth(){} private: basegfx::B3DVector axis; basegfx::B3DVector origin; @@ -563,7 +563,7 @@ public: virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const SAL_OVERRIDE; RotateAndScaleDepthByHeight(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1); - ~RotateAndScaleDepthByHeight(){} + virtual ~RotateAndScaleDepthByHeight(){} private: basegfx::B3DVector axis; basegfx::B3DVector origin; diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 03bfb2ddbc1d..7804dfc3f440 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -85,7 +85,7 @@ namespace slideshow "TupleAnimation::TupleAnimation(): One of the method pointers is NULL" ); } - ~TupleAnimation() + virtual ~TupleAnimation() { end_(); } @@ -239,7 +239,7 @@ namespace slideshow maPathPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aPolyPoly.getB2DPolygon(0) ); } - ~PathAnimation() + virtual ~PathAnimation() { end_(); } diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index ef2ab23e5aba..1b60e8eab774 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -107,7 +107,7 @@ public: bool bIntrinsicAnimationsAllowed, bool bDisableAnimationZOrder ); - ~SlideImpl(); + virtual ~SlideImpl(); // Disposable interface diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 2365653379a2..b6c0762fb9c0 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -59,7 +59,7 @@ public: bool bDirectionForward, bool bModeIn ); - ~ClippingAnimation(); + virtual ~ClippingAnimation(); // Animation interface diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 7c0c078986ea..43d380bab35f 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -156,7 +156,7 @@ public: mbSuccess = true; } - ~PluginSlideChange() + virtual ~PluginSlideChange() { mxFactory.clear(); |