summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/animationnodes
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /slideshow/source/engine/animationnodes
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'slideshow/source/engine/animationnodes')
-rw-r--r--slideshow/source/engine/animationnodes/animationaudionode.hxx10
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.hxx14
-rw-r--r--slideshow/source/engine/animationnodes/animationcolornode.cxx10
-rw-r--r--slideshow/source/engine/animationnodes/animationcolornode.hxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationcommandnode.hxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationpathmotionnode.hxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationsetnode.hxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.hxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx4
-rw-r--r--slideshow/source/engine/animationnodes/basecontainernode.hxx16
-rw-r--r--slideshow/source/engine/animationnodes/basenode.hxx20
-rw-r--r--slideshow/source/engine/animationnodes/paralleltimecontainer.hxx6
-rw-r--r--slideshow/source/engine/animationnodes/propertyanimationnode.hxx4
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx8
-rw-r--r--slideshow/source/engine/animationnodes/setactivity.hxx14
15 files changed, 66 insertions, 66 deletions
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx
index ab3a4466a28f..a30ece2a4eae 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() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
- virtual void activate_st() SAL_OVERRIDE;
- virtual void deactivate_st( NodeState eDestState ) SAL_OVERRIDE;
- virtual bool hasPendingAnimation() const SAL_OVERRIDE;
+ virtual void activate_st() override;
+ virtual void deactivate_st( NodeState eDestState ) override;
+ virtual bool hasPendingAnimation() const override;
/// overridden, because we need to deal with STOPAUDIO commands
- virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE;
+ virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) override;
private:
::com::sun::star::uno::Reference<
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index eef75d016c59..3d3f05668e18 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -45,11 +45,11 @@ public:
NodeContext const& rContext );
#if defined(DBG_UTIL)
- virtual void showState() const SAL_OVERRIDE;
+ virtual void showState() const override;
#endif
protected:
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() 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 SAL_OVERRIDE;
+ virtual bool hasPendingAnimation() const override;
private: // state transition callbacks
- 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 bool init_st() override;
+ virtual bool resolve_st() override;
+ virtual void activate_st() override;
+ virtual void deactivate_st( NodeState eDestState ) override;
virtual AnimationActivitySharedPtr createActivity() const = 0;
private:
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx
index 78ac12e06a33..2ba8e10baa04 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx
@@ -50,26 +50,26 @@ public:
}
virtual void prefetch( const AnimatableShapeSharedPtr&,
- const ShapeAttributeLayerSharedPtr& ) SAL_OVERRIDE
+ const ShapeAttributeLayerSharedPtr& ) override
{}
virtual void start( const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) override
{
mpAnimation->start( rShape, rAttrLayer );
}
- virtual void end() SAL_OVERRIDE
+ virtual void end() override
{
mpAnimation->end();
}
- virtual bool operator()( const HSLColor& rColor ) SAL_OVERRIDE
+ virtual bool operator()( const HSLColor& rColor ) override
{
return (*mpAnimation)( RGBColor( rColor ) );
}
- virtual HSLColor getUnderlyingValue() const SAL_OVERRIDE
+ virtual HSLColor getUnderlyingValue() const override
{
return HSLColor( mpAnimation->getUnderlyingValue() );
}
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.hxx b/slideshow/source/engine/animationnodes/animationcolornode.hxx
index 5e37bda93876..ab05d632975c 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.hxx
@@ -38,11 +38,11 @@ public:
mxColorNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const SAL_OVERRIDE { return "AnimationColorNode"; }
+ virtual const char* getDescription() const override { return "AnimationColorNode"; }
#endif
private:
- virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
+ virtual AnimationActivitySharedPtr createActivity() const 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 30a89e96f47a..545e5821b29e 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -43,11 +43,11 @@ public:
NodeContext const& rContext );
protected:
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
- virtual void activate_st() SAL_OVERRIDE;
- virtual bool hasPendingAnimation() const SAL_OVERRIDE;
+ virtual void activate_st() override;
+ virtual bool hasPendingAnimation() const override;
private:
IExternalMediaShapeBaseSharedPtr mpShape;
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
index 4393030fbbf4..5954f5a7af64 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.hxx
@@ -37,15 +37,15 @@ public:
mxPathMotionNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const SAL_OVERRIDE
+ virtual const char* getDescription() const override
{ return "AnimationPathMotionNode"; }
#endif
protected:
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
- virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
+ virtual AnimationActivitySharedPtr createActivity() const 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 20e41f457357..11771fd4d206 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx
@@ -35,11 +35,11 @@ public:
: AnimationBaseNode( xNode, pParent, rContext ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const SAL_OVERRIDE { return "AnimationSetNode"; }
+ virtual const char* getDescription() const override { return "AnimationSetNode"; }
#endif
private:
- virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
+ virtual AnimationActivitySharedPtr createActivity() const override;
void implScheduleDeactivationEvent();
};
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
index f942ec7d77ec..7f33847321cf 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
@@ -38,15 +38,15 @@ public:
mxTransformNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const SAL_OVERRIDE
+ virtual const char* getDescription() const override
{ return "AnimationTransformNode"; }
#endif
protected:
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
- virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
+ virtual AnimationActivitySharedPtr createActivity() const 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 148fdd8db2a0..bf94f14580a7 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() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
- virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
+ virtual AnimationActivitySharedPtr createActivity() const 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 cdefda11ea8c..48e3e021a24b 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.hxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx
@@ -41,23 +41,23 @@ public:
void appendChildNode( AnimationNodeSharedPtr const& pNode );
#if defined(DBG_UTIL)
- virtual void showState() const SAL_OVERRIDE;
- virtual const char* getDescription() const SAL_OVERRIDE { return "BaseContainerNode"; }
+ virtual void showState() const override;
+ virtual const char* getDescription() const override { return "BaseContainerNode"; }
#endif
protected:
// overrides from BaseNode
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
- virtual bool init_st() SAL_OVERRIDE;
+ virtual bool init_st() override;
bool init_children();
- virtual void deactivate_st( NodeState eDestState ) SAL_OVERRIDE;
- virtual bool hasPendingAnimation() const SAL_OVERRIDE;
+ virtual void deactivate_st( NodeState eDestState ) override;
+ virtual bool hasPendingAnimation() const override;
// force to be implemented by derived class:
- virtual void activate_st() SAL_OVERRIDE = 0;
+ virtual void activate_st() override = 0;
virtual void notifyDeactivating(
- AnimationNodeSharedPtr const& rNotifier ) SAL_OVERRIDE = 0;
+ AnimationNodeSharedPtr const& rNotifier ) 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 4e9e5c527374..28322a5385af 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -102,21 +102,21 @@ public:
{ return mpParent; }
// Disposable:
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
// AnimationNode:
- 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 bool init() override;
+ virtual bool resolve() override;
+ virtual bool activate() override;
+ virtual void deactivate() override;
+ virtual void end() override;
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::animations::XAnimationNode> getXAnimationNode() const SAL_OVERRIDE;
- virtual NodeState getState() const SAL_OVERRIDE;
+ ::com::sun::star::animations::XAnimationNode> getXAnimationNode() const override;
+ virtual NodeState getState() const override;
virtual bool registerDeactivatingListener(
- const AnimationNodeSharedPtr& rNotifee ) SAL_OVERRIDE;
+ const AnimationNodeSharedPtr& rNotifee ) override;
// nop:
- virtual void notifyDeactivating( const AnimationNodeSharedPtr& rNotifier ) SAL_OVERRIDE;
+ virtual void notifyDeactivating( const AnimationNodeSharedPtr& rNotifier ) override;
bool isMainSequenceRootNode() const { return mbIsMainSequenceRootNode; }
diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
index afda437867b2..ea9a97b8f554 100644
--- a/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.hxx
@@ -39,13 +39,13 @@ public:
: BaseContainerNode( xNode, rParent, rContext ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const SAL_OVERRIDE
+ virtual const char* getDescription() const override
{ return "ParallelTimeContainer"; }
#endif
private:
- virtual void activate_st() SAL_OVERRIDE;
- virtual void notifyDeactivating( AnimationNodeSharedPtr const& pChildNode ) SAL_OVERRIDE;
+ virtual void activate_st() override;
+ virtual void notifyDeactivating( AnimationNodeSharedPtr const& pChildNode ) override;
};
} // namespace internal
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
index 1ada4d2e18fd..da4ef57cd387 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.hxx
@@ -35,12 +35,12 @@ public:
: AnimationBaseNode( xNode, pParent, rContext ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const SAL_OVERRIDE
+ virtual const char* getDescription() const override
{ return "PropertyAnimationNode"; }
#endif
private:
- virtual AnimationActivitySharedPtr createActivity() const SAL_OVERRIDE;
+ virtual AnimationActivitySharedPtr createActivity() const override;
};
} // namespace internal
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index bf1e3069bdd8..900069e10d4c 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -39,16 +39,16 @@ public:
: BaseContainerNode( xNode, pParent, rContext ) {}
#if defined(DBG_UTIL)
- virtual const char* getDescription() const SAL_OVERRIDE
+ virtual const char* getDescription() const override
{ return "SequentialTimeContainer"; }
#endif
protected:
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
- virtual void activate_st() SAL_OVERRIDE;
- virtual void notifyDeactivating( AnimationNodeSharedPtr const& rNotifier ) SAL_OVERRIDE;
+ virtual void activate_st() override;
+ virtual void notifyDeactivating( AnimationNodeSharedPtr const& rNotifier ) override;
void skipEffect( AnimationNodeSharedPtr const& pChildNode );
diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx
index d96a35bcc2ca..5ed09433d5bd 100644
--- a/slideshow/source/engine/animationnodes/setactivity.hxx
+++ b/slideshow/source/engine/animationnodes/setactivity.hxx
@@ -59,7 +59,7 @@ public:
ENSURE_OR_THROW( mpAnimation, "Invalid animation" );
}
- virtual void dispose() SAL_OVERRIDE
+ virtual void dispose() override
{
mbIsActive = false;
mpAnimation.reset();
@@ -71,12 +71,12 @@ public:
mpEndEvent.reset();
}
- virtual double calcTimeLag() const SAL_OVERRIDE
+ virtual double calcTimeLag() const override
{
return 0.0;
}
- virtual bool perform() SAL_OVERRIDE
+ virtual bool perform() override
{
if (! isActive())
return false;
@@ -95,22 +95,22 @@ public:
return false; // don't reinsert
}
- virtual bool isActive() const SAL_OVERRIDE
+ virtual bool isActive() const override
{
return mbIsActive;
}
- virtual void dequeued() SAL_OVERRIDE
+ virtual void dequeued() override
{
}
- virtual void end() SAL_OVERRIDE
+ virtual void end() override
{
perform();
}
virtual void setTargets( const AnimatableShapeSharedPtr& rShape,
- const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE
+ const ShapeAttributeLayerSharedPtr& rAttrLayer ) override
{
ENSURE_OR_THROW( rShape, "Invalid shape" );
ENSURE_OR_THROW( rAttrLayer, "Invalid attribute layer" );