From 362d4f0cd4e50111edfae9d30c90602c37ed65a2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Apr 2014 19:18:35 +0200 Subject: 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 --- .../engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'slideshow/source/engine/OGLTrans/generic') 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; -- cgit