summaryrefslogtreecommitdiff
path: root/slideshow
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 /slideshow
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 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx12
-rw-r--r--slideshow/source/engine/animationfactory.cxx4
-rw-r--r--slideshow/source/engine/effectrewinder.cxx4
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.hxx2
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx2
-rw-r--r--slideshow/source/engine/shapes/drawshape.hxx2
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.hxx2
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx2
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx2
-rw-r--r--slideshow/source/engine/transitions/slidetransitionfactory.cxx2
-rw-r--r--slideshow/source/inc/animation.hxx2
-rw-r--r--slideshow/source/inc/soundplayer.hxx2
-rw-r--r--slideshow/source/inc/vieweventhandler.hxx2
13 files changed, 20 insertions, 20 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
index edc8a51fc199..12d0a4842278 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
@@ -104,7 +104,7 @@ public:
*/
SRotate(const glm::vec3& Axis, const glm::vec3& Origin, double Angle,
bool bInter, double T0, double T1);
- virtual ~SRotate(){}
+ virtual ~SRotate() override {}
private:
/** axis to rotate CCW about
*/
@@ -149,7 +149,7 @@ public:
*/
SScale(const glm::vec3& Scale, const glm::vec3& Origin,bool bInter, double T0, double T1);
- virtual ~SScale(){}
+ virtual ~SScale() override {}
private:
glm::vec3 scale;
glm::vec3 origin;
@@ -181,7 +181,7 @@ public:
*/
STranslate(const glm::vec3& Vector,bool bInter, double T0, double T1);
- virtual ~STranslate(){}
+ virtual ~STranslate() override {}
private:
/** vector to translate by
*/
@@ -214,7 +214,7 @@ public:
*/
SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1);
- virtual ~SEllipseTranslate(){}
+ virtual ~SEllipseTranslate() override {}
private:
/** width and length of the ellipse
*/
@@ -237,7 +237,7 @@ public:
virtual void interpolate(glm::mat4& matrix, double t, double SlideWidthScale, double SlideHeightScale) const override;
RotateAndScaleDepthByWidth(const glm::vec3& Axis,const glm::vec3& Origin,double Angle, bool bScale, bool bInter, double T0, double T1);
- virtual ~RotateAndScaleDepthByWidth(){}
+ virtual ~RotateAndScaleDepthByWidth() override {}
private:
glm::vec3 axis;
glm::vec3 origin;
@@ -256,7 +256,7 @@ public:
virtual void interpolate(glm::mat4& matrix, double t, double SlideWidthScale, double SlideHeightScale) const override;
RotateAndScaleDepthByHeight(const glm::vec3& Axis,const glm::vec3& Origin,double Angle, bool bScale, bool bInter, double T0, double T1);
- virtual ~RotateAndScaleDepthByHeight(){}
+ virtual ~RotateAndScaleDepthByHeight() override {}
private:
glm::vec3 axis;
glm::vec3 origin;
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 5f035957e98c..17714ffe0783 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -82,7 +82,7 @@ namespace slideshow
"TupleAnimation::TupleAnimation(): One of the method pointers is NULL" );
}
- virtual ~TupleAnimation()
+ virtual ~TupleAnimation() override
{
end_();
}
@@ -236,7 +236,7 @@ namespace slideshow
maPathPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aPolyPoly.getB2DPolygon(0) );
}
- virtual ~PathAnimation()
+ virtual ~PathAnimation() override
{
end_();
}
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index dca1a1ee524e..19106567127b 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -43,7 +43,7 @@ class RewinderEventHandler : public EventHandler
public:
typedef ::std::function<bool ()> Action;
explicit RewinderEventHandler (const Action& rAction) : maAction(rAction) {}
- virtual ~RewinderEventHandler() {}
+ virtual ~RewinderEventHandler() override {}
private:
const Action maAction;
virtual bool handleEvent() override { return maAction(); }
@@ -55,7 +55,7 @@ class RewinderAnimationEventHandler : public AnimationEventHandler
public:
typedef ::std::function<bool (const AnimationNodeSharedPtr& rpNode)> Action;
explicit RewinderAnimationEventHandler (const Action& rAction) : maAction(rAction) {}
- virtual ~RewinderAnimationEventHandler() {}
+ virtual ~RewinderAnimationEventHandler() override {}
private:
const Action maAction;
virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode) override
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx
index 802e53953bd3..d6b690fdc0d7 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -52,7 +52,7 @@ public:
static std::shared_ptr<RehearseTimingsActivity> create(
const SlideShowContext& rContext );
- virtual ~RehearseTimingsActivity();
+ virtual ~RehearseTimingsActivity() override;
RehearseTimingsActivity(const RehearseTimingsActivity&) = delete;
RehearseTimingsActivity& operator=(const RehearseTimingsActivity&) = delete;
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 3fa51f59062f..41e30972212b 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -131,7 +131,7 @@ double ScrollTextAnimNode::GetStateAtRelativeTime(
class ActivityImpl : public Activity
{
public:
- virtual ~ActivityImpl();
+ virtual ~ActivityImpl() override;
ActivityImpl(
SlideShowContext const& rContext,
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index 328d0c3bd3a4..5db8b111101b 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -114,7 +114,7 @@ namespace slideshow
virtual css::uno::Reference< css::drawing::XShape > getXShape() const override;
- virtual ~DrawShape();
+ virtual ~DrawShape() override;
// View layer methods
diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx
index f378f721e1cf..e7dcdf305125 100644
--- a/slideshow/source/engine/shapes/externalshapebase.hxx
+++ b/slideshow/source/engine/shapes/externalshapebase.hxx
@@ -59,7 +59,7 @@ namespace slideshow
ExternalShapeBase( const css::uno::Reference< css::drawing::XShape >& xShape,
double nPrio,
const SlideShowContext& rContext ); // throw ShapeLoadFailedException;
- virtual ~ExternalShapeBase();
+ virtual ~ExternalShapeBase() override;
virtual css::uno::Reference< css::drawing::XShape > getXShape() const override;
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 8e7397d0296c..2d7dafcd6040 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -101,7 +101,7 @@ public:
bool bIntrinsicAnimationsAllowed,
bool bDisableAnimationZOrder );
- virtual ~SlideImpl();
+ virtual ~SlideImpl() override;
// Slide interface
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 8837ec8e7862..ceb420696280 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -59,7 +59,7 @@ public:
bool bDirectionForward,
bool bModeIn );
- virtual ~ClippingAnimation();
+ virtual ~ClippingAnimation() override;
// Animation interface
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index a50cfea14b24..2e35f7c8e0ef 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -151,7 +151,7 @@ public:
mbSuccess = true;
}
- virtual ~PluginSlideChange()
+ virtual ~PluginSlideChange() override
{
mxFactory.clear();
diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx
index 9108b72101d6..9a722df6d146 100644
--- a/slideshow/source/inc/animation.hxx
+++ b/slideshow/source/inc/animation.hxx
@@ -47,7 +47,7 @@ namespace slideshow
class Animation : public virtual SharedPtrAble
{
public:
- virtual ~Animation() {}
+ virtual ~Animation() override {}
/** Notify that the animation going active soon.
diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx
index 737103512dec..82af088af462 100644
--- a/slideshow/source/inc/soundplayer.hxx
+++ b/slideshow/source/inc/soundplayer.hxx
@@ -66,7 +66,7 @@ namespace slideshow
const OUString& rSoundURL,
const css::uno::Reference< css::uno::XComponentContext>& rComponentContext );
- virtual ~SoundPlayer();
+ virtual ~SoundPlayer() override;
/** Query duration of sound playback.
diff --git a/slideshow/source/inc/vieweventhandler.hxx b/slideshow/source/inc/vieweventhandler.hxx
index 1c658bb90ace..1291c0fd2b48 100644
--- a/slideshow/source/inc/vieweventhandler.hxx
+++ b/slideshow/source/inc/vieweventhandler.hxx
@@ -42,7 +42,7 @@ namespace slideshow
class ViewEventHandler : public virtual SharedPtrAble
{
public:
- virtual ~ViewEventHandler() {}
+ virtual ~ViewEventHandler() override {}
/** Notify new view.