summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /slideshow
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/activities/activitiesfactory.cxx10
-rw-r--r--slideshow/source/engine/activities/activitybase.hxx14
-rw-r--r--slideshow/source/engine/activities/continuousactivitybase.hxx2
-rw-r--r--slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx2
-rw-r--r--slideshow/source/engine/activities/discreteactivitybase.hxx6
-rw-r--r--slideshow/source/engine/activities/simplecontinuousactivitybase.hxx6
-rw-r--r--slideshow/source/engine/animationfactory.cxx20
-rw-r--r--slideshow/source/engine/animationnodes/animationaudionode.hxx10
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.hxx12
-rw-r--r--slideshow/source/engine/animationnodes/animationcolornode.cxx10
-rw-r--r--slideshow/source/engine/animationnodes/animationcolornode.hxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationcommandnode.hxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationpathmotionnode.hxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationsetnode.hxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.hxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx4
-rw-r--r--slideshow/source/engine/animationnodes/basecontainernode.hxx12
-rw-r--r--slideshow/source/engine/animationnodes/basenode.hxx20
-rw-r--r--slideshow/source/engine/animationnodes/paralleltimecontainer.hxx4
-rw-r--r--slideshow/source/engine/animationnodes/propertyanimationnode.hxx2
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx6
-rw-r--r--slideshow/source/engine/animationnodes/setactivity.hxx14
-rw-r--r--slideshow/source/engine/effectrewinder.cxx4
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx16
-rw-r--r--slideshow/source/engine/expressionnodefactory.cxx22
-rw-r--r--slideshow/source/engine/pointersymbol.hxx8
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx20
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.hxx20
-rw-r--r--slideshow/source/engine/screenupdater.cxx2
-rw-r--r--slideshow/source/engine/shapes/appletshape.cxx22
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx26
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx16
-rw-r--r--slideshow/source/engine/shapes/drawshape.hxx62
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.cxx12
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.hxx30
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx2
-rw-r--r--slideshow/source/engine/shapes/intrinsicanimationactivity.cxx16
-rw-r--r--slideshow/source/engine/shapes/mediashape.cxx22
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx26
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx22
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.hxx48
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx38
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.cxx34
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx48
-rw-r--r--slideshow/source/engine/slideview.cxx70
-rw-r--r--slideshow/source/engine/smilfunctionparser.cxx4
-rw-r--r--slideshow/source/engine/transitions/barndoorwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/barwipepolypolygon.hxx2
-rw-r--r--slideshow/source/engine/transitions/boxwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/checkerboardwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/clockwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/combtransition.hxx2
-rw-r--r--slideshow/source/engine/transitions/doublediamondwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/ellipsewipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/fanwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/figurewipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/fourboxwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/iriswipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/pinwheelwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/randomwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx10
-rw-r--r--slideshow/source/engine/transitions/slidechangebase.hxx18
-rw-r--r--slideshow/source/engine/transitions/slidetransitionfactory.cxx32
-rw-r--r--slideshow/source/engine/transitions/snakewipe.hxx4
-rw-r--r--slideshow/source/engine/transitions/spiralwipe.hxx4
-rw-r--r--slideshow/source/engine/transitions/sweepwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/veewipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/waterfallwipe.hxx2
-rw-r--r--slideshow/source/engine/transitions/zigzagwipe.hxx4
-rw-r--r--slideshow/source/engine/usereventqueue.cxx32
-rw-r--r--slideshow/source/engine/waitsymbol.hxx8
-rw-r--r--slideshow/source/inc/delayevent.hxx8
-rw-r--r--slideshow/source/inc/interruptabledelayevent.hxx8
-rw-r--r--slideshow/source/inc/soundplayer.hxx4
-rw-r--r--slideshow/source/inc/wakeupevent.hxx8
75 files changed, 468 insertions, 468 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index db0b2a9e1638..3a4cf8cf03ca 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -887,7 +887,7 @@ public:
ENSURE_OR_THROW( mpAnim, "Invalid animation object" );
}
- virtual void startAnimation()
+ virtual void startAnimation() SAL_OVERRIDE
{
if (this->isDisposed() || !mpAnim)
return;
@@ -898,7 +898,7 @@ public:
getShapeAttributeLayer() );
}
- virtual void endAnimation()
+ virtual void endAnimation() SAL_OVERRIDE
{
// end animation
if (mpAnim)
@@ -908,7 +908,7 @@ public:
using SimpleContinuousActivityBase::perform;
/// perform override for ContinuousActivityBase
- virtual void perform( double nModifiedTime, sal_uInt32 ) const
+ virtual void perform( double nModifiedTime, sal_uInt32 ) const SAL_OVERRIDE
{
if (this->isDisposed() || !mpAnim)
return;
@@ -916,7 +916,7 @@ public:
(*mpAnim)( 1.0 - Direction + nModifiedTime*(2.0*Direction - 1.0) );
}
- virtual void performEnd()
+ virtual void performEnd() SAL_OVERRIDE
{
// xxx todo: review
if (mpAnim)
@@ -924,7 +924,7 @@ public:
}
/// Disposable:
- virtual void dispose()
+ virtual void dispose() SAL_OVERRIDE
{
mpAnim.reset();
ContinuousActivityBase::dispose();
diff --git a/slideshow/source/engine/activities/activitybase.hxx b/slideshow/source/engine/activities/activitybase.hxx
index e037792d6191..180c9c3af1b7 100644
--- a/slideshow/source/engine/activities/activitybase.hxx
+++ b/slideshow/source/engine/activities/activitybase.hxx
@@ -40,7 +40,7 @@ public:
ActivityBase( const ActivityParameters& rParms );
/// From Disposable interface
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
protected:
/** From Activity interface
@@ -48,17 +48,17 @@ protected:
Derived classes should override, call this first
and then perform their work.
*/
- virtual bool perform();
- virtual double calcTimeLag() const;
- virtual bool isActive() const;
+ virtual bool perform() SAL_OVERRIDE;
+ virtual double calcTimeLag() const SAL_OVERRIDE;
+ virtual bool isActive() const SAL_OVERRIDE;
private:
- virtual void dequeued();
+ virtual void dequeued() SAL_OVERRIDE;
// From AnimationActivity interface
virtual void setTargets(
const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer );
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE;
private:
/** Hook for derived classes
@@ -117,7 +117,7 @@ protected:
private:
/// Activity:
- virtual void end();
+ virtual void end() SAL_OVERRIDE;
virtual void performEnd() = 0;
private:
diff --git a/slideshow/source/engine/activities/continuousactivitybase.hxx b/slideshow/source/engine/activities/continuousactivitybase.hxx
index 71dd5a2a96f4..7104b9c46158 100644
--- a/slideshow/source/engine/activities/continuousactivitybase.hxx
+++ b/slideshow/source/engine/activities/continuousactivitybase.hxx
@@ -57,7 +57,7 @@ namespace slideshow
/// From SimpleContinuousActivityBase class
virtual void simplePerform( double nSimpleTime,
- sal_uInt32 nRepeatCount ) const;
+ sal_uInt32 nRepeatCount ) const SAL_OVERRIDE;
};
}
}
diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
index 2d0f0127cda3..e2dcf5639cf4 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
@@ -64,7 +64,7 @@ namespace slideshow
/// From SimpleContinuousActivityBase class
virtual void simplePerform( double nSimpleTime,
- sal_uInt32 nRepeatCount ) const;
+ sal_uInt32 nRepeatCount ) const SAL_OVERRIDE;
private:
const ::basegfx::tools::KeyStopLerp maLerper;
diff --git a/slideshow/source/engine/activities/discreteactivitybase.hxx b/slideshow/source/engine/activities/discreteactivitybase.hxx
index 8a8cfa25c82b..8bac171ee9a9 100644
--- a/slideshow/source/engine/activities/discreteactivitybase.hxx
+++ b/slideshow/source/engine/activities/discreteactivitybase.hxx
@@ -53,11 +53,11 @@ namespace slideshow
Number of full repeats already performed
*/
virtual void perform( sal_uInt32 nFrame, sal_uInt32 nRepeatCount ) const = 0;
- virtual void dispose();
- virtual bool perform();
+ virtual void dispose() SAL_OVERRIDE;
+ virtual bool perform() SAL_OVERRIDE;
protected:
- virtual void startAnimation();
+ virtual void startAnimation() SAL_OVERRIDE;
sal_uInt32 calcFrameIndex( sal_uInt32 nCurrCalls,
::std::size_t nVectorSize ) const;
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
index 3e8760d39a56..da26c9ec3b93 100644
--- a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
+++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
@@ -39,8 +39,8 @@ namespace slideshow
public:
SimpleContinuousActivityBase( const ActivityParameters& rParms );
- virtual double calcTimeLag() const;
- virtual bool perform();
+ virtual double calcTimeLag() const SAL_OVERRIDE;
+ virtual bool perform() SAL_OVERRIDE;
protected:
/** Hook for derived classes
@@ -58,7 +58,7 @@ namespace slideshow
*/
virtual void simplePerform( double nSimpleTime, sal_uInt32 nRepeatCount ) const = 0;
- virtual void startAnimation();
+ virtual void startAnimation() SAL_OVERRIDE;
private:
/// Time elapsed since activity started
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 4b0eb2130649..03bfb2ddbc1d 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -93,11 +93,11 @@ namespace slideshow
// Animation interface
virtual void prefetch( const AnimatableShapeSharedPtr&,
- const ShapeAttributeLayerSharedPtr& )
+ const ShapeAttributeLayerSharedPtr& ) SAL_OVERRIDE
{}
virtual void start( const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer )
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE
{
OSL_ENSURE( !mpShape,
"TupleAnimation::start(): Shape already set" );
@@ -121,7 +121,7 @@ namespace slideshow
}
}
- virtual void end() { end_(); }
+ virtual void end() SAL_OVERRIDE { end_(); }
void end_()
{
if( mbAnimationStarted )
@@ -139,7 +139,7 @@ namespace slideshow
// PairAnimation interface
- virtual bool operator()( const ::basegfx::B2DTuple& rValue )
+ virtual bool operator()( const ::basegfx::B2DTuple& rValue ) SAL_OVERRIDE
{
ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape,
"TupleAnimation::operator(): Invalid ShapeAttributeLayer" );
@@ -160,7 +160,7 @@ namespace slideshow
return true;
}
- virtual ::basegfx::B2DTuple getUnderlyingValue() const
+ virtual ::basegfx::B2DTuple getUnderlyingValue() const SAL_OVERRIDE
{
ENSURE_OR_THROW( mpAttrLayer,
"TupleAnimation::getUnderlyingValue(): Invalid ShapeAttributeLayer" );
@@ -247,11 +247,11 @@ namespace slideshow
// Animation interface
virtual void prefetch( const AnimatableShapeSharedPtr&,
- const ShapeAttributeLayerSharedPtr& )
+ const ShapeAttributeLayerSharedPtr& ) SAL_OVERRIDE
{}
virtual void start( const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer )
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE
{
OSL_ENSURE( !mpShape,
"PathAnimation::start(): Shape already set" );
@@ -284,7 +284,7 @@ namespace slideshow
}
}
- virtual void end() { end_(); }
+ virtual void end() SAL_OVERRIDE { end_(); }
void end_()
{
if( mbAnimationStarted )
@@ -302,7 +302,7 @@ namespace slideshow
// NumberAnimation interface
- virtual bool operator()( double nValue )
+ virtual bool operator()( double nValue ) SAL_OVERRIDE
{
ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape,
"PathAnimation::operator(): Invalid ShapeAttributeLayer" );
@@ -331,7 +331,7 @@ namespace slideshow
return true;
}
- virtual double getUnderlyingValue() const
+ virtual double getUnderlyingValue() const SAL_OVERRIDE
{
ENSURE_OR_THROW( mpAttrLayer,
"PathAnimation::getUnderlyingValue(): Invalid ShapeAttributeLayer" );
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx
index a437b4e06d71..e72e87554458 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.hxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx
@@ -43,15 +43,15 @@ public:
NodeContext const& rContext );
protected:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
- virtual void activate_st();
- virtual void deactivate_st( NodeState eDestState );
- virtual bool hasPendingAnimation() const;
+ virtual void activate_st() SAL_OVERRIDE;
+ virtual void deactivate_st( NodeState eDestState ) SAL_OVERRIDE;
+ virtual bool hasPendingAnimation() const SAL_OVERRIDE;
/// overridden, because we need to deal with STOPAUDIO commands
- virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode );
+ virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE;
private:
::com::sun::star::uno::Reference<
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index a74d6df05885..b275a5471abd 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -49,7 +49,7 @@ public:
#endif
protected:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
::com::sun::star::uno::Reference<
::com::sun::star::animations::XAnimate> const& getXAnimateNode() const
@@ -61,13 +61,13 @@ protected:
AttributableShapeSharedPtr getShape() const;
private:
- virtual bool hasPendingAnimation() const;
+ virtual bool hasPendingAnimation() const SAL_OVERRIDE;
private: // state transition callbacks
- virtual bool init_st();
- virtual bool resolve_st();
- virtual void activate_st();
- virtual void deactivate_st( NodeState eDestState );
+ virtual bool init_st() SAL_OVERRIDE;
+ virtual bool resolve_st() SAL_OVERRIDE;
+ virtual void activate_st() SAL_OVERRIDE;
+ virtual void deactivate_st( NodeState eDestState ) SAL_OVERRIDE;
virtual AnimationActivitySharedPtr createActivity() const = 0;
private:
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx
index baa1003f8f7f..c1b47d86ec24 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx
@@ -53,26 +53,26 @@ public:
}
virtual void prefetch( const AnimatableShapeSharedPtr&,
- const ShapeAttributeLayerSharedPtr& )
+ const ShapeAttributeLayerSharedPtr& ) SAL_OVERRIDE
{}
virtual void start( const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer )
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE
{
mpAnimation->start( rShape, rAttrLayer );
}
- virtual void end()
+ virtual void end() SAL_OVERRIDE
{
mpAnimation->end();
}
- virtual bool operator()( const HSLColor& rColor )
+ virtual bool operator()( const HSLColor& rColor ) SAL_OVERRIDE
{
return (*mpAnimation)( RGBColor( rColor ) );
}
- virtual HSLColor getUnderlyingValue() const
+ virtual HSLColor getUnderlyingValue() const SAL_OVERRIDE
{
return HSLColor( mpAnimation->getUnderlyingValue() );
}
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx
index 6dac2ae9fdea..e3465f5431a9 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx
@@ -42,7 +42,7 @@ public:
#endif
private:
- virtual AnimationActivitySharedPtr createActivity() const;
+ virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
::com::sun::star::uno::Reference<
::com::sun::star::animations::XAnimateColor > mxColorNode;
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index 92eb86a7d492..3ce5f23f5374 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -42,11 +42,11 @@ public:
NodeContext const& rContext );
protected:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
- virtual void activate_st();
- virtual bool hasPendingAnimation() const;
+ virtual void activate_st() SAL_OVERRIDE;
+ virtual bool hasPendingAnimation() const SAL_OVERRIDE;
private:
ExternalMediaShapeSharedPtr mpShape;
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
index c2be5ba7e06d..83dd9608cc24 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
@@ -42,10 +42,10 @@ public:
#endif
protected:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
- virtual AnimationActivitySharedPtr createActivity() const;
+ virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
::com::sun::star::uno::Reference<
::com::sun::star::animations::XAnimateMotion > mxPathMotionNode;
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx b/slideshow/source/engine/animationnodes/animationsetnode.hxx
index d26bb8bec3f7..3ab15aab8016 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx
@@ -39,7 +39,7 @@ public:
#endif
private:
- virtual AnimationActivitySharedPtr createActivity() const;
+ virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
void implScheduleDeactivationEvent();
};
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
index c13512f0f95c..9cc0ff281cb3 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
@@ -43,10 +43,10 @@ public:
#endif
protected:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
- virtual AnimationActivitySharedPtr createActivity() const;
+ virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
::com::sun::star::uno::Reference<
::com::sun::star::animations::XAnimateTransform > mxTransformNode;
diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
index 3fcaa0d1319e..4e1ab2e4c5c7 100644
--- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
@@ -44,10 +44,10 @@ public:
#endif
protected:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
- virtual AnimationActivitySharedPtr createActivity() const;
+ virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
::com::sun::star::uno::Reference<
::com::sun::star::animations::XTransitionFilter> mxTransitionFilterNode;
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx
index 4a9c6cd9057d..7ed491b274dc 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.hxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx
@@ -47,17 +47,17 @@ public:
protected:
// overrides from BaseNode
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
- virtual bool init_st();
+ virtual bool init_st() SAL_OVERRIDE;
virtual bool init_children();
- virtual void deactivate_st( NodeState eDestState );
- virtual bool hasPendingAnimation() const;
+ virtual void deactivate_st( NodeState eDestState ) SAL_OVERRIDE;
+ virtual bool hasPendingAnimation() const SAL_OVERRIDE;
// force to be implemented by derived class:
- virtual void activate_st() = 0;
+ virtual void activate_st() SAL_OVERRIDE = 0;
virtual void notifyDeactivating(
- AnimationNodeSharedPtr const& rNotifier ) = 0;
+ AnimationNodeSharedPtr const& rNotifier ) SAL_OVERRIDE = 0;
protected:
bool isDurationIndefinite() const { return mbDurationIndefinite; }
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index a031cacba344..4b0351f288c2 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -109,21 +109,21 @@ public:
{ return mpParent; }
// Disposable:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
// AnimationNode:
- virtual bool init();
- virtual bool resolve();
- virtual bool activate();
- virtual void deactivate();
- virtual void end();
+ virtual bool init() SAL_OVERRIDE;
+ virtual bool resolve() SAL_OVERRIDE;
+ virtual bool activate() SAL_OVERRIDE;
+ virtual void deactivate() SAL_OVERRIDE;
+ virtual void end() SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::animations::XAnimationNode> getXAnimationNode() const;
- virtual NodeState getState() const;
+ ::com::sun::star::animations::XAnimationNode> getXAnimationNode() const SAL_OVERRIDE;
+ virtual NodeState getState() const SAL_OVERRIDE;
virtual bool registerDeactivatingListener(
- const AnimationNodeSharedPtr& rNotifee );
+ const AnimationNodeSharedPtr& rNotifee ) SAL_OVERRIDE;
// nop:
- virtual void notifyDeactivating( const AnimationNodeSharedPtr& rNotifier );
+ virtual void notifyDeactivating( const AnimationNodeSharedPtr& rNotifier ) SAL_OVERRIDE;
bool isMainSequenceRootNode() const { return mbIsMainSequenceRootNode; }
diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
index ad1d04b28f60..790a30bf283f 100644
--- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
@@ -44,8 +44,8 @@ public:
#endif
private:
- virtual void activate_st();
- virtual void notifyDeactivating( AnimationNodeSharedPtr const& pChildNode );
+ virtual void activate_st() SAL_OVERRIDE;
+ virtual void notifyDeactivating( AnimationNodeSharedPtr const& pChildNode ) SAL_OVERRIDE;
};
} // namespace internal
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
index 494185e41471..547ca40a78a3 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
@@ -40,7 +40,7 @@ public:
#endif
private:
- virtual AnimationActivitySharedPtr createActivity() const;
+ virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
};
} // namespace internal
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index d464fdf67b41..a99374538cc6 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -44,11 +44,11 @@ public:
#endif
protected:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
- virtual void activate_st();
- virtual void notifyDeactivating( AnimationNodeSharedPtr const& rNotifier );
+ virtual void activate_st() SAL_OVERRIDE;
+ virtual void notifyDeactivating( AnimationNodeSharedPtr const& rNotifier ) SAL_OVERRIDE;
void skipEffect( AnimationNodeSharedPtr const& pChildNode );
void rewindEffect( AnimationNodeSharedPtr const& pChildNode );
diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx
index 174f58e255f9..a24f865bd2d3 100644
--- a/slideshow/source/engine/animationnodes/setactivity.hxx
+++ b/slideshow/source/engine/animationnodes/setactivity.hxx
@@ -62,7 +62,7 @@ public:
ENSURE_OR_THROW( mpAnimation, "Invalid animation" );
}
- virtual void dispose()
+ virtual void dispose() SAL_OVERRIDE
{
mbIsActive = false;
mpAnimation.reset();
@@ -74,12 +74,12 @@ public:
mpEndEvent.reset();
}
- virtual double calcTimeLag() const
+ virtual double calcTimeLag() const SAL_OVERRIDE
{
return 0.0;
}
- virtual bool perform()
+ virtual bool perform() SAL_OVERRIDE
{
if (! isActive())
return false;
@@ -98,22 +98,22 @@ public:
return false; // don't reinsert
}
- virtual bool isActive() const
+ virtual bool isActive() const SAL_OVERRIDE
{
return mbIsActive;
}
- virtual void dequeued()
+ virtual void dequeued() SAL_OVERRIDE
{
}
- virtual void end()
+ virtual void end() SAL_OVERRIDE
{
perform();
}
virtual void setTargets( const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer )
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE
{
ENSURE_OR_THROW( rShape, "Invalid shape" );
ENSURE_OR_THROW( rAttrLayer, "Invalid attribute layer" );
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index b253027c022e..b5a29fa63217 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -49,7 +49,7 @@ public:
virtual ~RewinderEventHandler (void) {}
private:
const Action maAction;
- virtual bool handleEvent (void) { return maAction(); }
+ virtual bool handleEvent (void) SAL_OVERRIDE { return maAction(); }
};
@@ -62,7 +62,7 @@ public:
virtual ~RewinderAnimationEventHandler (void) {}
private:
const Action maAction;
- virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode)
+ virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode) SAL_OVERRIDE
{ return maAction(rpNode); }
};
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 5efb2bdf08ba..3049a5a59c22 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -135,27 +135,27 @@ public:
}
// WeakComponentImplHelperBase::disposing
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
private:
virtual void SAL_CALL disposing( const lang::EventObject& Source )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMouseListener implementation
virtual void SAL_CALL mousePressed( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL mouseReleased( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL mouseEntered( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL mouseExited( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMouseMotionListener implementation
virtual void SAL_CALL mouseDragged( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL mouseMoved( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
EventQueue* mpEventQueue;
diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx
index 536a7fa8d5e8..9b6bffe42e88 100644
--- a/slideshow/source/engine/expressionnodefactory.cxx
+++ b/slideshow/source/engine/expressionnodefactory.cxx
@@ -47,12 +47,12 @@ namespace slideshow
{
}
- virtual double operator()( double /*t*/ ) const
+ virtual double operator()( double /*t*/ ) const SAL_OVERRIDE
{
return maValue;
}
- virtual bool isConstant() const
+ virtual bool isConstant() const SAL_OVERRIDE
{
return true;
}
@@ -68,12 +68,12 @@ namespace slideshow
{
}
- virtual double operator()( double t ) const
+ virtual double operator()( double t ) const SAL_OVERRIDE
{
return t;
}
- virtual bool isConstant() const
+ virtual bool isConstant() const SAL_OVERRIDE
{
return false;
}
@@ -95,7 +95,7 @@ namespace slideshow
{
}
- virtual bool isConstant() const
+ virtual bool isConstant() const SAL_OVERRIDE
{
return
mpFirstArg->isConstant() &&
@@ -116,7 +116,7 @@ namespace slideshow
{
}
- virtual double operator()( double t ) const
+ virtual double operator()( double t ) const SAL_OVERRIDE
{
return (*mpFirstArg)(t) + (*mpSecondArg)(t);
}
@@ -131,7 +131,7 @@ namespace slideshow
{
}
- virtual double operator()( double t ) const
+ virtual double operator()( double t ) const SAL_OVERRIDE
{
return (*mpFirstArg)(t) - (*mpSecondArg)(t);
}
@@ -146,7 +146,7 @@ namespace slideshow
{
}
- virtual double operator()( double t ) const
+ virtual double operator()( double t ) const SAL_OVERRIDE
{
return (*mpFirstArg)(t) * (*mpSecondArg)(t);
}
@@ -161,7 +161,7 @@ namespace slideshow
{
}
- virtual double operator()( double t ) const
+ virtual double operator()( double t ) const SAL_OVERRIDE
{
return (*mpFirstArg)(t) / (*mpSecondArg)(t);
}
@@ -176,7 +176,7 @@ namespace slideshow
{
}
- virtual double operator()( double t ) const
+ virtual double operator()( double t ) const SAL_OVERRIDE
{
return ::std::min( (*mpFirstArg)(t), (*mpSecondArg)(t) );
}
@@ -191,7 +191,7 @@ namespace slideshow
{
}
- virtual double operator()( double t ) const
+ virtual double operator()( double t ) const SAL_OVERRIDE
{
return ::std::max( (*mpFirstArg)(t), (*mpSecondArg)(t) );
}
diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx
index aa30184ee187..5e9a0594b208 100644
--- a/slideshow/source/engine/pointersymbol.hxx
+++ b/slideshow/source/engine/pointersymbol.hxx
@@ -64,10 +64,10 @@ private:
const UnoViewContainer& rViewContainer );
// ViewEventHandler
- virtual void viewAdded( const UnoViewSharedPtr& rView );
- virtual void viewRemoved( const UnoViewSharedPtr& rView );
- virtual void viewChanged( const UnoViewSharedPtr& rView );
- virtual void viewsChanged();
+ virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewsChanged() SAL_OVERRIDE;
::basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const;
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index c36e2c877f68..c1513eb9223e 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -69,8 +69,8 @@ public:
mrActivityQueue( rActivityQueue )
{}
- virtual void dispose() {}
- virtual bool fire()
+ virtual void dispose() SAL_OVERRIDE {}
+ virtual bool fire() SAL_OVERRIDE
{
ActivitySharedPtr pActivity( mpActivity.lock() );
if( !pActivity )
@@ -79,8 +79,8 @@ public:
return mrActivityQueue.addActivity( pActivity );
}
- virtual bool isCharged() const { return true; }
- virtual double getActivationTime( double nCurrentTime ) const
+ virtual bool isCharged() const SAL_OVERRIDE { return true; }
+ virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE
{
const double nElapsedTime( maTimer.getElapsedTime() );
@@ -118,12 +118,12 @@ public:
bool hasBeenClicked() const { return mbHasBeenClicked; }
// MouseEventHandler
- virtual bool handleMousePressed( awt::MouseEvent const & evt );
- virtual bool handleMouseReleased( awt::MouseEvent const & evt );
- virtual bool handleMouseEntered( awt::MouseEvent const & evt );
- virtual bool handleMouseExited( awt::MouseEvent const & evt );
- virtual bool handleMouseDragged( awt::MouseEvent const & evt );
- virtual bool handleMouseMoved( awt::MouseEvent const & evt );
+ virtual bool handleMousePressed( awt::MouseEvent const & evt ) SAL_OVERRIDE;
+ virtual bool handleMouseReleased( awt::MouseEvent const & evt ) SAL_OVERRIDE;
+ virtual bool handleMouseEntered( awt::MouseEvent const & evt ) SAL_OVERRIDE;
+ virtual bool handleMouseExited( awt::MouseEvent const & evt ) SAL_OVERRIDE;
+ virtual bool handleMouseDragged( awt::MouseEvent const & evt ) SAL_OVERRIDE;
+ virtual bool handleMouseMoved( awt::MouseEvent const & evt ) SAL_OVERRIDE;
private:
bool isInArea( com::sun::star::awt::MouseEvent const & evt ) const;
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx
index c0a6c1322fa1..f942269c16a7 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -72,19 +72,19 @@ public:
bool hasBeenClicked() const;
// ViewEventHandler interface
- virtual void viewAdded( const UnoViewSharedPtr& rView );
- virtual void viewRemoved( const UnoViewSharedPtr& rView );
- virtual void viewChanged( const UnoViewSharedPtr& rView );
- virtual void viewsChanged();
+ virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewsChanged() SAL_OVERRIDE;
// Disposable:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
// Activity:
- virtual double calcTimeLag() const;
- virtual bool perform();
- virtual bool isActive() const;
- virtual void dequeued();
- virtual void end();
+ virtual double calcTimeLag() const SAL_OVERRIDE;
+ virtual bool perform() SAL_OVERRIDE;
+ virtual bool isActive() const SAL_OVERRIDE;
+ virtual void dequeued() SAL_OVERRIDE;
+ virtual void end() SAL_OVERRIDE;
private:
class WakeupEvent;
diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx
index 35213cd76275..0f6fec48d822 100644
--- a/slideshow/source/engine/screenupdater.cxx
+++ b/slideshow/source/engine/screenupdater.cxx
@@ -31,7 +31,7 @@ namespace {
public:
UpdateLock (::slideshow::internal::ScreenUpdater& rUpdater, const bool bStartLocked);
virtual ~UpdateLock (void);
- virtual void Activate (void);
+ virtual void Activate (void) SAL_OVERRIDE;
private:
::slideshow::internal::ScreenUpdater& mrUpdater;
bool mbIsActivated;
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index 502bec2bf036..f5de6d81a68c 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -85,22 +85,22 @@ namespace slideshow
virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer,
- bool bRedrawLayer );
- virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer );
- virtual bool clearAllViewLayers();
+ bool bRedrawLayer ) SAL_OVERRIDE;
+ virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) SAL_OVERRIDE;
+ virtual bool clearAllViewLayers() SAL_OVERRIDE;
// ExternalShapeBase methods
- virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const;
- virtual void implViewChanged( const UnoViewSharedPtr& rView );
- virtual void implViewsChanged();
- virtual bool implStartIntrinsicAnimation();
- virtual bool implEndIntrinsicAnimation();
- virtual bool implPauseIntrinsicAnimation();
- virtual bool implIsIntrinsicAnimationPlaying() const;
- virtual void implSetIntrinsicAnimationTime(double);
+ virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const SAL_OVERRIDE;
+ virtual void implViewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void implViewsChanged() SAL_OVERRIDE;
+ virtual bool implStartIntrinsicAnimation() SAL_OVERRIDE;
+ virtual bool implEndIntrinsicAnimation() SAL_OVERRIDE;
+ virtual bool implPauseIntrinsicAnimation() SAL_OVERRIDE;
+ virtual bool implIsIntrinsicAnimationPlaying() const SAL_OVERRIDE;
+ virtual void implSetIntrinsicAnimationTime(double) SAL_OVERRIDE;
const OUString maServiceName;
const char** mpPropCopyTable;
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index b1d9fab72cad..f820a266295f 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -79,34 +79,34 @@ namespace slideshow
const SlideShowContext& rContext ); // throw ShapeLoadFailedException;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape > getXShape() const;
+ ::com::sun::star::drawing::XShape > getXShape() const SAL_OVERRIDE;
// View layer methods
virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer,
- bool bRedrawLayer );
- virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer );
- virtual bool clearAllViewLayers();
+ bool bRedrawLayer ) SAL_OVERRIDE;
+ virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) SAL_OVERRIDE;
+ virtual bool clearAllViewLayers() SAL_OVERRIDE;
// attribute methods
- virtual ::basegfx::B2DRectangle getBounds() const;
- virtual ::basegfx::B2DRectangle getDomBounds() const;
- virtual ::basegfx::B2DRectangle getUpdateArea() const;
- virtual bool isVisible() const;
- virtual double getPriority() const;
- virtual bool isBackgroundDetached() const;
+ virtual ::basegfx::B2DRectangle getBounds() const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRectangle getDomBounds() const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRectangle getUpdateArea() const SAL_OVERRIDE;
+ virtual bool isVisible() const SAL_OVERRIDE;
+ virtual double getPriority() const SAL_OVERRIDE;
+ virtual bool isBackgroundDetached() const SAL_OVERRIDE;
// render methods
- virtual bool update() const;
- virtual bool render() const;
- virtual bool isContentChanged() const;
+ virtual bool update() const SAL_OVERRIDE;
+ virtual bool render() const SAL_OVERRIDE;
+ virtual bool isContentChanged() const SAL_OVERRIDE;
private:
/// The metafile actually representing the Shape
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index f19e9d8fe6a5..ea5f511bd4d8 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -145,13 +145,13 @@ public:
bool enableAnimations();
// Disposable:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
// Activity:
- virtual double calcTimeLag() const;
- virtual bool perform();
- virtual bool isActive() const;
- virtual void dequeued();
- virtual void end();
+ virtual double calcTimeLag() const SAL_OVERRIDE;
+ virtual bool perform() SAL_OVERRIDE;
+ virtual bool isActive() const SAL_OVERRIDE;
+ virtual void dequeued() SAL_OVERRIDE;
+ virtual void end() SAL_OVERRIDE;
private:
void updateShapeAttributes( double fTime,
@@ -255,8 +255,8 @@ public:
private:
- virtual bool enableAnimations() { return mrActivity.enableAnimations(); }
- virtual bool disableAnimations() { mrActivity.end(); return true; }
+ virtual bool enableAnimations() SAL_OVERRIDE { return mrActivity.enableAnimations(); }
+ virtual bool disableAnimations() SAL_OVERRIDE { mrActivity.end(); return true; }
ActivityImpl& mrActivity;
};
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index a34c99821f52..f51e932a7e1c 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -119,7 +119,7 @@ namespace slideshow
const SlideShowContext& rContext ); // throw ShapeLoadFailedException;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape > getXShape() const;
+ ::com::sun::star::drawing::XShape > getXShape() const SAL_OVERRIDE;
virtual ~DrawShape();
@@ -128,68 +128,68 @@ namespace slideshow
virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer,
- bool bRedrawLayer );
- virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer );
- virtual bool clearAllViewLayers();
+ bool bRedrawLayer ) SAL_OVERRIDE;
+ virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) SAL_OVERRIDE;
+ virtual bool clearAllViewLayers() SAL_OVERRIDE;
// attribute methods
- virtual ShapeAttributeLayerSharedPtr createAttributeLayer();
- virtual bool revokeAttributeLayer( const ShapeAttributeLayerSharedPtr& rLayer );
- virtual ShapeAttributeLayerSharedPtr getTopmostAttributeLayer() const;
- virtual void setVisibility( bool bVisible );
- virtual ::basegfx::B2DRectangle getBounds() const;
- virtual ::basegfx::B2DRectangle getDomBounds() const;
- virtual ::basegfx::B2DRectangle getUpdateArea() const;
- virtual bool isVisible() const;
- virtual double getPriority() const;
+ virtual ShapeAttributeLayerSharedPtr createAttributeLayer() SAL_OVERRIDE;
+ virtual bool revokeAttributeLayer( const ShapeAttributeLayerSharedPtr& rLayer ) SAL_OVERRIDE;
+ virtual ShapeAttributeLayerSharedPtr getTopmostAttributeLayer() const SAL_OVERRIDE;
+ virtual void setVisibility( bool bVisible ) SAL_OVERRIDE;
+ virtual ::basegfx::B2DRectangle getBounds() const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRectangle getDomBounds() const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRectangle getUpdateArea() const SAL_OVERRIDE;
+ virtual bool isVisible() const SAL_OVERRIDE;
+ virtual double getPriority() const SAL_OVERRIDE;
// animation methods
- virtual void enterAnimationMode();
- virtual void leaveAnimationMode();
- virtual bool isBackgroundDetached() const;
+ virtual void enterAnimationMode() SAL_OVERRIDE;
+ virtual void leaveAnimationMode() SAL_OVERRIDE;
+ virtual bool isBackgroundDetached() const SAL_OVERRIDE;
// render methods
- virtual bool update() const;
- virtual bool render() const;
- virtual bool isContentChanged() const;
+ virtual bool update() const SAL_OVERRIDE;
+ virtual bool render() const SAL_OVERRIDE;
+ virtual bool isContentChanged() const SAL_OVERRIDE;
// Sub item specialities
- virtual const DocTreeNodeSupplier& getTreeNodeSupplier() const;
- virtual DocTreeNodeSupplier& getTreeNodeSupplier();
+ virtual const DocTreeNodeSupplier& getTreeNodeSupplier() const SAL_OVERRIDE;
+ virtual DocTreeNodeSupplier& getTreeNodeSupplier() SAL_OVERRIDE;
- virtual DocTreeNode getSubsetNode() const;
- virtual AttributableShapeSharedPtr getSubset( const DocTreeNode& rTreeNode ) const;
+ virtual DocTreeNode getSubsetNode() const SAL_OVERRIDE;
+ virtual AttributableShapeSharedPtr getSubset( const DocTreeNode& rTreeNode ) const SAL_OVERRIDE;
virtual bool createSubset( AttributableShapeSharedPtr& o_rSubset,
- const DocTreeNode& rTreeNode );
- virtual bool revokeSubset( const AttributableShapeSharedPtr& rShape );
+ const DocTreeNode& rTreeNode ) SAL_OVERRIDE;
+ virtual bool revokeSubset( const AttributableShapeSharedPtr& rShape ) SAL_OVERRIDE;
// DocTreeNodeSupplier methods
- virtual sal_Int32 getNumberOfTreeNodes ( DocTreeNode::NodeType eNodeType ) const; // throw ShapeLoadFailedException;
+ virtual sal_Int32 getNumberOfTreeNodes ( DocTreeNode::NodeType eNodeType ) const SAL_OVERRIDE; // throw ShapeLoadFailedException;
virtual DocTreeNode getTreeNode ( sal_Int32 nNodeIndex,
- DocTreeNode::NodeType eNodeType ) const; // throw ShapeLoadFailedException;
+ DocTreeNode::NodeType eNodeType ) const SAL_OVERRIDE; // throw ShapeLoadFailedException;
virtual sal_Int32 getNumberOfSubsetTreeNodes ( const DocTreeNode& rParentNode,
- DocTreeNode::NodeType eNodeType ) const; // throw ShapeLoadFailedException;
+ DocTreeNode::NodeType eNodeType ) const SAL_OVERRIDE; // throw ShapeLoadFailedException;
virtual DocTreeNode getSubsetTreeNode ( const DocTreeNode& rParentNode,
sal_Int32 nNodeIndex,
- DocTreeNode::NodeType eNodeType ) const; // throw ShapeLoadFailedException;
+ DocTreeNode::NodeType eNodeType ) const SAL_OVERRIDE; // throw ShapeLoadFailedException;
// HyperlinkArea methods
- virtual HyperlinkRegions getHyperlinkRegions() const;
- virtual double getHyperlinkPriority() const;
+ virtual HyperlinkRegions getHyperlinkRegions() const SAL_OVERRIDE;
+ virtual double getHyperlinkPriority() const SAL_OVERRIDE;
// intrinsic animation methods
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index a6daaec7c2b0..00c0766df8a5 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -56,13 +56,13 @@ namespace slideshow
// ViewEventHandler
- virtual void viewAdded( const UnoViewSharedPtr& ) {}
- virtual void viewRemoved( const UnoViewSharedPtr& ) {}
- virtual void viewChanged( const UnoViewSharedPtr& rView )
+ virtual void viewAdded( const UnoViewSharedPtr& ) SAL_OVERRIDE {}
+ virtual void viewRemoved( const UnoViewSharedPtr& ) SAL_OVERRIDE {}
+ virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE
{
mrBase.implViewChanged(rView);
}
- virtual void viewsChanged()
+ virtual void viewsChanged() SAL_OVERRIDE
{
mrBase.implViewsChanged();
}
@@ -71,11 +71,11 @@ namespace slideshow
// IntrinsicAnimationEventHandler
- virtual bool enableAnimations()
+ virtual bool enableAnimations() SAL_OVERRIDE
{
return mrBase.implStartIntrinsicAnimation();
}
- virtual bool disableAnimations()
+ virtual bool disableAnimations() SAL_OVERRIDE
{
return mrBase.implEndIntrinsicAnimation();
}
diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx
index cfff14924697..4de13609c8d0 100644
--- a/slideshow/source/engine/shapes/externalshapebase.hxx
+++ b/slideshow/source/engine/shapes/externalshapebase.hxx
@@ -63,34 +63,34 @@ namespace slideshow
virtual ~ExternalShapeBase();
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape > getXShape() const;
+ ::com::sun::star::drawing::XShape > getXShape() const SAL_OVERRIDE;
// animation methods
- virtual void play();
- virtual void stop();
- virtual void pause();
- virtual bool isPlaying() const;
- virtual void setMediaTime(double);
+ virtual void play() SAL_OVERRIDE;
+ virtual void stop() SAL_OVERRIDE;
+ virtual void pause() SAL_OVERRIDE;
+ virtual bool isPlaying() const SAL_OVERRIDE;
+ virtual void setMediaTime(double) SAL_OVERRIDE;
// render methods
- virtual bool update() const;
- virtual bool render() const;
- virtual bool isContentChanged() const;
+ virtual bool update() const SAL_OVERRIDE;
+ virtual bool render() const SAL_OVERRIDE;
+ virtual bool isContentChanged() const SAL_OVERRIDE;
// Shape attributes
- virtual ::basegfx::B2DRectangle getBounds() const;
- virtual ::basegfx::B2DRectangle getDomBounds() const;
- virtual ::basegfx::B2DRectangle getUpdateArea() const;
- virtual bool isVisible() const;
- virtual double getPriority() const;
- virtual bool isBackgroundDetached() const;
+ virtual ::basegfx::B2DRectangle getBounds() const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRectangle getDomBounds() const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRectangle getUpdateArea() const SAL_OVERRIDE;
+ virtual bool isVisible() const SAL_OVERRIDE;
+ virtual double getPriority() const SAL_OVERRIDE;
+ virtual bool isBackgroundDetached() const SAL_OVERRIDE;
protected:
const ::com::sun::star::uno::Reference<
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 5c69f1a9fb2e..4d2b046e164c 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -119,7 +119,7 @@ public:
}
//--- XGraphicRenderer -----------------------------------
- virtual void SAL_CALL render( const uno::Reference< graphic::XGraphic >& rGraphic ) throw (uno::RuntimeException, std::exception)
+ virtual void SAL_CALL render( const uno::Reference< graphic::XGraphic >& rGraphic ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
{
::osl::MutexGuard aGuard( m_aMutex );
mxGraphic = rGraphic;
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index af58d1093026..13aaa1cd4da5 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -74,12 +74,12 @@ namespace slideshow
::std::size_t nNumLoops,
CycleMode eCycleMode );
- virtual void dispose();
- virtual double calcTimeLag() const;
- virtual bool perform();
- virtual bool isActive() const;
- virtual void dequeued();
- virtual void end();
+ virtual void dispose() SAL_OVERRIDE;
+ virtual double calcTimeLag() const SAL_OVERRIDE;
+ virtual bool perform() SAL_OVERRIDE;
+ virtual bool isActive() const SAL_OVERRIDE;
+ virtual void dequeued() SAL_OVERRIDE;
+ virtual void end() SAL_OVERRIDE;
bool enableAnimations();
@@ -108,8 +108,8 @@ namespace slideshow
private:
- virtual bool enableAnimations() { return mrActivity.enableAnimations(); }
- virtual bool disableAnimations() { mrActivity.end(); return true; }
+ virtual bool enableAnimations() SAL_OVERRIDE { return mrActivity.enableAnimations(); }
+ virtual bool disableAnimations() SAL_OVERRIDE { mrActivity.end(); return true; }
IntrinsicAnimationActivity& mrActivity;
};
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index 9c34049b400e..f50e84b408aa 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -71,22 +71,22 @@ namespace slideshow
virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer,
- bool bRedrawLayer );
- virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer );
- virtual bool clearAllViewLayers();
+ bool bRedrawLayer ) SAL_OVERRIDE;
+ virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) SAL_OVERRIDE;
+ virtual bool clearAllViewLayers() SAL_OVERRIDE;
// ExternalShapeBase methods
- virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const;
- virtual void implViewChanged( const UnoViewSharedPtr& rView );
- virtual void implViewsChanged();
- virtual bool implStartIntrinsicAnimation();
- virtual bool implEndIntrinsicAnimation();
- virtual bool implPauseIntrinsicAnimation();
- virtual bool implIsIntrinsicAnimationPlaying() const;
- virtual void implSetIntrinsicAnimationTime(double);
+ virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const SAL_OVERRIDE;
+ virtual void implViewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void implViewsChanged() SAL_OVERRIDE;
+ virtual bool implStartIntrinsicAnimation() SAL_OVERRIDE;
+ virtual bool implEndIntrinsicAnimation() SAL_OVERRIDE;
+ virtual bool implPauseIntrinsicAnimation() SAL_OVERRIDE;
+ virtual bool implIsIntrinsicAnimationPlaying() const SAL_OVERRIDE;
+ virtual void implSetIntrinsicAnimationTime(double) SAL_OVERRIDE;
/// the list of active view shapes (one for each registered view layer)
typedef ::std::vector< ViewMediaShapeSharedPtr > ViewMediaShapeVector;
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 2f1a8588d61f..50d7b720aa7b 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -155,20 +155,20 @@ public:
double nPrio );
// Shape:
- virtual uno::Reference<drawing::XShape> getXShape() const;
+ virtual uno::Reference<drawing::XShape> getXShape() const SAL_OVERRIDE;
virtual void addViewLayer( ViewLayerSharedPtr const& pNewLayer,
- bool bRedrawLayer );
- virtual bool removeViewLayer( ViewLayerSharedPtr const& pNewLayer );
- virtual bool clearAllViewLayers();
- virtual bool update() const;
- virtual bool render() const;
- virtual bool isContentChanged() const;
- virtual basegfx::B2DRectangle getBounds() const;
- virtual basegfx::B2DRectangle getDomBounds() const;
- virtual basegfx::B2DRectangle getUpdateArea() const;
- virtual bool isVisible() const;
- virtual double getPriority() const;
- virtual bool isBackgroundDetached() const;
+ bool bRedrawLayer ) SAL_OVERRIDE;
+ virtual bool removeViewLayer( ViewLayerSharedPtr const& pNewLayer ) SAL_OVERRIDE;
+ virtual bool clearAllViewLayers() SAL_OVERRIDE;
+ virtual bool update() const SAL_OVERRIDE;
+ virtual bool render() const SAL_OVERRIDE;
+ virtual bool isContentChanged() const SAL_OVERRIDE;
+ virtual basegfx::B2DRectangle getBounds() const SAL_OVERRIDE;
+ virtual basegfx::B2DRectangle getDomBounds() const SAL_OVERRIDE;
+ virtual basegfx::B2DRectangle getUpdateArea() const SAL_OVERRIDE;
+ virtual bool isVisible() const SAL_OVERRIDE;
+ virtual double getPriority() const SAL_OVERRIDE;
+ virtual bool isBackgroundDetached() const SAL_OVERRIDE;
private:
ShapeSharedPtr const mpGroupShape;
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index 7640e086ed01..1f3cbd6c69ae 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -603,61 +603,61 @@ namespace slideshow
{
}
- virtual bool isOnView(boost::shared_ptr<View> const& /*rView*/) const
+ virtual bool isOnView(boost::shared_ptr<View> const& /*rView*/) const SAL_OVERRIDE
{
return true; // visible on all views
}
- virtual ::cppcanvas::CanvasSharedPtr getCanvas() const
+ virtual ::cppcanvas::CanvasSharedPtr getCanvas() const SAL_OVERRIDE
{
return mpCanvas;
}
- virtual void clear() const
+ virtual void clear() const SAL_OVERRIDE
{
// NOOP
}
- virtual void clearAll() const
+ virtual void clearAll() const SAL_OVERRIDE
{
// NOOP
}
virtual ::cppcanvas::CustomSpriteSharedPtr createSprite( const ::basegfx::B2DSize& /*rSpriteSizePixel*/,
- double /*nSpritePrio*/ ) const
+ double /*nSpritePrio*/ ) const SAL_OVERRIDE
{
ENSURE_OR_THROW( false,
"DummyLayer::createSprite(): This method is not supposed to be called!" );
return ::cppcanvas::CustomSpriteSharedPtr();
}
- virtual void setPriority( const basegfx::B1DRange& /*rRange*/ )
+ virtual void setPriority( const basegfx::B1DRange& /*rRange*/ ) SAL_OVERRIDE
{
OSL_FAIL( "BitmapView::setPriority(): This method is not supposed to be called!" );
}
- virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const
+ virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const SAL_OVERRIDE
{
return geometry::IntegerSize2D(0,0);
}
- virtual ::basegfx::B2DHomMatrix getTransformation() const
+ virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE
{
return mpCanvas->getTransformation();
}
- virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const
+ virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const SAL_OVERRIDE
{
OSL_FAIL( "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" );
return ::basegfx::B2DHomMatrix();
}
- virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ )
+ virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ ) SAL_OVERRIDE
{
OSL_FAIL( "BitmapView::setClip(): This method is not supposed to be called!" );
}
- virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ )
+ virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ ) SAL_OVERRIDE
{
OSL_FAIL( "BitmapView::resize(): This method is not supposed to be called!" );
return false;
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index b5046e382306..9f364e5c5411 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -87,7 +87,7 @@ public:
// Disposable interface
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
@@ -95,38 +95,38 @@ private:
virtual bool handleMousePressed(
- ::com::sun::star::awt::MouseEvent const& evt );
+ ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE;
virtual bool handleMouseReleased(
- ::com::sun::star::awt::MouseEvent const& evt );
+ ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE;
virtual bool handleMouseEntered(
- ::com::sun::star::awt::MouseEvent const& evt );
+ ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE;
virtual bool handleMouseExited(
- ::com::sun::star::awt::MouseEvent const& evt );
+ ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE;
virtual bool handleMouseDragged(
- ::com::sun::star::awt::MouseEvent const& evt );
+ ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE;
virtual bool handleMouseMoved(
- ::com::sun::star::awt::MouseEvent const& evt );
+ ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE;
// ViewUpdate interface
- virtual bool update();
- virtual bool update( ViewSharedPtr const& rView );
- virtual bool needsUpdate() const;
+ virtual bool update() SAL_OVERRIDE;
+ virtual bool update( ViewSharedPtr const& rView ) SAL_OVERRIDE;
+ virtual bool needsUpdate() const SAL_OVERRIDE;
// ShapeManager interface
- virtual void enterAnimationMode( const AnimatableShapeSharedPtr& rShape );
- virtual void leaveAnimationMode( const AnimatableShapeSharedPtr& rShape );
- virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape );
+ virtual void enterAnimationMode( const AnimatableShapeSharedPtr& rShape ) SAL_OVERRIDE;
+ virtual void leaveAnimationMode( const AnimatableShapeSharedPtr& rShape ) SAL_OVERRIDE;
+ virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape ) SAL_OVERRIDE;
virtual ShapeSharedPtr lookupShape(
::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape > const & xShape ) const;
- virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea );
- virtual void removeHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea );
+ ::com::sun::star::drawing::XShape > const & xShape ) const SAL_OVERRIDE;
+ virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ) SAL_OVERRIDE;
+ virtual void removeHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ) SAL_OVERRIDE;
// SubsettableShapeManager interface
@@ -134,17 +134,17 @@ private:
virtual boost::shared_ptr<AttributableShape> getSubsetShape(
const boost::shared_ptr<AttributableShape>& rOrigShape,
- const DocTreeNode& rTreeNode );
+ const DocTreeNode& rTreeNode ) SAL_OVERRIDE;
virtual void revokeSubset(
const boost::shared_ptr<AttributableShape>& rOrigShape,
- const boost::shared_ptr<AttributableShape>& rSubsetShape );
+ const boost::shared_ptr<AttributableShape>& rSubsetShape ) SAL_OVERRIDE;
virtual void addIntrinsicAnimationHandler(
- const IntrinsicAnimationEventHandlerSharedPtr& rHandler );
+ const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) SAL_OVERRIDE;
virtual void removeIntrinsicAnimationHandler(
- const IntrinsicAnimationEventHandlerSharedPtr& rHandler );
- virtual bool notifyIntrinsicAnimationsEnabled();
- virtual bool notifyIntrinsicAnimationsDisabled();
+ const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) SAL_OVERRIDE;
+ virtual bool notifyIntrinsicAnimationsEnabled() SAL_OVERRIDE;
+ virtual bool notifyIntrinsicAnimationsDisabled() SAL_OVERRIDE;
// ShapeListenerEventHandler
@@ -153,12 +153,12 @@ private:
virtual bool listenerAdded( const ::com::sun::star::uno::Reference<
::com::sun::star::presentation::XShapeEventListener>& xListener,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape );
+ ::com::sun::star::drawing::XShape>& xShape ) SAL_OVERRIDE;
virtual bool listenerRemoved( const ::com::sun::star::uno::Reference<
::com::sun::star::presentation::XShapeEventListener>& xListener,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape );
+ ::com::sun::star::drawing::XShape>& xShape ) SAL_OVERRIDE;
// ShapeCursorEventHandler interface
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 08ccce20a810..ef2ab23e5aba 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -119,36 +119,36 @@ public:
// Slide interface
- virtual bool prefetch();
- virtual bool show( bool );
- virtual void hide();
+ virtual bool prefetch() SAL_OVERRIDE;
+ virtual bool show( bool ) SAL_OVERRIDE;
+ virtual void hide() SAL_OVERRIDE;
- virtual basegfx::B2ISize getSlideSize() const;
- virtual uno::Reference<drawing::XDrawPage > getXDrawPage() const;
- virtual uno::Reference<animations::XAnimationNode> getXAnimationNode() const;
- virtual PolyPolygonVector getPolygons();
- virtual void drawPolygons() const;
- virtual bool isPaintOverlayActive() const;
- virtual void enablePaintOverlay();
- virtual void disablePaintOverlay();
- virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth );
+ virtual basegfx::B2ISize getSlideSize() const SAL_OVERRIDE;
+ virtual uno::Reference<drawing::XDrawPage > getXDrawPage() const SAL_OVERRIDE;
+ virtual uno::Reference<animations::XAnimationNode> getXAnimationNode() const SAL_OVERRIDE;
+ virtual PolyPolygonVector getPolygons() SAL_OVERRIDE;
+ virtual void drawPolygons() const SAL_OVERRIDE;
+ virtual bool isPaintOverlayActive() const SAL_OVERRIDE;
+ virtual void enablePaintOverlay() SAL_OVERRIDE;
+ virtual void disablePaintOverlay() SAL_OVERRIDE;
+ virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) SAL_OVERRIDE;
// TODO(F2): Rework SlideBitmap to no longer be based on XBitmap,
// but on canvas-independent basegfx bitmaps
- virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const;
+ virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const SAL_OVERRIDE;
private:
// ViewEventHandler
- virtual void viewAdded( const UnoViewSharedPtr& rView );
- virtual void viewRemoved( const UnoViewSharedPtr& rView );
- virtual void viewChanged( const UnoViewSharedPtr& rView );
- virtual void viewsChanged();
+ virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewsChanged() SAL_OVERRIDE;
// CursorManager
- virtual bool requestCursor( sal_Int16 nCursorShape );
- virtual void resetCursor();
+ virtual bool requestCursor( sal_Int16 nCursorShape ) SAL_OVERRIDE;
+ virtual void resetCursor() SAL_OVERRIDE;
void activatePaintOverlay();
void deactivatePaintOverlay();
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 86341488107f..142f88951787 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -92,31 +92,31 @@ namespace slideshow
}
// ViewEventHandler methods
- virtual void viewAdded( const UnoViewSharedPtr& rView )
+ virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE
{
maViews.push_back( rView );
}
- virtual void viewRemoved( const UnoViewSharedPtr& rView )
+ virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE
{
maViews.erase( ::std::remove( maViews.begin(),
maViews.end(),
rView ) );
}
- virtual void viewChanged( const UnoViewSharedPtr& /*rView*/ )
+ virtual void viewChanged( const UnoViewSharedPtr& /*rView*/ ) SAL_OVERRIDE
{
// TODO(F2): for persistent drawings, need to store
// polygon and repaint here.
}
- virtual void viewsChanged()
+ virtual void viewsChanged() SAL_OVERRIDE
{
// TODO(F2): for persistent drawings, need to store
// polygon and repaint here.
}
- bool colorChanged( RGBColor const& rUserColor )
+ bool colorChanged( RGBColor const& rUserColor ) SAL_OVERRIDE
{
mbIsLastPointValid = false;
mbActive = true;
@@ -125,7 +125,7 @@ namespace slideshow
return true;
}
- bool widthChanged( double nUserStrokeWidth )
+ bool widthChanged( double nUserStrokeWidth ) SAL_OVERRIDE
{
this->mnStrokeWidth = nUserStrokeWidth;
mbIsEraseModeActivated = false;
@@ -167,7 +167,7 @@ namespace slideshow
}
}
- bool eraseAllInkChanged( bool const& rEraseAllInk )
+ bool eraseAllInkChanged( bool const& rEraseAllInk ) SAL_OVERRIDE
{
this->mbIsEraseAllModeActivated= rEraseAllInk;
// if the erase all mode is activated it will remove all ink from slide,
@@ -183,7 +183,7 @@ namespace slideshow
return true;
}
- bool eraseInkWidthChanged( sal_Int32 rEraseInkSize )
+ bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) SAL_OVERRIDE
{
// Change the size
this->mnSize=rEraseInkSize;
@@ -192,7 +192,7 @@ namespace slideshow
return true;
}
- bool switchPenMode()
+ bool switchPenMode() SAL_OVERRIDE
{
mbIsLastPointValid = false;
mbActive = true;
@@ -200,7 +200,7 @@ namespace slideshow
return true;
}
- bool switchEraserMode()
+ bool switchEraserMode() SAL_OVERRIDE
{
mbIsLastPointValid = false;
mbActive = true;
@@ -208,7 +208,7 @@ namespace slideshow
return true;
}
- bool disable()
+ bool disable() SAL_OVERRIDE
{
mbIsLastPointValid = false;
mbIsLastMouseDownPosValid = false;
@@ -236,7 +236,7 @@ namespace slideshow
}
// MouseEventHandler methods
- virtual bool handleMousePressed( const awt::MouseEvent& e )
+ virtual bool handleMousePressed( const awt::MouseEvent& e ) SAL_OVERRIDE
{
if( !mbActive )
return false;
@@ -259,7 +259,7 @@ namespace slideshow
return true;
}
- virtual bool handleMouseReleased( const awt::MouseEvent& e )
+ virtual bool handleMouseReleased( const awt::MouseEvent& e ) SAL_OVERRIDE
{
if( !mbActive )
return false;
@@ -296,7 +296,7 @@ namespace slideshow
return true;
}
- virtual bool handleMouseEntered( const awt::MouseEvent& e )
+ virtual bool handleMouseEntered( const awt::MouseEvent& e ) SAL_OVERRIDE
{
if( !mbActive )
return false;
@@ -308,7 +308,7 @@ namespace slideshow
return true;
}
- virtual bool handleMouseExited( const awt::MouseEvent& )
+ virtual bool handleMouseExited( const awt::MouseEvent& ) SAL_OVERRIDE
{
if( !mbActive )
return false;
@@ -319,7 +319,7 @@ namespace slideshow
return true;
}
- virtual bool handleMouseDragged( const awt::MouseEvent& e )
+ virtual bool handleMouseDragged( const awt::MouseEvent& e ) SAL_OVERRIDE
{
if( !mbActive )
return false;
@@ -438,7 +438,7 @@ namespace slideshow
return true;
}
- virtual bool handleMouseMoved( const awt::MouseEvent& /*e*/ )
+ virtual bool handleMouseMoved( const awt::MouseEvent& /*e*/ ) SAL_OVERRIDE
{
// not used here
return false; // did not handle the event
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index ec0b720d9f7c..8b4b491273ac 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -279,58 +279,58 @@ public:
private:
// XSlideShow:
- virtual sal_Bool SAL_CALL nextEffect() throw (uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL nextEffect() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL startShapeActivity(
uno::Reference<drawing::XShape> const& xShape )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL stopShapeActivity(
uno::Reference<drawing::XShape> const& xShape )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual uno::Reference<drawing::XDrawPage> SAL_CALL getCurrentSlide()
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL displaySlide(
uno::Reference<drawing::XDrawPage> const& xSlide,
uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages,
uno::Reference<animations::XAnimationNode> const& xRootNode,
uno::Sequence<beans::PropertyValue> const& rProperties )
- throw (uno::RuntimeException, std::exception);
- virtual void SAL_CALL registerUserPaintPolygons( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xDocFactory ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL registerUserPaintPolygons( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xDocFactory ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL setProperty(
- beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception);
+ beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL addView(
uno::Reference<presentation::XSlideShowView> const& xView )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL removeView(
uno::Reference<presentation::XSlideShowView> const& xView )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL update( double & nNextTimeout )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addSlideShowListener(
uno::Reference<presentation::XSlideShowListener> const& xListener )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeSlideShowListener(
uno::Reference<presentation::XSlideShowListener> const& xListener )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addShapeEventListener(
uno::Reference<presentation::XShapeEventListener> const& xListener,
uno::Reference<drawing::XShape> const& xShape )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeShapeEventListener(
uno::Reference<presentation::XShapeEventListener> const& xListener,
uno::Reference<drawing::XShape> const& xShape )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setShapeCursor(
uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// CursorManager
- virtual bool requestCursor( sal_Int16 nCursorShape );
- virtual void resetCursor();
+ virtual bool requestCursor( sal_Int16 nCursorShape ) SAL_OVERRIDE;
+ virtual void resetCursor() SAL_OVERRIDE;
/** This is somewhat similar to displaySlide when called for the current
slide. It has been simplified to take advantage of that no slide
@@ -341,7 +341,7 @@ private:
protected:
// WeakComponentImplHelperBase
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
bool isDisposed() const
{
@@ -523,7 +523,7 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler,
{}
// EventHandler
- virtual bool handleEvent()
+ virtual bool handleEvent() SAL_OVERRIDE
{
// DON't call notifySlideAnimationsEnded()
// directly, but queue an event. handleEvent()
@@ -541,20 +541,20 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler,
}
// ViewRepaintHandler
- virtual void viewClobbered( const UnoViewSharedPtr& rView )
+ virtual void viewClobbered( const UnoViewSharedPtr& rView ) SAL_OVERRIDE
{
// given view needs repaint, request update
mrScreenUpdater.notifyUpdate(rView, true);
}
// HyperlinkHandler
- virtual bool handleHyperlink( OUString const& rLink )
+ virtual bool handleHyperlink( OUString const& rLink ) SAL_OVERRIDE
{
return mrShow.notifyHyperLinkClicked(rLink);
}
// AnimationEventHandler
- virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode )
+ virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE
{
return mrShow.handleAnimationEvent(rNode);
}
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 279905a97f7b..a3bd0e5aaaac 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -480,7 +480,7 @@ public:
}
}
- virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const
+ virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const SAL_OVERRIDE
{
basegfx::B2DRectangle aTmpRect;
canvas::tools::calcTransformedRectBounds( aTmpRect,
@@ -504,7 +504,7 @@ private:
virtual cppcanvas::CustomSpriteSharedPtr createSprite(
const ::basegfx::B2DSize& rSpriteSizePixel,
- double nPriority ) const
+ double nPriority ) const SAL_OVERRIDE
{
cppcanvas::CustomSpriteSharedPtr pSprite(
mpSpriteCanvas->createCustomSprite( rSpriteSizePixel ) );
@@ -515,7 +515,7 @@ private:
return pSprite;
}
- virtual void setPriority( const basegfx::B1DRange& rRange )
+ virtual void setPriority( const basegfx::B1DRange& rRange ) SAL_OVERRIDE
{
OSL_ENSURE( !rRange.isEmpty() &&
rRange.getMinimum() >= 1.0,
@@ -528,7 +528,7 @@ private:
mpSprite->setPriority( rRange.getMinimum() );
}
- virtual basegfx::B2DHomMatrix getTransformation() const
+ virtual basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE
{
// Offset given transformation by left, top border of given
// range (after transformation through given transformation)
@@ -550,12 +550,12 @@ private:
return aMatrix;
}
- virtual basegfx::B2DHomMatrix getSpriteTransformation() const
+ virtual basegfx::B2DHomMatrix getSpriteTransformation() const SAL_OVERRIDE
{
return maTransformation;
}
- virtual void clear() const
+ virtual void clear() const SAL_OVERRIDE
{
// grab canvas - that also lazy-initializes maLayerBoundsPixel
cppcanvas::CanvasSharedPtr pCanvas=getCanvas()->clone();
@@ -566,7 +566,7 @@ private:
basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY()));
}
- virtual void clearAll() const
+ virtual void clearAll() const SAL_OVERRIDE
{
// grab canvas - that also lazy-initializes maLayerBoundsPixel
::cppcanvas::CanvasSharedPtr pCanvas( getCanvas()->clone() );
@@ -580,12 +580,12 @@ private:
basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY()));
}
- virtual bool isOnView(boost::shared_ptr<View> const& rView) const
+ virtual bool isOnView(boost::shared_ptr<View> const& rView) const SAL_OVERRIDE
{
return rView.get() == mpParentView;
}
- virtual cppcanvas::CanvasSharedPtr getCanvas() const
+ virtual cppcanvas::CanvasSharedPtr getCanvas() const SAL_OVERRIDE
{
if( !mpOutputCanvas )
{
@@ -644,7 +644,7 @@ private:
return mpOutputCanvas;
}
- virtual void setClip( const basegfx::B2DPolyPolygon& rClip )
+ virtual void setClip( const basegfx::B2DPolyPolygon& rClip ) SAL_OVERRIDE
{
basegfx::B2DPolyPolygon aNewClip = prepareClip( rClip );
@@ -660,7 +660,7 @@ private:
}
}
- virtual bool resize( const ::basegfx::B2DRange& rArea )
+ virtual bool resize( const ::basegfx::B2DRange& rArea ) SAL_OVERRIDE
{
const bool bRet( maLayerBounds != rArea );
maLayerBounds = rArea;
@@ -695,44 +695,44 @@ public:
private:
// View:
- virtual ViewLayerSharedPtr createViewLayer( const basegfx::B2DRange& rLayerBounds ) const;
- virtual bool updateScreen() const;
- virtual bool paintScreen() const;
- virtual void setViewSize( const ::basegfx::B2DSize& );
- virtual void setCursorShape( sal_Int16 nPointerShape );
+ virtual ViewLayerSharedPtr createViewLayer( const basegfx::B2DRange& rLayerBounds ) const SAL_OVERRIDE;
+ virtual bool updateScreen() const SAL_OVERRIDE;
+ virtual bool paintScreen() const SAL_OVERRIDE;
+ virtual void setViewSize( const ::basegfx::B2DSize& ) SAL_OVERRIDE;
+ virtual void setCursorShape( sal_Int16 nPointerShape ) SAL_OVERRIDE;
// ViewLayer interface
- virtual bool isOnView(boost::shared_ptr<View> const& rView) const;
- virtual void clear() const;
- virtual void clearAll() const;
- virtual cppcanvas::CanvasSharedPtr getCanvas() const;
+ virtual bool isOnView(boost::shared_ptr<View> const& rView) const SAL_OVERRIDE;
+ virtual void clear() const SAL_OVERRIDE;
+ virtual void clearAll() const SAL_OVERRIDE;
+ virtual cppcanvas::CanvasSharedPtr getCanvas() const SAL_OVERRIDE;
virtual cppcanvas::CustomSpriteSharedPtr createSprite( const ::basegfx::B2DSize& rSpriteSizePixel,
- double nPriority ) const;
- virtual void setPriority( const basegfx::B1DRange& rRange );
- virtual geometry::IntegerSize2D getTranslationOffset() const;
- virtual ::basegfx::B2DHomMatrix getTransformation() const;
- virtual basegfx::B2DHomMatrix getSpriteTransformation() const;
- virtual void setClip( const ::basegfx::B2DPolyPolygon& rClip );
- virtual bool resize( const ::basegfx::B2DRange& rArea );
+ double nPriority ) const SAL_OVERRIDE;
+ virtual void setPriority( const basegfx::B1DRange& rRange ) SAL_OVERRIDE;
+ virtual geometry::IntegerSize2D getTranslationOffset() const SAL_OVERRIDE;
+ virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE;
+ virtual basegfx::B2DHomMatrix getSpriteTransformation() const SAL_OVERRIDE;
+ virtual void setClip( const ::basegfx::B2DPolyPolygon& rClip ) SAL_OVERRIDE;
+ virtual bool resize( const ::basegfx::B2DRange& rArea ) SAL_OVERRIDE;
// UnoView:
- virtual void _dispose();
- virtual uno::Reference<presentation::XSlideShowView> getUnoView()const;
- virtual void setIsSoundEnabled (const bool bValue);
- virtual bool isSoundEnabled (void) const;
+ virtual void _dispose() SAL_OVERRIDE;
+ virtual uno::Reference<presentation::XSlideShowView> getUnoView()const SAL_OVERRIDE;
+ virtual void setIsSoundEnabled (const bool bValue) SAL_OVERRIDE;
+ virtual bool isSoundEnabled (void) const SAL_OVERRIDE;
// XEventListener:
virtual void SAL_CALL disposing( lang::EventObject const& evt )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XModifyListener:
virtual void SAL_CALL modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPaintListener:
virtual void SAL_CALL windowPaint( const awt::PaintEvent& e )
- throw (uno::RuntimeException, std::exception);
+ throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
// WeakComponentImplHelperBase:
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
void updateClip();
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 47b4f8538725..600818c1aba5 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -209,12 +209,12 @@ namespace slideshow
{
}
- virtual double operator()( double t ) const
+ virtual double operator()( double t ) const SAL_OVERRIDE
{
return maFunctor( (*mpArg)(t) );
}
- virtual bool isConstant() const
+ virtual bool isConstant() const SAL_OVERRIDE
{
return mpArg->isConstant();
}
diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx
index 95f4fda234e8..4153d37fcf0e 100644
--- a/slideshow/source/engine/transitions/barndoorwipe.hxx
+++ b/slideshow/source/engine/transitions/barndoorwipe.hxx
@@ -35,7 +35,7 @@ class BarnDoorWipe : public ParametricPolyPolygon
public:
BarnDoorWipe( bool doubled = false )
: m_unitRect( createUnitRect() ), m_doubled(doubled) {}
- virtual ::basegfx::B2DPolyPolygon operator()( double x );
+ virtual ::basegfx::B2DPolyPolygon operator()( double x ) SAL_OVERRIDE;
private:
const ::basegfx::B2DPolygon m_unitRect;
const bool m_doubled;
diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.hxx b/slideshow/source/engine/transitions/barwipepolypolygon.hxx
index 450885b9a444..824aa9626270 100644
--- a/slideshow/source/engine/transitions/barwipepolypolygon.hxx
+++ b/slideshow/source/engine/transitions/barwipepolypolygon.hxx
@@ -35,7 +35,7 @@ public:
: m_nBars(nBars),
m_unitRect( createUnitRect() )
{}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
const sal_Int32 m_nBars;
const ::basegfx::B2DPolygon m_unitRect;
diff --git a/slideshow/source/engine/transitions/boxwipe.hxx b/slideshow/source/engine/transitions/boxwipe.hxx
index bbc37ed67182..31cfaa74cd3c 100644
--- a/slideshow/source/engine/transitions/boxwipe.hxx
+++ b/slideshow/source/engine/transitions/boxwipe.hxx
@@ -34,7 +34,7 @@ public:
BoxWipe( bool topCentered ) : m_topCentered(topCentered),
m_unitRect( createUnitRect() )
{}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
const bool m_topCentered;
const ::basegfx::B2DPolyPolygon m_unitRect;
diff --git a/slideshow/source/engine/transitions/checkerboardwipe.hxx b/slideshow/source/engine/transitions/checkerboardwipe.hxx
index b2e01083c1f4..d1703bc4b0d0 100644
--- a/slideshow/source/engine/transitions/checkerboardwipe.hxx
+++ b/slideshow/source/engine/transitions/checkerboardwipe.hxx
@@ -37,7 +37,7 @@ public:
: m_unitsPerEdge(unitsPerEdge),
m_unitRect( createUnitRect() )
{ OSL_ASSERT( (unitsPerEdge % 2) == 0 ); }
- virtual ::basegfx::B2DPolyPolygon operator () ( double x );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double x ) SAL_OVERRIDE;
private:
const sal_Int32 m_unitsPerEdge;
const ::basegfx::B2DPolyPolygon m_unitRect;
diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx
index 5ca00f87439a..a867e909a30d 100644
--- a/slideshow/source/engine/transitions/clockwipe.hxx
+++ b/slideshow/source/engine/transitions/clockwipe.hxx
@@ -33,7 +33,7 @@ class ClockWipe : public ParametricPolyPolygon
public:
/// 0,1 to 1,1 to 1,0 to 0,-1 to -1,0 to 0,1:
static ::basegfx::B2DPolygon calcCenteredClock( double t, double e = 1.0 );
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
};
}
diff --git a/slideshow/source/engine/transitions/combtransition.hxx b/slideshow/source/engine/transitions/combtransition.hxx
index f1c978eae82d..1dd35c2b5ac9 100644
--- a/slideshow/source/engine/transitions/combtransition.hxx
+++ b/slideshow/source/engine/transitions/combtransition.hxx
@@ -49,7 +49,7 @@ public:
sal_Int32 nNumStripes );
// NumberAnimation
- virtual bool operator()( double x );
+ virtual bool operator()( double x ) SAL_OVERRIDE;
private:
const ::basegfx::B2DVector maPushDirectionUnit;
diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx
index 50b551f8ba60..d04f686306ee 100644
--- a/slideshow/source/engine/transitions/doublediamondwipe.hxx
+++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx
@@ -34,7 +34,7 @@ class DoubleDiamondWipe : public ParametricPolyPolygon
{
public:
DoubleDiamondWipe() : m_unitRect( createUnitRect() ) {}
- virtual ::basegfx::B2DPolyPolygon operator()( double x );
+ virtual ::basegfx::B2DPolyPolygon operator()( double x ) SAL_OVERRIDE;
private:
const ::basegfx::B2DPolyPolygon m_unitRect;
};
diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx
index de84696c815e..29be7e994c6b 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.hxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.hxx
@@ -31,7 +31,7 @@ class EllipseWipe : public ParametricPolyPolygon
{
public:
EllipseWipe( sal_Int32 /*nTransitionSubType xxx todo */ ) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double x );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double x ) SAL_OVERRIDE;
};
}
diff --git a/slideshow/source/engine/transitions/fanwipe.hxx b/slideshow/source/engine/transitions/fanwipe.hxx
index 880900143bea..91fdcf830be1 100644
--- a/slideshow/source/engine/transitions/fanwipe.hxx
+++ b/slideshow/source/engine/transitions/fanwipe.hxx
@@ -32,7 +32,7 @@ class FanWipe : public ParametricPolyPolygon
public:
FanWipe( bool center, bool single = true, bool fanIn = false )
: m_center(center), m_single(single), m_fanIn(fanIn) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
bool m_center, m_single, m_fanIn;
};
diff --git a/slideshow/source/engine/transitions/figurewipe.hxx b/slideshow/source/engine/transitions/figurewipe.hxx
index 7d6810237eea..0a83be80de3f 100644
--- a/slideshow/source/engine/transitions/figurewipe.hxx
+++ b/slideshow/source/engine/transitions/figurewipe.hxx
@@ -35,7 +35,7 @@ public:
static FigureWipe * createPentagonWipe();
static FigureWipe * createHexagonWipe();
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
FigureWipe( ::basegfx::B2DPolygon const & figure ) : m_figure(figure) {}
const ::basegfx::B2DPolygon m_figure;
diff --git a/slideshow/source/engine/transitions/fourboxwipe.hxx b/slideshow/source/engine/transitions/fourboxwipe.hxx
index 10bbdb598d56..622355aa9c63 100644
--- a/slideshow/source/engine/transitions/fourboxwipe.hxx
+++ b/slideshow/source/engine/transitions/fourboxwipe.hxx
@@ -35,7 +35,7 @@ public:
FourBoxWipe( bool cornersOut ) : m_cornersOut(cornersOut),
m_unitRect( createUnitRect() )
{}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
const bool m_cornersOut;
const ::basegfx::B2DPolygon m_unitRect;
diff --git a/slideshow/source/engine/transitions/iriswipe.hxx b/slideshow/source/engine/transitions/iriswipe.hxx
index 6dbdd328d044..82532270965a 100644
--- a/slideshow/source/engine/transitions/iriswipe.hxx
+++ b/slideshow/source/engine/transitions/iriswipe.hxx
@@ -33,7 +33,7 @@ class IrisWipe : public ParametricPolyPolygon
{
public:
IrisWipe() : m_unitRect( createUnitRect() ) {}
- virtual ::basegfx::B2DPolyPolygon operator()( double x );
+ virtual ::basegfx::B2DPolyPolygon operator()( double x ) SAL_OVERRIDE;
private:
const ::basegfx::B2DPolyPolygon m_unitRect;
};
diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx
index bc7784a05db0..79d47db5788f 100644
--- a/slideshow/source/engine/transitions/pinwheelwipe.hxx
+++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx
@@ -32,7 +32,7 @@ class PinWheelWipe : public ParametricPolyPolygon
{
public:
PinWheelWipe( sal_Int32 blades ) : m_blades(blades) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
sal_Int32 m_blades;
};
diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx
index f4b7d30f52c2..c1454e21cd19 100644
--- a/slideshow/source/engine/transitions/randomwipe.hxx
+++ b/slideshow/source/engine/transitions/randomwipe.hxx
@@ -37,7 +37,7 @@ public:
RandomWipe( sal_Int32 nElements,
bool randomBars /* true: generates a horizontal random bar wipe,
false: generates a dissolve wipe */ );
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
::boost::scoped_array< ::basegfx::B2DPoint > m_positions;
sal_Int32 m_nElements;
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 123d62861b6d..2365653379a2 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -64,15 +64,15 @@ public:
// Animation interface
virtual void prefetch( const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer );
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE;
virtual void start( const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer );
- virtual void end();
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE;
+ virtual void end() SAL_OVERRIDE;
// NumberAnimation interface
- virtual bool operator()( double nValue );
- virtual double getUnderlyingValue() const;
+ virtual bool operator()( double nValue ) SAL_OVERRIDE;
+ virtual double getUnderlyingValue() const SAL_OVERRIDE;
private:
void end_();
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx
index 396c03ab32ec..b775a644dc10 100644
--- a/slideshow/source/engine/transitions/slidechangebase.hxx
+++ b/slideshow/source/engine/transitions/slidechangebase.hxx
@@ -55,21 +55,21 @@ class SlideChangeBase : public ViewEventHandler,
{
public:
// NumberAnimation
- virtual bool operator()( double x );
- virtual double getUnderlyingValue() const;
+ virtual bool operator()( double x ) SAL_OVERRIDE;
+ virtual double getUnderlyingValue() const SAL_OVERRIDE;
// Animation
virtual void prefetch( const AnimatableShapeSharedPtr&,
- const ShapeAttributeLayerSharedPtr& );
+ const ShapeAttributeLayerSharedPtr& ) SAL_OVERRIDE;
virtual void start( const AnimatableShapeSharedPtr&,
- const ShapeAttributeLayerSharedPtr& );
- virtual void end();
+ const ShapeAttributeLayerSharedPtr& ) SAL_OVERRIDE;
+ virtual void end() SAL_OVERRIDE;
// ViewEventHandler
- virtual void viewAdded( const UnoViewSharedPtr& rView );
- virtual void viewRemoved( const UnoViewSharedPtr& rView );
- virtual void viewChanged( const UnoViewSharedPtr& rView );
- virtual void viewsChanged();
+ virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewsChanged() SAL_OVERRIDE;
protected:
/** Create a new SlideChanger, for the given leaving and
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 9281c4cd5ce1..7c0c078986ea 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -187,7 +187,7 @@ public:
return true;
}
- virtual bool operator()( double t )
+ virtual bool operator()( double t ) SAL_OVERRIDE
{
std::for_each(maTransitions.begin(),
maTransitions.end(),
@@ -202,7 +202,7 @@ public:
}
// ViewEventHandler
- virtual void viewAdded( const UnoViewSharedPtr& rView )
+ virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE
{
OSL_TRACE("PluginSlideChange viewAdded");
SlideChangeBase::viewAdded( rView );
@@ -227,7 +227,7 @@ public:
}
}
- virtual void viewRemoved( const UnoViewSharedPtr& rView )
+ virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE
{
OSL_TRACE("PluginSlideChange viewRemoved");
SlideChangeBase::viewRemoved( rView );
@@ -247,7 +247,7 @@ public:
}
}
- virtual void viewChanged( const UnoViewSharedPtr& rView )
+ virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE
{
OSL_TRACE("PluginSlideChange viewChanged");
SlideChangeBase::viewChanged( rView );
@@ -270,7 +270,7 @@ public:
}
}
- virtual void viewsChanged()
+ virtual void viewsChanged() SAL_OVERRIDE
{
OSL_TRACE("PluginSlideChange viewsChanged");
SlideChangeBase::viewsChanged();
@@ -335,13 +335,13 @@ public:
const ::cppcanvas::CustomSpriteSharedPtr& rSprite,
const ViewEntry& rViewEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
- double t );
+ double t ) SAL_OVERRIDE;
virtual void performOut(
const ::cppcanvas::CustomSpriteSharedPtr& rSprite,
const ViewEntry& rViewEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
- double t );
+ double t ) SAL_OVERRIDE;
private:
ClippingFunctor maClippingFunctor;
@@ -398,19 +398,19 @@ public:
virtual void prepareForRun(
const ViewEntry& rViewEntry,
- const cppcanvas::CanvasSharedPtr& rDestinationCanvas );
+ const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) SAL_OVERRIDE;
virtual void performIn(
const ::cppcanvas::CustomSpriteSharedPtr& rSprite,
const ViewEntry& rViewEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
- double t );
+ double t ) SAL_OVERRIDE;
virtual void performOut(
const ::cppcanvas::CustomSpriteSharedPtr& rSprite,
const ViewEntry& rViewEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
- double t );
+ double t ) SAL_OVERRIDE;
private:
const boost::optional< RGBColor > maFadeColor;
@@ -496,19 +496,19 @@ public:
virtual void prepareForRun(
const ViewEntry& rViewEntry,
- const cppcanvas::CanvasSharedPtr& rDestinationCanvas );
+ const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) SAL_OVERRIDE;
virtual void performIn(
const ::cppcanvas::CustomSpriteSharedPtr& rSprite,
const ViewEntry& rViewEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
- double t );
+ double t ) SAL_OVERRIDE;
virtual void performOut(
const ::cppcanvas::CustomSpriteSharedPtr& rSprite,
const ViewEntry& rViewEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
- double t );
+ double t ) SAL_OVERRIDE;
private:
RGBColor maFadeColor;
@@ -610,19 +610,19 @@ public:
virtual void prepareForRun(
const ViewEntry& rViewEntry,
- const cppcanvas::CanvasSharedPtr& rDestinationCanvas );
+ const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) SAL_OVERRIDE;
virtual void performIn(
const ::cppcanvas::CustomSpriteSharedPtr& rSprite,
const ViewEntry& rViewEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
- double t );
+ double t ) SAL_OVERRIDE;
virtual void performOut(
const ::cppcanvas::CustomSpriteSharedPtr& rSprite,
const ViewEntry& rViewEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
- double t );
+ double t ) SAL_OVERRIDE;
};
void MovingSlideChange::prepareForRun(
diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx
index 56e354069421..898241456ee4 100644
--- a/slideshow/source/engine/transitions/snakewipe.hxx
+++ b/slideshow/source/engine/transitions/snakewipe.hxx
@@ -34,7 +34,7 @@ class SnakeWipe : public ParametricPolyPolygon
{
public:
SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis );
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
protected:
// topLeftHorizontal:
@@ -57,7 +57,7 @@ public:
: SnakeWipe( nElements, diagonal, flipOnYAxis ),
m_opposite( opposite )
{}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
const bool m_opposite;
};
diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx
index 9263b4b6c098..33f04d4d8c2b 100644
--- a/slideshow/source/engine/transitions/spiralwipe.hxx
+++ b/slideshow/source/engine/transitions/spiralwipe.hxx
@@ -34,7 +34,7 @@ class SpiralWipe : public ParametricPolyPolygon
{
public:
SpiralWipe( sal_Int32 nElements, bool flipOnYAxis = false );
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
protected:
::basegfx::B2DPolyPolygon calcNegSpiral( double t ) const;
@@ -49,7 +49,7 @@ class BoxSnakesWipe : public SpiralWipe
public:
BoxSnakesWipe( sal_Int32 nElements, bool fourBox = false )
: SpiralWipe(nElements), m_fourBox(fourBox) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
const bool m_fourBox;
};
diff --git a/slideshow/source/engine/transitions/sweepwipe.hxx b/slideshow/source/engine/transitions/sweepwipe.hxx
index 90990ce15542..0856d22b91b1 100644
--- a/slideshow/source/engine/transitions/sweepwipe.hxx
+++ b/slideshow/source/engine/transitions/sweepwipe.hxx
@@ -34,7 +34,7 @@ public:
: m_center(center), m_single(single),
m_oppositeVertical(oppositeVertical), m_flipOnYAxis(flipOnYAxis)
{}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
const bool m_center, m_single, m_oppositeVertical, m_flipOnYAxis;
};
diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx
index 62fc7ab7ed15..5ed39ab5f386 100644
--- a/slideshow/source/engine/transitions/veewipe.hxx
+++ b/slideshow/source/engine/transitions/veewipe.hxx
@@ -34,7 +34,7 @@ class VeeWipe : public ParametricPolyPolygon
{
public:
VeeWipe() {}
- virtual ::basegfx::B2DPolyPolygon operator()( double x );
+ virtual ::basegfx::B2DPolyPolygon operator()( double x ) SAL_OVERRIDE;
};
}
diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx
index ae1fbbe01a65..b05c7883e5eb 100644
--- a/slideshow/source/engine/transitions/waterfallwipe.hxx
+++ b/slideshow/source/engine/transitions/waterfallwipe.hxx
@@ -32,7 +32,7 @@ class WaterfallWipe : public ParametricPolyPolygon
{
public:
WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis = false );
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
bool m_flipOnYAxis;
::basegfx::B2DPolygon m_waterfall;
diff --git a/slideshow/source/engine/transitions/zigzagwipe.hxx b/slideshow/source/engine/transitions/zigzagwipe.hxx
index b051d6dc9b73..30cf24a49b46 100644
--- a/slideshow/source/engine/transitions/zigzagwipe.hxx
+++ b/slideshow/source/engine/transitions/zigzagwipe.hxx
@@ -32,7 +32,7 @@ class ZigZagWipe : public ParametricPolyPolygon
{
public:
ZigZagWipe( sal_Int32 nZigs );
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
protected:
const double m_zigEdge;
::basegfx::B2DPolygon m_stdZigZag;
@@ -43,7 +43,7 @@ class BarnZigZagWipe : public ZigZagWipe
{
public:
BarnZigZagWipe( sal_Int32 nZigs ) : ZigZagWipe(nZigs) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
};
}
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 4a6c49164aed..38fb738c6cf9 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -63,12 +63,12 @@ typedef std::map<ShapeSharedPtr, ImpEventQueue,
class MouseEventHandler_ : public MouseEventHandler
{
public:
- virtual bool handleMousePressed( awt::MouseEvent const& /*e*/ ) { return false;}
- virtual bool handleMouseReleased( awt::MouseEvent const& /*e*/) { return false;}
- virtual bool handleMouseEntered( awt::MouseEvent const& /*e*/ ) { return false;}
- virtual bool handleMouseExited( awt::MouseEvent const& /*e*/ ) { return false; }
- virtual bool handleMouseDragged( awt::MouseEvent const& /*e*/ ) { return false;}
- virtual bool handleMouseMoved( awt::MouseEvent const& /*e*/ ) { return false; }
+ virtual bool handleMousePressed( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false;}
+ virtual bool handleMouseReleased( awt::MouseEvent const& /*e*/) SAL_OVERRIDE { return false;}
+ virtual bool handleMouseEntered( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false;}
+ virtual bool handleMouseExited( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false; }
+ virtual bool handleMouseDragged( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false;}
+ virtual bool handleMouseMoved( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false; }
};
/** @return one event has been posted
@@ -139,7 +139,7 @@ public:
clearContainer();
}
- virtual bool handleEvent()
+ virtual bool handleEvent() SAL_OVERRIDE
{
return fireAllEvents( maEvents, mrEventQueue );
}
@@ -161,7 +161,7 @@ public:
maAnimationEventMap.clear();
}
- virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode )
+ virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE
{
ENSURE_OR_RETURN_FALSE(
rNode,
@@ -249,13 +249,13 @@ private:
}
// triggered by API calls, e.g. space bar
- virtual bool handleEvent()
+ virtual bool handleEvent() SAL_OVERRIDE
{
return handleEvent_impl();
}
// triggered by mouse release:
- virtual bool handleMouseReleased( const awt::MouseEvent& evt )
+ virtual bool handleMouseReleased( const awt::MouseEvent& evt ) SAL_OVERRIDE
{
if(evt.Buttons != awt::MouseButton::LEFT)
return false;
@@ -301,7 +301,7 @@ public:
void skipEffect (void) { handleEvent_impl(false); }
private:
- virtual bool handleEvent_impl()
+ virtual bool handleEvent_impl() SAL_OVERRIDE
{
return handleEvent_impl(true);
}
@@ -350,7 +350,7 @@ private:
clearContainer();
}
- virtual bool handleMouseReleased( awt::MouseEvent const& evt )
+ virtual bool handleMouseReleased( awt::MouseEvent const& evt ) SAL_OVERRIDE
{
if(evt.Buttons != awt::MouseButton::RIGHT)
return false;
@@ -495,14 +495,14 @@ public:
mrCursorManager( rCursorManager )
{}
- virtual bool handleMouseReleased( const awt::MouseEvent& e )
+ virtual bool handleMouseReleased( const awt::MouseEvent& e ) SAL_OVERRIDE
{
if(e.Buttons != awt::MouseButton::LEFT)
return false;
return processEvent( e );
}
- virtual bool handleMouseMoved( const awt::MouseEvent& e )
+ virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE
{
// TODO(P2): Maybe buffer last shape touched
@@ -527,7 +527,7 @@ public:
: MouseHandlerBase( rEventQueue ),
mpLastShape() {}
- virtual bool handleMouseMoved( const awt::MouseEvent& e )
+ virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE
{
// TODO(P2): Maybe buffer last shape touched, and
// check against that _first_
@@ -565,7 +565,7 @@ public:
: MouseHandlerBase( rEventQueue ),
maLastIter() {}
- virtual bool handleMouseMoved( const awt::MouseEvent& e )
+ virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE
{
// TODO(P2): Maybe buffer last shape touched, and
// check against that _first_
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index 927a37dae709..5f9f5e416355 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -65,10 +65,10 @@ private:
const UnoViewContainer& rViewContainer );
// ViewEventHandler
- virtual void viewAdded( const UnoViewSharedPtr& rView );
- virtual void viewRemoved( const UnoViewSharedPtr& rView );
- virtual void viewChanged( const UnoViewSharedPtr& rView );
- virtual void viewsChanged();
+ virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE;
+ virtual void viewsChanged() SAL_OVERRIDE;
void setVisible( const bool bVisible );
::basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const;
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 00c30df9c727..532c9ab31eb3 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -50,11 +50,11 @@ public:
mbWasFired(false) {}
// Event:
- virtual bool fire();
- virtual bool isCharged() const;
- virtual double getActivationTime( double nCurrentTime ) const;
+ virtual bool fire() SAL_OVERRIDE;
+ virtual bool isCharged() const SAL_OVERRIDE;
+ virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE;
// Disposable:
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
double const mnTimeout;
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index d5f962d69946..9b3234508110 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -44,7 +44,7 @@ namespace slideshow
{
}
- virtual bool fire()
+ virtual bool fire() SAL_OVERRIDE
{
if( mpEvent && isCharged() )
{
@@ -57,7 +57,7 @@ namespace slideshow
return false;
}
- virtual bool isCharged() const
+ virtual bool isCharged() const SAL_OVERRIDE
{
// pass on to wrappee - this ensures that we return
// false on isCharged(), even if the other event has
@@ -65,14 +65,14 @@ namespace slideshow
return !mpEvent ? false : mpEvent->isCharged();
}
- virtual double getActivationTime( double nCurrentTime ) const
+ virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE
{
// enforce _our_ timeout to our clients (this
// overrides any timeout possibly set at the wrappee!)
return nCurrentTime + mnTimeout;
}
- virtual void dispose()
+ virtual void dispose() SAL_OVERRIDE
{
mpEvent.reset();
}
diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx
index 8f534f489435..1db5bfbcbfd5 100644
--- a/slideshow/source/inc/soundplayer.hxx
+++ b/slideshow/source/inc/soundplayer.hxx
@@ -84,10 +84,10 @@ namespace slideshow
void setPlaybackLoop( bool bLoop );
// PauseEventHandler:
- virtual bool handlePause( bool bPauseShow );
+ virtual bool handlePause( bool bPauseShow ) SAL_OVERRIDE;
// Disposable
- virtual void dispose();
+ virtual void dispose() SAL_OVERRIDE;
private:
SoundPlayer(
diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx
index 114d2c83737d..c836c2818e43 100644
--- a/slideshow/source/inc/wakeupevent.hxx
+++ b/slideshow/source/inc/wakeupevent.hxx
@@ -45,10 +45,10 @@ public:
::boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
ActivitiesQueue & rActivityQueue );
- virtual void dispose();
- virtual bool fire();
- virtual bool isCharged() const;
- virtual double getActivationTime( double nCurrentTime ) const;
+ virtual void dispose() SAL_OVERRIDE;
+ virtual bool fire() SAL_OVERRIDE;
+ virtual bool isCharged() const SAL_OVERRIDE;
+ virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE;
/// Start the internal timer
void start();