diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /slideshow | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'slideshow')
78 files changed, 511 insertions, 511 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 736c8c750c61..c6c55cdd4e14 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -610,7 +610,7 @@ public: {} private: - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) SAL_OVERRIDE; + virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; }; void RochadeTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) @@ -1133,7 +1133,7 @@ public: {} private: - virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) SAL_OVERRIDE; + virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) override; // mmPrepare = &OGLTransitionImpl::prepareDiamond; }; @@ -1236,7 +1236,7 @@ public: {} private: - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) SAL_OVERRIDE; + virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; }; void FadeSmoothlyTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) @@ -1317,7 +1317,7 @@ public: {} private: - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) SAL_OVERRIDE; + virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; }; void FadeThroughBlackTransition::displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) @@ -1390,9 +1390,9 @@ protected: {} private: - virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) SAL_OVERRIDE; - virtual void prepareTransition( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ) SAL_OVERRIDE; - virtual void finishTransition() SAL_OVERRIDE; + virtual void displaySlides_( double nTime, ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override; + virtual void prepareTransition( ::sal_Int32 glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex ) override; + virtual void finishTransition() override; virtual GLuint makeShader() = 0; void impl_preparePermShader(); @@ -1550,7 +1550,7 @@ public: {} private: - virtual GLuint makeShader() SAL_OVERRIDE; + virtual GLuint makeShader() override; }; GLuint StaticNoiseTransition::makeShader() @@ -1601,7 +1601,7 @@ public: {} private: - virtual GLuint makeShader() SAL_OVERRIDE; + virtual GLuint makeShader() override; }; GLuint DissolveTransition::makeShader() diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx index 01443b058e37..03ffd8409777 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx @@ -259,9 +259,9 @@ class Iris : public SceneObject public: Iris (); - virtual void prepare() SAL_OVERRIDE; - virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight) const SAL_OVERRIDE; - virtual void finish() SAL_OVERRIDE; + virtual void prepare() override; + virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight) const override; + virtual void finish() override; private: GLuint maTexture; @@ -369,7 +369,7 @@ protected: class SRotate: public Operation { public: - virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const SAL_OVERRIDE; + virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const override; /** Constructor @@ -418,7 +418,7 @@ makeSRotate(const glm::vec3& Axis, const glm::vec3& Origin, double Angle, class SScale: public Operation { public: - virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const SAL_OVERRIDE; + virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const override; /** Constructor @@ -453,7 +453,7 @@ makeSScale(const glm::vec3& Scale, const glm::vec3& Origin,bool bInter, double T class STranslate: public Operation { public: - virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const SAL_OVERRIDE; + virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const override; /** Constructor @@ -486,7 +486,7 @@ makeSTranslate(const glm::vec3& Vector,bool bInter, double T0, double T1); class SEllipseTranslate: public Operation { public: - virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const SAL_OVERRIDE; + virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const override; /** Constructor @@ -524,7 +524,7 @@ makeSEllipseTranslate(double dWidth, double dHeight, double dStartPosition, doub class RotateAndScaleDepthByWidth: public Operation { public: - virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const SAL_OVERRIDE; + virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const override; RotateAndScaleDepthByWidth(const glm::vec3& Axis,const glm::vec3& Origin,double Angle,bool bInter, double T0, double T1); virtual ~RotateAndScaleDepthByWidth(){} @@ -542,7 +542,7 @@ makeRotateAndScaleDepthByWidth(const glm::vec3& Axis,const glm::vec3& Origin,dou class RotateAndScaleDepthByHeight: public Operation { public: - virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const SAL_OVERRIDE; + virtual void interpolate(double t,double SlideWidthScale,double SlideHeightScale) const override; RotateAndScaleDepthByHeight(const glm::vec3& Axis,const glm::vec3& Origin,double Angle,bool bInter, double T0, double T1); virtual ~RotateAndScaleDepthByHeight(){} diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index c8cf1f1c7c08..b0198fc6e514 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -181,17 +181,17 @@ public: // XTransition virtual void SAL_CALL update( double nTime ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL viewChanged( const Reference< presentation::XSlideShowView >& rView, const Reference< rendering::XBitmap >& rLeavingBitmap, const Reference< rendering::XBitmap >& rEnteringBitmap ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; protected: void disposeTextures(); // WeakComponentImplHelperBase - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; bool isDisposed() const { @@ -611,25 +611,25 @@ namespace uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::RuntimeException, std::exception) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -637,7 +637,7 @@ namespace convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -654,7 +654,7 @@ namespace } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -671,7 +671,7 @@ namespace } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -688,7 +688,7 @@ namespace } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -705,7 +705,7 @@ namespace } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -722,7 +722,7 @@ namespace } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -741,21 +741,21 @@ namespace } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override { return util::Endianness::LITTLE; } virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::RuntimeException, std::exception) override { if( dynamic_cast<OGLColorSpace*>(targetColorSpace.get()) ) { @@ -787,7 +787,7 @@ namespace } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::RuntimeException, std::exception) override { if( dynamic_cast<OGLColorSpace*>(targetColorSpace.get()) ) { @@ -803,7 +803,7 @@ namespace return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -824,7 +824,7 @@ namespace return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -846,7 +846,7 @@ namespace return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -869,7 +869,7 @@ namespace return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -887,7 +887,7 @@ namespace return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -905,7 +905,7 @@ namespace return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -1415,7 +1415,7 @@ public: {} // XTransitionFactory - virtual sal_Bool SAL_CALL hasTransition( ::sal_Int16 transitionType, ::sal_Int16 transitionSubType ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasTransition( ::sal_Int16 transitionType, ::sal_Int16 transitionSubType ) throw (uno::RuntimeException, std::exception) override { if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) { switch( transitionSubType ) @@ -1457,7 +1457,7 @@ public: const uno::Reference< presentation::XSlideShowView >& view, const uno::Reference< rendering::XBitmap >& leavingBitmap, const uno::Reference< rendering::XBitmap >& enteringBitmap ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (uno::RuntimeException, std::exception) override { if( !hasTransition( transitionType, transitionSubType ) ) return uno::Reference< presentation::XTransition >(); diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 713c2bfafb1f..fe3f01837a34 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -877,7 +877,7 @@ public: ENSURE_OR_THROW( mpAnim, "Invalid animation object" ); } - virtual void startAnimation() SAL_OVERRIDE + virtual void startAnimation() override { if (this->isDisposed() || !mpAnim) return; @@ -888,7 +888,7 @@ public: getShapeAttributeLayer() ); } - virtual void endAnimation() SAL_OVERRIDE + virtual void endAnimation() override { // end animation if (mpAnim) @@ -898,7 +898,7 @@ public: using SimpleContinuousActivityBase::perform; /// perform override for ContinuousActivityBase - virtual void perform( double nModifiedTime, sal_uInt32 ) const SAL_OVERRIDE + virtual void perform( double nModifiedTime, sal_uInt32 ) const override { if (this->isDisposed() || !mpAnim) return; @@ -906,7 +906,7 @@ public: (*mpAnim)( 1.0 - Direction + nModifiedTime*(2.0*Direction - 1.0) ); } - virtual void performEnd() SAL_OVERRIDE + virtual void performEnd() override { // xxx todo: review if (mpAnim) @@ -914,7 +914,7 @@ public: } /// Disposable: - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { mpAnim.reset(); ContinuousActivityBase::dispose(); diff --git a/slideshow/source/engine/activities/activitybase.hxx b/slideshow/source/engine/activities/activitybase.hxx index 62c183f1ebaa..50de04542a98 100644 --- a/slideshow/source/engine/activities/activitybase.hxx +++ b/slideshow/source/engine/activities/activitybase.hxx @@ -40,7 +40,7 @@ public: explicit ActivityBase( const ActivityParameters& rParms ); /// From Disposable interface - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() 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() SAL_OVERRIDE; - virtual double calcTimeLag() const SAL_OVERRIDE; - virtual bool isActive() const SAL_OVERRIDE; + virtual bool perform() override; + virtual double calcTimeLag() const override; + virtual bool isActive() const override; private: - virtual void dequeued() SAL_OVERRIDE; + virtual void dequeued() override; // From AnimationActivity interface virtual void setTargets( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE; + const ShapeAttributeLayerSharedPtr& rAttrLayer ) override; private: /** Hook for derived classes @@ -117,7 +117,7 @@ protected: private: /// Activity: - virtual void end() SAL_OVERRIDE; + virtual void end() override; virtual void performEnd() = 0; private: diff --git a/slideshow/source/engine/activities/continuousactivitybase.hxx b/slideshow/source/engine/activities/continuousactivitybase.hxx index 12a30415241b..1aeea9d173b2 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_OVERRIDE; + sal_uInt32 nRepeatCount ) const override; }; } } diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx index 10b1ece7f3ec..66271718f36e 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_OVERRIDE; + sal_uInt32 nRepeatCount ) const override; private: const ::basegfx::tools::KeyStopLerp maLerper; diff --git a/slideshow/source/engine/activities/discreteactivitybase.hxx b/slideshow/source/engine/activities/discreteactivitybase.hxx index 165e9c394a8d..49d039f71389 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() SAL_OVERRIDE; - virtual bool perform() SAL_OVERRIDE; + virtual void dispose() override; + virtual bool perform() override; protected: - virtual void startAnimation() SAL_OVERRIDE; + virtual void startAnimation() 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 473082c04304..b59b8b7031f2 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx @@ -39,8 +39,8 @@ namespace slideshow public: explicit SimpleContinuousActivityBase( const ActivityParameters& rParms ); - virtual double calcTimeLag() const SAL_OVERRIDE; - virtual bool perform() SAL_OVERRIDE; + virtual double calcTimeLag() const override; + virtual bool perform() 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() SAL_OVERRIDE; + virtual void startAnimation() override; private: /// Time elapsed since activity started diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 32f5e3a85cb0..55f3f2f52f2e 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -90,11 +90,11 @@ namespace slideshow // Animation interface 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 { OSL_ENSURE( !mpShape, "TupleAnimation::start(): Shape already set" ); @@ -118,7 +118,7 @@ namespace slideshow } } - virtual void end() SAL_OVERRIDE { end_(); } + virtual void end() override { end_(); } void end_() { if( mbAnimationStarted ) @@ -136,7 +136,7 @@ namespace slideshow // PairAnimation interface - virtual bool operator()( const ::basegfx::B2DTuple& rValue ) SAL_OVERRIDE + virtual bool operator()( const ::basegfx::B2DTuple& rValue ) override { ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape, "TupleAnimation::operator(): Invalid ShapeAttributeLayer" ); @@ -157,7 +157,7 @@ namespace slideshow return true; } - virtual ::basegfx::B2DTuple getUnderlyingValue() const SAL_OVERRIDE + virtual ::basegfx::B2DTuple getUnderlyingValue() const override { ENSURE_OR_THROW( mpAttrLayer, "TupleAnimation::getUnderlyingValue(): Invalid ShapeAttributeLayer" ); @@ -244,11 +244,11 @@ namespace slideshow // Animation interface 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 { OSL_ENSURE( !mpShape, "PathAnimation::start(): Shape already set" ); @@ -281,7 +281,7 @@ namespace slideshow } } - virtual void end() SAL_OVERRIDE { end_(); } + virtual void end() override { end_(); } void end_() { if( mbAnimationStarted ) @@ -299,7 +299,7 @@ namespace slideshow // NumberAnimation interface - virtual bool operator()( double nValue ) SAL_OVERRIDE + virtual bool operator()( double nValue ) override { ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape, "PathAnimation::operator(): Invalid ShapeAttributeLayer" ); @@ -328,7 +328,7 @@ namespace slideshow return true; } - virtual double getUnderlyingValue() const SAL_OVERRIDE + virtual double getUnderlyingValue() const 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 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" ); diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index 00f51464ee0d..5fcf1f5b4bb2 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -49,7 +49,7 @@ public: virtual ~RewinderEventHandler() {} private: const Action maAction; - virtual bool handleEvent() SAL_OVERRIDE { return maAction(); } + virtual bool handleEvent() override { return maAction(); } }; @@ -62,7 +62,7 @@ public: virtual ~RewinderAnimationEventHandler() {} private: const Action maAction; - virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode) SAL_OVERRIDE + virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode) override { return maAction(rpNode); } }; diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 9d295498f93c..6de09f2c8cf8 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -131,27 +131,27 @@ public: } // WeakComponentImplHelperBase::disposing - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; private: virtual void SAL_CALL disposing( const lang::EventObject& Source ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // XMouseListener implementation virtual void SAL_CALL mousePressed( const awt::MouseEvent& e ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseReleased( const awt::MouseEvent& e ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseEntered( const awt::MouseEvent& e ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseExited( const awt::MouseEvent& e ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // XMouseMotionListener implementation virtual void SAL_CALL mouseDragged( const awt::MouseEvent& e ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL mouseMoved( const awt::MouseEvent& e ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; EventQueue* mpEventQueue; diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx index bb2432965adc..2c9dc9e1c8b8 100644 --- a/slideshow/source/engine/expressionnodefactory.cxx +++ b/slideshow/source/engine/expressionnodefactory.cxx @@ -43,12 +43,12 @@ namespace slideshow { } - virtual double operator()( double /*t*/ ) const SAL_OVERRIDE + virtual double operator()( double /*t*/ ) const override { return maValue; } - virtual bool isConstant() const SAL_OVERRIDE + virtual bool isConstant() const override { return true; } @@ -64,12 +64,12 @@ namespace slideshow { } - virtual double operator()( double t ) const SAL_OVERRIDE + virtual double operator()( double t ) const override { return t; } - virtual bool isConstant() const SAL_OVERRIDE + virtual bool isConstant() const override { return false; } @@ -91,7 +91,7 @@ namespace slideshow { } - virtual bool isConstant() const SAL_OVERRIDE + virtual bool isConstant() const override { return mpFirstArg->isConstant() && @@ -112,7 +112,7 @@ namespace slideshow { } - virtual double operator()( double t ) const SAL_OVERRIDE + virtual double operator()( double t ) const override { return (*mpFirstArg)(t) + (*mpSecondArg)(t); } @@ -127,7 +127,7 @@ namespace slideshow { } - virtual double operator()( double t ) const SAL_OVERRIDE + virtual double operator()( double t ) const override { return (*mpFirstArg)(t) - (*mpSecondArg)(t); } @@ -142,7 +142,7 @@ namespace slideshow { } - virtual double operator()( double t ) const SAL_OVERRIDE + virtual double operator()( double t ) const override { return (*mpFirstArg)(t) * (*mpSecondArg)(t); } @@ -157,7 +157,7 @@ namespace slideshow { } - virtual double operator()( double t ) const SAL_OVERRIDE + virtual double operator()( double t ) const override { return (*mpFirstArg)(t) / (*mpSecondArg)(t); } @@ -172,7 +172,7 @@ namespace slideshow { } - virtual double operator()( double t ) const SAL_OVERRIDE + virtual double operator()( double t ) const override { return ::std::min( (*mpFirstArg)(t), (*mpSecondArg)(t) ); } @@ -187,7 +187,7 @@ namespace slideshow { } - virtual double operator()( double t ) const SAL_OVERRIDE + virtual double operator()( double t ) const override { return ::std::max( (*mpFirstArg)(t), (*mpSecondArg)(t) ); } diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx index 3671109962fe..f577e51f20f7 100644 --- a/slideshow/source/engine/pointersymbol.hxx +++ b/slideshow/source/engine/pointersymbol.hxx @@ -56,10 +56,10 @@ private: const UnoViewContainer& rViewContainer ); // ViewEventHandler - 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; + virtual void viewAdded( const UnoViewSharedPtr& rView ) override; + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override; + virtual void viewChanged( const UnoViewSharedPtr& rView ) override; + virtual void viewsChanged() override; ::basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const; diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 47f18e94a52d..adfb7ea74506 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -69,8 +69,8 @@ public: mrActivityQueue( rActivityQueue ) {} - virtual void dispose() SAL_OVERRIDE {} - virtual bool fire() SAL_OVERRIDE + virtual void dispose() override {} + virtual bool fire() override { ActivitySharedPtr pActivity( mpActivity.lock() ); if( !pActivity ) @@ -79,8 +79,8 @@ public: return mrActivityQueue.addActivity( pActivity ); } - virtual bool isCharged() const SAL_OVERRIDE { return true; } - virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE + virtual bool isCharged() const override { return true; } + virtual double getActivationTime( double nCurrentTime ) const override { const double nElapsedTime( maTimer.getElapsedTime() ); @@ -118,10 +118,10 @@ public: bool hasBeenClicked() const { return mbHasBeenClicked; } // MouseEventHandler - virtual bool handleMousePressed( awt::MouseEvent const & evt ) SAL_OVERRIDE; - virtual bool handleMouseReleased( awt::MouseEvent const & evt ) SAL_OVERRIDE; - virtual bool handleMouseDragged( awt::MouseEvent const & evt ) SAL_OVERRIDE; - virtual bool handleMouseMoved( awt::MouseEvent const & evt ) SAL_OVERRIDE; + virtual bool handleMousePressed( awt::MouseEvent const & evt ) override; + virtual bool handleMouseReleased( awt::MouseEvent const & evt ) override; + virtual bool handleMouseDragged( awt::MouseEvent const & evt ) override; + virtual bool handleMouseMoved( awt::MouseEvent const & evt ) 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 79f01f45f4a8..40850a51b5aa 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 ) SAL_OVERRIDE; - virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; - virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; - virtual void viewsChanged() SAL_OVERRIDE; + virtual void viewAdded( const UnoViewSharedPtr& rView ) override; + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override; + virtual void viewChanged( const UnoViewSharedPtr& rView ) override; + virtual void viewsChanged() override; // Disposable: - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Activity: - 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; + virtual double calcTimeLag() const override; + virtual bool perform() override; + virtual bool isActive() const override; + virtual void dequeued() override; + virtual void end() override; private: class WakeupEvent; diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index f2930530ba60..0959fdb2db3d 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -33,7 +33,7 @@ namespace { public: UpdateLock (::slideshow::internal::ScreenUpdater& rUpdater, const bool bStartLocked); virtual ~UpdateLock(); - virtual void Activate() SAL_OVERRIDE; + virtual void Activate() 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 cd7f14b2ce6e..8321f43b1b82 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -81,22 +81,22 @@ namespace slideshow virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) SAL_OVERRIDE; - virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) SAL_OVERRIDE; - virtual bool clearAllViewLayers() SAL_OVERRIDE; + bool bRedrawLayer ) override; + virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) override; + virtual bool clearAllViewLayers() override; // ExternalShapeBase methods - 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; + virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const override; + virtual void implViewChanged( const UnoViewSharedPtr& rView ) override; + virtual void implViewsChanged() override; + virtual bool implStartIntrinsicAnimation() override; + virtual bool implEndIntrinsicAnimation() override; + virtual bool implPauseIntrinsicAnimation() override; + virtual bool implIsIntrinsicAnimationPlaying() const override; + virtual void implSetIntrinsicAnimationTime(double) override; const OUString maServiceName; const char** mpPropCopyTable; diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index dc71e0d4dc1d..3bb51a96e642 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -74,34 +74,34 @@ namespace slideshow const SlideShowContext& rContext ); // throw ShapeLoadFailedException; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > getXShape() const SAL_OVERRIDE; + ::com::sun::star::drawing::XShape > getXShape() const override; // View layer methods virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) SAL_OVERRIDE; - virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) SAL_OVERRIDE; - virtual bool clearAllViewLayers() SAL_OVERRIDE; + bool bRedrawLayer ) override; + virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) override; + virtual bool clearAllViewLayers() override; // attribute methods - 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; + virtual ::basegfx::B2DRectangle getBounds() const override; + virtual ::basegfx::B2DRectangle getDomBounds() const override; + virtual ::basegfx::B2DRectangle getUpdateArea() const override; + virtual bool isVisible() const override; + virtual double getPriority() const override; + virtual bool isBackgroundDetached() const override; // render methods - virtual bool update() const SAL_OVERRIDE; - virtual bool render() const SAL_OVERRIDE; - virtual bool isContentChanged() const SAL_OVERRIDE; + virtual bool update() const override; + virtual bool render() const override; + virtual bool isContentChanged() const 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 bbc0d53c7814..e0fd273de977 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() SAL_OVERRIDE; + virtual void dispose() override; // Activity: - 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; + virtual double calcTimeLag() const override; + virtual bool perform() override; + virtual bool isActive() const override; + virtual void dequeued() override; + virtual void end() override; private: void updateShapeAttributes( double fTime, @@ -255,8 +255,8 @@ public: private: - virtual bool enableAnimations() SAL_OVERRIDE { return mrActivity.enableAnimations(); } - virtual bool disableAnimations() SAL_OVERRIDE { mrActivity.end(); return true; } + virtual bool enableAnimations() override { return mrActivity.enableAnimations(); } + virtual bool disableAnimations() override { mrActivity.end(); return true; } ActivityImpl& mrActivity; }; diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index 603cf2ac398e..377da5653438 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 SAL_OVERRIDE; + ::com::sun::star::drawing::XShape > getXShape() const override; virtual ~DrawShape(); @@ -128,68 +128,68 @@ namespace slideshow virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) SAL_OVERRIDE; - virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) SAL_OVERRIDE; - virtual bool clearAllViewLayers() SAL_OVERRIDE; + bool bRedrawLayer ) override; + virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) override; + virtual bool clearAllViewLayers() override; // attribute methods - 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; + virtual ShapeAttributeLayerSharedPtr createAttributeLayer() override; + virtual bool revokeAttributeLayer( const ShapeAttributeLayerSharedPtr& rLayer ) override; + virtual ShapeAttributeLayerSharedPtr getTopmostAttributeLayer() const override; + virtual void setVisibility( bool bVisible ) override; + virtual ::basegfx::B2DRectangle getBounds() const override; + virtual ::basegfx::B2DRectangle getDomBounds() const override; + virtual ::basegfx::B2DRectangle getUpdateArea() const override; + virtual bool isVisible() const override; + virtual double getPriority() const override; // animation methods - virtual void enterAnimationMode() SAL_OVERRIDE; - virtual void leaveAnimationMode() SAL_OVERRIDE; - virtual bool isBackgroundDetached() const SAL_OVERRIDE; + virtual void enterAnimationMode() override; + virtual void leaveAnimationMode() override; + virtual bool isBackgroundDetached() const override; // render methods - virtual bool update() const SAL_OVERRIDE; - virtual bool render() const SAL_OVERRIDE; - virtual bool isContentChanged() const SAL_OVERRIDE; + virtual bool update() const override; + virtual bool render() const override; + virtual bool isContentChanged() const override; // Sub item specialities - virtual const DocTreeNodeSupplier& getTreeNodeSupplier() const SAL_OVERRIDE; - virtual DocTreeNodeSupplier& getTreeNodeSupplier() SAL_OVERRIDE; + virtual const DocTreeNodeSupplier& getTreeNodeSupplier() const override; + virtual DocTreeNodeSupplier& getTreeNodeSupplier() override; - virtual DocTreeNode getSubsetNode() const SAL_OVERRIDE; - virtual AttributableShapeSharedPtr getSubset( const DocTreeNode& rTreeNode ) const SAL_OVERRIDE; + virtual DocTreeNode getSubsetNode() const override; + virtual AttributableShapeSharedPtr getSubset( const DocTreeNode& rTreeNode ) const override; virtual bool createSubset( AttributableShapeSharedPtr& o_rSubset, - const DocTreeNode& rTreeNode ) SAL_OVERRIDE; - virtual bool revokeSubset( const AttributableShapeSharedPtr& rShape ) SAL_OVERRIDE; + const DocTreeNode& rTreeNode ) override; + virtual bool revokeSubset( const AttributableShapeSharedPtr& rShape ) override; // DocTreeNodeSupplier methods - virtual sal_Int32 getNumberOfTreeNodes ( DocTreeNode::NodeType eNodeType ) const SAL_OVERRIDE; // throw ShapeLoadFailedException; + virtual sal_Int32 getNumberOfTreeNodes ( DocTreeNode::NodeType eNodeType ) const override; // throw ShapeLoadFailedException; virtual DocTreeNode getTreeNode ( sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const SAL_OVERRIDE; // throw ShapeLoadFailedException; + DocTreeNode::NodeType eNodeType ) const override; // throw ShapeLoadFailedException; virtual sal_Int32 getNumberOfSubsetTreeNodes ( const DocTreeNode& rParentNode, - DocTreeNode::NodeType eNodeType ) const SAL_OVERRIDE; // throw ShapeLoadFailedException; + DocTreeNode::NodeType eNodeType ) const override; // throw ShapeLoadFailedException; virtual DocTreeNode getSubsetTreeNode ( const DocTreeNode& rParentNode, sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const SAL_OVERRIDE; // throw ShapeLoadFailedException; + DocTreeNode::NodeType eNodeType ) const override; // throw ShapeLoadFailedException; // HyperlinkArea methods - virtual HyperlinkRegions getHyperlinkRegions() const SAL_OVERRIDE; - virtual double getHyperlinkPriority() const SAL_OVERRIDE; + virtual HyperlinkRegions getHyperlinkRegions() const override; + virtual double getHyperlinkPriority() const override; // intrinsic animation methods diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 263e7b490ab1..a193c49007bb 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -54,13 +54,13 @@ namespace slideshow // ViewEventHandler - virtual void viewAdded( const UnoViewSharedPtr& ) SAL_OVERRIDE {} - virtual void viewRemoved( const UnoViewSharedPtr& ) SAL_OVERRIDE {} - virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewAdded( const UnoViewSharedPtr& ) override {} + virtual void viewRemoved( const UnoViewSharedPtr& ) override {} + virtual void viewChanged( const UnoViewSharedPtr& rView ) override { mrBase.implViewChanged(rView); } - virtual void viewsChanged() SAL_OVERRIDE + virtual void viewsChanged() override { mrBase.implViewsChanged(); } @@ -69,11 +69,11 @@ namespace slideshow // IntrinsicAnimationEventHandler - virtual bool enableAnimations() SAL_OVERRIDE + virtual bool enableAnimations() override { return mrBase.implStartIntrinsicAnimation(); } - virtual bool disableAnimations() SAL_OVERRIDE + virtual bool disableAnimations() override { return mrBase.implEndIntrinsicAnimation(); } diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index ba12729dfeb7..16546ee0fa80 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 SAL_OVERRIDE; + ::com::sun::star::drawing::XShape > getXShape() const override; // animation methods - 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; + virtual void play() override; + virtual void stop() override; + virtual void pause() override; + virtual bool isPlaying() const override; + virtual void setMediaTime(double) override; // render methods - virtual bool update() const SAL_OVERRIDE; - virtual bool render() const SAL_OVERRIDE; - virtual bool isContentChanged() const SAL_OVERRIDE; + virtual bool update() const override; + virtual bool render() const override; + virtual bool isContentChanged() const override; // Shape attributes - 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; + virtual ::basegfx::B2DRectangle getBounds() const override; + virtual ::basegfx::B2DRectangle getDomBounds() const override; + virtual ::basegfx::B2DRectangle getUpdateArea() const override; + virtual bool isVisible() const override; + virtual double getPriority() const override; + virtual bool isBackgroundDetached() const 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 727e962f52d8..5d3498ffdc89 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -115,7 +115,7 @@ public: } //--- XGraphicRenderer ----------------------------------- - virtual void SAL_CALL render( const uno::Reference< graphic::XGraphic >& rGraphic ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL render( const uno::Reference< graphic::XGraphic >& rGraphic ) throw (uno::RuntimeException, std::exception) 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 03b899d6040b..64130e05f1dc 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -72,12 +72,12 @@ namespace slideshow ::std::size_t nNumLoops, CycleMode eCycleMode ); - 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; + virtual void dispose() override; + virtual double calcTimeLag() const override; + virtual bool perform() override; + virtual bool isActive() const override; + virtual void dequeued() override; + virtual void end() override; bool enableAnimations(); @@ -106,8 +106,8 @@ namespace slideshow private: - virtual bool enableAnimations() SAL_OVERRIDE { return mrActivity.enableAnimations(); } - virtual bool disableAnimations() SAL_OVERRIDE { mrActivity.end(); return true; } + virtual bool enableAnimations() override { return mrActivity.enableAnimations(); } + virtual bool disableAnimations() override { mrActivity.end(); return true; } IntrinsicAnimationActivity& mrActivity; }; diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index fe7165ae97a5..ea1a5022ed3d 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -67,22 +67,22 @@ namespace slideshow virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) SAL_OVERRIDE; - virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) SAL_OVERRIDE; - virtual bool clearAllViewLayers() SAL_OVERRIDE; + bool bRedrawLayer ) override; + virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) override; + virtual bool clearAllViewLayers() override; // ExternalShapeBase methods - 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; + virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const override; + virtual void implViewChanged( const UnoViewSharedPtr& rView ) override; + virtual void implViewsChanged() override; + virtual bool implStartIntrinsicAnimation() override; + virtual bool implEndIntrinsicAnimation() override; + virtual bool implPauseIntrinsicAnimation() override; + virtual bool implIsIntrinsicAnimationPlaying() const override; + virtual void implSetIntrinsicAnimationTime(double) 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 21322f64c1ef..061e898ceabd 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -153,20 +153,20 @@ public: double nPrio ); // Shape: - virtual uno::Reference<drawing::XShape> getXShape() const SAL_OVERRIDE; + virtual uno::Reference<drawing::XShape> getXShape() const override; virtual void addViewLayer( ViewLayerSharedPtr const& pNewLayer, - 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; + bool bRedrawLayer ) override; + virtual bool removeViewLayer( ViewLayerSharedPtr const& pNewLayer ) override; + virtual bool clearAllViewLayers() override; + virtual bool update() const override; + virtual bool render() const override; + virtual bool isContentChanged() const override; + virtual basegfx::B2DRectangle getBounds() const override; + virtual basegfx::B2DRectangle getDomBounds() const override; + virtual basegfx::B2DRectangle getUpdateArea() const override; + virtual bool isVisible() const override; + virtual double getPriority() const override; + virtual bool isBackgroundDetached() const override; private: ShapeSharedPtr const mpGroupShape; diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 332da3d823c1..7b8cb636ca37 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -551,61 +551,61 @@ namespace slideshow { } - virtual bool isOnView(std::shared_ptr<View> const& /*rView*/) const SAL_OVERRIDE + virtual bool isOnView(std::shared_ptr<View> const& /*rView*/) const override { return true; // visible on all views } - virtual ::cppcanvas::CanvasSharedPtr getCanvas() const SAL_OVERRIDE + virtual ::cppcanvas::CanvasSharedPtr getCanvas() const override { return mpCanvas; } - virtual void clear() const SAL_OVERRIDE + virtual void clear() const override { // NOOP } - virtual void clearAll() const SAL_OVERRIDE + virtual void clearAll() const override { // NOOP } virtual ::cppcanvas::CustomSpriteSharedPtr createSprite( const ::basegfx::B2DSize& /*rSpriteSizePixel*/, - double /*nSpritePrio*/ ) const SAL_OVERRIDE + double /*nSpritePrio*/ ) const 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*/ ) SAL_OVERRIDE + virtual void setPriority( const basegfx::B1DRange& /*rRange*/ ) override { OSL_FAIL( "BitmapView::setPriority(): This method is not supposed to be called!" ); } - virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const SAL_OVERRIDE + virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const override { return geometry::IntegerSize2D(0,0); } - virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE + virtual ::basegfx::B2DHomMatrix getTransformation() const override { return mpCanvas->getTransformation(); } - virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const SAL_OVERRIDE + virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const override { OSL_FAIL( "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" ); return ::basegfx::B2DHomMatrix(); } - virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ ) SAL_OVERRIDE + virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ ) override { OSL_FAIL( "BitmapView::setClip(): This method is not supposed to be called!" ); } - virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ ) SAL_OVERRIDE + virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ ) 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 651111bed88e..611f33d9d3d8 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() SAL_OVERRIDE; + virtual void dispose() override; private: @@ -95,32 +95,32 @@ private: virtual bool handleMousePressed( - ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE; + ::com::sun::star::awt::MouseEvent const& evt ) override; virtual bool handleMouseReleased( - ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE; + ::com::sun::star::awt::MouseEvent const& evt ) override; virtual bool handleMouseDragged( - ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE; + ::com::sun::star::awt::MouseEvent const& evt ) override; virtual bool handleMouseMoved( - ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE; + ::com::sun::star::awt::MouseEvent const& evt ) override; // ViewUpdate interface - virtual bool update() SAL_OVERRIDE; - virtual bool needsUpdate() const SAL_OVERRIDE; + virtual bool update() override; + virtual bool needsUpdate() const override; // ShapeManager interface - 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 void enterAnimationMode( const AnimatableShapeSharedPtr& rShape ) override; + virtual void leaveAnimationMode( const AnimatableShapeSharedPtr& rShape ) override; + virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape ) override; virtual ShapeSharedPtr lookupShape( ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > const & xShape ) const SAL_OVERRIDE; - virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ) SAL_OVERRIDE; + ::com::sun::star::drawing::XShape > const & xShape ) const override; + virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ) override; // SubsettableShapeManager interface @@ -128,17 +128,17 @@ private: virtual boost::shared_ptr<AttributableShape> getSubsetShape( const boost::shared_ptr<AttributableShape>& rOrigShape, - const DocTreeNode& rTreeNode ) SAL_OVERRIDE; + const DocTreeNode& rTreeNode ) override; virtual void revokeSubset( const boost::shared_ptr<AttributableShape>& rOrigShape, - const boost::shared_ptr<AttributableShape>& rSubsetShape ) SAL_OVERRIDE; + const boost::shared_ptr<AttributableShape>& rSubsetShape ) override; virtual void addIntrinsicAnimationHandler( - const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) SAL_OVERRIDE; + const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) override; virtual void removeIntrinsicAnimationHandler( - const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) SAL_OVERRIDE; - virtual bool notifyIntrinsicAnimationsEnabled() SAL_OVERRIDE; - virtual bool notifyIntrinsicAnimationsDisabled() SAL_OVERRIDE; + const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) override; + virtual bool notifyIntrinsicAnimationsEnabled() override; + virtual bool notifyIntrinsicAnimationsDisabled() override; // ShapeListenerEventHandler @@ -147,12 +147,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 ) SAL_OVERRIDE; + ::com::sun::star::drawing::XShape>& xShape ) 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 ) SAL_OVERRIDE; + ::com::sun::star::drawing::XShape>& xShape ) override; // ShapeCursorEventHandler interface diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 0e2cf1a614aa..bff4c491babf 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -108,36 +108,36 @@ public: // Slide interface - virtual bool prefetch() SAL_OVERRIDE; - virtual bool show( bool ) SAL_OVERRIDE; - virtual void hide() SAL_OVERRIDE; + virtual bool prefetch() override; + virtual bool show( bool ) override; + virtual void hide() override; - 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; + virtual basegfx::B2ISize getSlideSize() const override; + virtual uno::Reference<drawing::XDrawPage > getXDrawPage() const override; + virtual uno::Reference<animations::XAnimationNode> getXAnimationNode() const override; + virtual PolyPolygonVector getPolygons() override; + virtual void drawPolygons() const override; + virtual bool isPaintOverlayActive() const override; + virtual void enablePaintOverlay() override; + virtual void disablePaintOverlay() override; + virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) 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 SAL_OVERRIDE; + virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const override; private: // ViewEventHandler - 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; + virtual void viewAdded( const UnoViewSharedPtr& rView ) override; + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override; + virtual void viewChanged( const UnoViewSharedPtr& rView ) override; + virtual void viewsChanged() override; // CursorManager - virtual bool requestCursor( sal_Int16 nCursorShape ) SAL_OVERRIDE; - virtual void resetCursor() SAL_OVERRIDE; + virtual bool requestCursor( sal_Int16 nCursorShape ) override; + virtual void resetCursor() override; void activatePaintOverlay(); void deactivatePaintOverlay(); diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 960794fbf1fa..cd7437be1daf 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -87,31 +87,31 @@ namespace slideshow } // ViewEventHandler methods - virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewAdded( const UnoViewSharedPtr& rView ) override { maViews.push_back( rView ); } - virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override { maViews.erase( ::std::remove( maViews.begin(), maViews.end(), rView ) ); } - virtual void viewChanged( const UnoViewSharedPtr& /*rView*/ ) SAL_OVERRIDE + virtual void viewChanged( const UnoViewSharedPtr& /*rView*/ ) override { // TODO(F2): for persistent drawings, need to store // polygon and repaint here. } - virtual void viewsChanged() SAL_OVERRIDE + virtual void viewsChanged() override { // TODO(F2): for persistent drawings, need to store // polygon and repaint here. } - bool colorChanged( RGBColor const& rUserColor ) SAL_OVERRIDE + bool colorChanged( RGBColor const& rUserColor ) override { mbIsLastPointValid = false; mbActive = true; @@ -120,7 +120,7 @@ namespace slideshow return true; } - bool widthChanged( double nUserStrokeWidth ) SAL_OVERRIDE + bool widthChanged( double nUserStrokeWidth ) override { this->mnStrokeWidth = nUserStrokeWidth; mbIsEraseModeActivated = false; @@ -162,7 +162,7 @@ namespace slideshow } } - bool eraseAllInkChanged( bool const& rEraseAllInk ) SAL_OVERRIDE + bool eraseAllInkChanged( bool const& rEraseAllInk ) override { this->mbIsEraseAllModeActivated= rEraseAllInk; // if the erase all mode is activated it will remove all ink from slide, @@ -178,7 +178,7 @@ namespace slideshow return true; } - bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) SAL_OVERRIDE + bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) override { // Change the size this->mnSize=rEraseInkSize; @@ -187,7 +187,7 @@ namespace slideshow return true; } - bool switchPenMode() SAL_OVERRIDE + bool switchPenMode() override { mbIsLastPointValid = false; mbActive = true; @@ -195,7 +195,7 @@ namespace slideshow return true; } - bool switchEraserMode() SAL_OVERRIDE + bool switchEraserMode() override { mbIsLastPointValid = false; mbActive = true; @@ -203,7 +203,7 @@ namespace slideshow return true; } - bool disable() SAL_OVERRIDE + bool disable() override { mbIsLastPointValid = false; mbIsLastMouseDownPosValid = false; @@ -231,7 +231,7 @@ namespace slideshow } // MouseEventHandler methods - virtual bool handleMousePressed( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMousePressed( const awt::MouseEvent& e ) override { if( !mbActive ) return false; @@ -254,7 +254,7 @@ namespace slideshow return true; } - virtual bool handleMouseReleased( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseReleased( const awt::MouseEvent& e ) override { if( !mbActive ) return false; @@ -291,7 +291,7 @@ namespace slideshow return true; } - virtual bool handleMouseDragged( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseDragged( const awt::MouseEvent& e ) override { if( !mbActive ) return false; @@ -410,7 +410,7 @@ namespace slideshow return true; } - virtual bool handleMouseMoved( const awt::MouseEvent& /*e*/ ) SAL_OVERRIDE + virtual bool handleMouseMoved( const awt::MouseEvent& /*e*/ ) 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 039f4ae240ba..518afe330703 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -275,58 +275,58 @@ public: private: // XSlideShow: - 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 nextEffect() throw (uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL startShapeActivity( uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL stopShapeActivity( uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual uno::Reference<drawing::XDrawPage> SAL_CALL getCurrentSlide() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) 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) 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; + throw (uno::RuntimeException, std::exception) 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) override; virtual sal_Bool SAL_CALL setProperty( - beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL addView( uno::Reference<presentation::XSlideShowView> const& xView ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL removeView( uno::Reference<presentation::XSlideShowView> const& xView ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL update( double & nNextTimeout ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL addSlideShowListener( uno::Reference<presentation::XSlideShowListener> const& xListener ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeSlideShowListener( uno::Reference<presentation::XSlideShowListener> const& xListener ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL addShapeEventListener( uno::Reference<presentation::XShapeEventListener> const& xListener, uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeShapeEventListener( uno::Reference<presentation::XShapeEventListener> const& xListener, uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL setShapeCursor( uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // CursorManager - virtual bool requestCursor( sal_Int16 nCursorShape ) SAL_OVERRIDE; - virtual void resetCursor() SAL_OVERRIDE; + virtual bool requestCursor( sal_Int16 nCursorShape ) override; + virtual void resetCursor() override; /** This is somewhat similar to displaySlide when called for the current slide. It has been simplified to take advantage of that no slide @@ -337,7 +337,7 @@ private: protected: // WeakComponentImplHelperBase - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; bool isDisposed() const { @@ -521,7 +521,7 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, SeparateListenerImpl& operator=( const SeparateListenerImpl& ) = delete; // EventHandler - virtual bool handleEvent() SAL_OVERRIDE + virtual bool handleEvent() override { // DON't call notifySlideAnimationsEnded() // directly, but queue an event. handleEvent() @@ -538,20 +538,20 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, } // ViewRepaintHandler - virtual void viewClobbered( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewClobbered( const UnoViewSharedPtr& rView ) override { // given view needs repaint, request update mrScreenUpdater.notifyUpdate(rView, true); } // HyperlinkHandler - virtual bool handleHyperlink( OUString const& rLink ) SAL_OVERRIDE + virtual bool handleHyperlink( OUString const& rLink ) override { return mrShow.notifyHyperLinkClicked(rLink); } // AnimationEventHandler - virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE + virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) override { return mrShow.handleAnimationEvent(rNode); } diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 236f3a5d0e77..ce33ea8699c8 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -470,7 +470,7 @@ public: } } - virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const SAL_OVERRIDE + virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const override { basegfx::B2DRectangle aTmpRect; canvas::tools::calcTransformedRectBounds( aTmpRect, @@ -494,7 +494,7 @@ private: virtual cppcanvas::CustomSpriteSharedPtr createSprite( const ::basegfx::B2DSize& rSpriteSizePixel, - double nPriority ) const SAL_OVERRIDE + double nPriority ) const override { cppcanvas::CustomSpriteSharedPtr pSprite( mpSpriteCanvas->createCustomSprite( rSpriteSizePixel ) ); @@ -505,7 +505,7 @@ private: return pSprite; } - virtual void setPriority( const basegfx::B1DRange& rRange ) SAL_OVERRIDE + virtual void setPriority( const basegfx::B1DRange& rRange ) override { OSL_ENSURE( !rRange.isEmpty() && rRange.getMinimum() >= 1.0, @@ -518,7 +518,7 @@ private: mpSprite->setPriority( rRange.getMinimum() ); } - virtual basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE + virtual basegfx::B2DHomMatrix getTransformation() const override { // Offset given transformation by left, top border of given // range (after transformation through given transformation) @@ -540,12 +540,12 @@ private: return aMatrix; } - virtual basegfx::B2DHomMatrix getSpriteTransformation() const SAL_OVERRIDE + virtual basegfx::B2DHomMatrix getSpriteTransformation() const override { return maTransformation; } - virtual void clear() const SAL_OVERRIDE + virtual void clear() const override { // grab canvas - that also lazy-initializes maLayerBoundsPixel cppcanvas::CanvasSharedPtr pCanvas=getCanvas()->clone(); @@ -556,7 +556,7 @@ private: basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY())); } - virtual void clearAll() const SAL_OVERRIDE + virtual void clearAll() const override { // grab canvas - that also lazy-initializes maLayerBoundsPixel ::cppcanvas::CanvasSharedPtr pCanvas( getCanvas()->clone() ); @@ -570,12 +570,12 @@ private: basegfx::B2IRange(0,0,rSpriteSize.getX(),rSpriteSize.getY())); } - virtual bool isOnView(std::shared_ptr<View> const& rView) const SAL_OVERRIDE + virtual bool isOnView(std::shared_ptr<View> const& rView) const override { return rView.get() == mpParentView; } - virtual cppcanvas::CanvasSharedPtr getCanvas() const SAL_OVERRIDE + virtual cppcanvas::CanvasSharedPtr getCanvas() const override { if( !mpOutputCanvas ) { @@ -634,7 +634,7 @@ private: return mpOutputCanvas; } - virtual void setClip( const basegfx::B2DPolyPolygon& rClip ) SAL_OVERRIDE + virtual void setClip( const basegfx::B2DPolyPolygon& rClip ) override { basegfx::B2DPolyPolygon aNewClip = prepareClip( rClip ); @@ -650,7 +650,7 @@ private: } } - virtual bool resize( const ::basegfx::B2DRange& rArea ) SAL_OVERRIDE + virtual bool resize( const ::basegfx::B2DRange& rArea ) override { const bool bRet( maLayerBounds != rArea ); maLayerBounds = rArea; @@ -685,44 +685,44 @@ public: private: // View: - 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; + virtual ViewLayerSharedPtr createViewLayer( const basegfx::B2DRange& rLayerBounds ) const override; + virtual bool updateScreen() const override; + virtual bool paintScreen() const override; + virtual void setViewSize( const ::basegfx::B2DSize& ) override; + virtual void setCursorShape( sal_Int16 nPointerShape ) override; // ViewLayer interface - virtual bool isOnView(std::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 bool isOnView(std::shared_ptr<View> const& rView) const override; + virtual void clear() const override; + virtual void clearAll() const override; + virtual cppcanvas::CanvasSharedPtr getCanvas() const override; virtual cppcanvas::CustomSpriteSharedPtr createSprite( const ::basegfx::B2DSize& rSpriteSizePixel, - 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; + double nPriority ) const override; + virtual void setPriority( const basegfx::B1DRange& rRange ) override; + virtual geometry::IntegerSize2D getTranslationOffset() const override; + virtual ::basegfx::B2DHomMatrix getTransformation() const override; + virtual basegfx::B2DHomMatrix getSpriteTransformation() const override; + virtual void setClip( const ::basegfx::B2DPolyPolygon& rClip ) override; + virtual bool resize( const ::basegfx::B2DRange& rArea ) override; // UnoView: - 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() const SAL_OVERRIDE; + virtual void _dispose() override; + virtual uno::Reference<presentation::XSlideShowView> getUnoView()const override; + virtual void setIsSoundEnabled (const bool bValue) override; + virtual bool isSoundEnabled() const override; // XEventListener: virtual void SAL_CALL disposing( lang::EventObject const& evt ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // XModifyListener: virtual void SAL_CALL modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // XPaintListener: virtual void SAL_CALL windowPaint( const awt::PaintEvent& e ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // WeakComponentImplHelperBase: - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void updateClip(); diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 2dd955ff4a18..231884f1187f 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -204,12 +204,12 @@ namespace slideshow { } - virtual double operator()( double t ) const SAL_OVERRIDE + virtual double operator()( double t ) const override { return maFunctor( (*mpArg)(t) ); } - virtual bool isConstant() const SAL_OVERRIDE + virtual bool isConstant() const override { return mpArg->isConstant(); } diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx index 5bd985ab17cd..cb43fb92c5ed 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.hxx +++ b/slideshow/source/engine/transitions/barndoorwipe.hxx @@ -35,7 +35,7 @@ class BarnDoorWipe : public ParametricPolyPolygon public: explicit BarnDoorWipe( bool doubled = false ) : m_unitRect( createUnitRect() ), m_doubled(doubled) {} - virtual ::basegfx::B2DPolyPolygon operator()( double x ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator()( double x ) 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 6122c1a800a9..62ba19f44042 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) 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 f72c42c2f49a..720720864e81 100644 --- a/slideshow/source/engine/transitions/boxwipe.hxx +++ b/slideshow/source/engine/transitions/boxwipe.hxx @@ -34,7 +34,7 @@ public: explicit BoxWipe( bool topCentered ) : m_topCentered(topCentered), m_unitRect( createUnitRect() ) {} - virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) 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 14057568c2f3..ee206e5dd9fa 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double x ) 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 53d202321c06..cd54086f6925 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; }; } diff --git a/slideshow/source/engine/transitions/combtransition.hxx b/slideshow/source/engine/transitions/combtransition.hxx index 5115e5aa0d8e..d340565e12ae 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 ) SAL_OVERRIDE; + virtual bool operator()( double x ) override; private: const ::basegfx::B2DVector maPushDirectionUnit; diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx index 4eff4fd775de..684a9819ad5f 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; private: const ::basegfx::B2DPolyPolygon m_unitRect; }; diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx index 95f9eb423a59..d710cba27794 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.hxx +++ b/slideshow/source/engine/transitions/ellipsewipe.hxx @@ -31,7 +31,7 @@ class EllipseWipe : public ParametricPolyPolygon { public: explicit EllipseWipe( sal_Int32 /*nTransitionSubType xxx todo */ ) {} - virtual ::basegfx::B2DPolyPolygon operator () ( double x ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double x ) override; }; } diff --git a/slideshow/source/engine/transitions/fanwipe.hxx b/slideshow/source/engine/transitions/fanwipe.hxx index e95b0c320bdc..dc457c0d2fb1 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) 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 5f0cdf48c168..92f0735cfeaa 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; private: explicit 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 d89bd4f9a858..a4b59218f9fa 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.hxx +++ b/slideshow/source/engine/transitions/fourboxwipe.hxx @@ -35,7 +35,7 @@ public: explicit FourBoxWipe( bool cornersOut ) : m_cornersOut(cornersOut), m_unitRect( createUnitRect() ) {} - virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) 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 977031afff77..b39087d6d440 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; private: const ::basegfx::B2DPolyPolygon m_unitRect; }; diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx index 461e5ded9832..b367ad868d69 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.hxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx @@ -32,7 +32,7 @@ class PinWheelWipe : public ParametricPolyPolygon { public: explicit PinWheelWipe( sal_Int32 blades ) : m_blades(blades) {} - virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; private: sal_Int32 m_blades; }; diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx index bafde24edd1b..d287d8cb315f 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; private: ::std::unique_ptr< ::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 8f26f35e6587..1a75df5c40b5 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 ) SAL_OVERRIDE; + const ShapeAttributeLayerSharedPtr& rAttrLayer ) override; virtual void start( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) SAL_OVERRIDE; - virtual void end() SAL_OVERRIDE; + const ShapeAttributeLayerSharedPtr& rAttrLayer ) override; + virtual void end() override; // NumberAnimation interface - virtual bool operator()( double nValue ) SAL_OVERRIDE; - virtual double getUnderlyingValue() const SAL_OVERRIDE; + virtual bool operator()( double nValue ) override; + virtual double getUnderlyingValue() const override; private: void end_(); diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index 5eb268b5ebaa..1af9ab04153e 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 ) SAL_OVERRIDE; - virtual double getUnderlyingValue() const SAL_OVERRIDE; + virtual bool operator()( double x ) override; + virtual double getUnderlyingValue() const override; // Animation virtual void prefetch( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) SAL_OVERRIDE; + const ShapeAttributeLayerSharedPtr& ) override; virtual void start( const AnimatableShapeSharedPtr&, - const ShapeAttributeLayerSharedPtr& ) SAL_OVERRIDE; - virtual void end() SAL_OVERRIDE; + const ShapeAttributeLayerSharedPtr& ) override; + virtual void end() override; // ViewEventHandler - 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; + virtual void viewAdded( const UnoViewSharedPtr& rView ) override; + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override; + virtual void viewChanged( const UnoViewSharedPtr& rView ) override; + virtual void viewsChanged() 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 6e991add5280..e71592f5d862 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -181,7 +181,7 @@ public: return true; } - virtual bool operator()( double t ) SAL_OVERRIDE + virtual bool operator()( double t ) override { for( const auto& pTransition : maTransitions ) pTransition->update( t ); @@ -194,7 +194,7 @@ public: } // ViewEventHandler - virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewAdded( const UnoViewSharedPtr& rView ) override { OSL_TRACE("PluginSlideChange viewAdded"); SlideChangeBase::viewAdded( rView ); @@ -209,7 +209,7 @@ public: addTransition( rView ); } - virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override { OSL_TRACE("PluginSlideChange viewRemoved"); SlideChangeBase::viewRemoved( rView ); @@ -229,7 +229,7 @@ public: } } - virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewChanged( const UnoViewSharedPtr& rView ) override { OSL_TRACE("PluginSlideChange viewChanged"); SlideChangeBase::viewChanged( rView ); @@ -248,7 +248,7 @@ public: } } - virtual void viewsChanged() SAL_OVERRIDE + virtual void viewsChanged() override { OSL_TRACE("PluginSlideChange viewsChanged"); SlideChangeBase::viewsChanged(); @@ -311,13 +311,13 @@ public: const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - double t ) SAL_OVERRIDE; + double t ) override; virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - double t ) SAL_OVERRIDE; + double t ) override; private: ClippingFunctor maClippingFunctor; @@ -374,19 +374,19 @@ public: virtual void prepareForRun( const ViewEntry& rViewEntry, - const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) SAL_OVERRIDE; + const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) override; virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - double t ) SAL_OVERRIDE; + double t ) override; virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - double t ) SAL_OVERRIDE; + double t ) override; private: const boost::optional< RGBColor > maFadeColor; @@ -472,19 +472,19 @@ public: virtual void prepareForRun( const ViewEntry& rViewEntry, - const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) SAL_OVERRIDE; + const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) override; virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - double t ) SAL_OVERRIDE; + double t ) override; virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - double t ) SAL_OVERRIDE; + double t ) override; private: RGBColor maFadeColor; @@ -586,19 +586,19 @@ public: virtual void prepareForRun( const ViewEntry& rViewEntry, - const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) SAL_OVERRIDE; + const cppcanvas::CanvasSharedPtr& rDestinationCanvas ) override; virtual void performIn( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - double t ) SAL_OVERRIDE; + double t ) override; virtual void performOut( const ::cppcanvas::CustomSpriteSharedPtr& rSprite, const ViewEntry& rViewEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, - double t ) SAL_OVERRIDE; + double t ) override; }; void MovingSlideChange::prepareForRun( diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx index 7696e8c746e3..bf147209b82a 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; protected: // topLeftHorizontal: @@ -57,7 +57,7 @@ public: : SnakeWipe( nElements, diagonal, flipOnYAxis ), m_opposite( opposite ) {} - virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; private: const bool m_opposite; }; diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx index 654ba1fdb192..7fd12148550a 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; private: const bool m_fourBox; }; diff --git a/slideshow/source/engine/transitions/sweepwipe.hxx b/slideshow/source/engine/transitions/sweepwipe.hxx index 213f74f30432..acc10e67e11b 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) 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 da9d0c967d2d..ac2182b21cc6 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator()( double x ) override; }; } diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx index 08a8a2d62727..b524e36732bb 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 ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) 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 5258d2974b64..ca927ba44b44 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.hxx +++ b/slideshow/source/engine/transitions/zigzagwipe.hxx @@ -32,7 +32,7 @@ class ZigZagWipe : public ParametricPolyPolygon { public: explicit ZigZagWipe( sal_Int32 nZigs ); - virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; protected: const double m_zigEdge; ::basegfx::B2DPolygon m_stdZigZag; @@ -43,7 +43,7 @@ class BarnZigZagWipe : public ZigZagWipe { public: explicit BarnZigZagWipe( sal_Int32 nZigs ) : ZigZagWipe(nZigs) {} - virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon operator () ( double t ) override; }; } diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 6eb579c77017..4f38849d022d 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -61,10 +61,10 @@ typedef std::map<ShapeSharedPtr, ImpEventQueue, class MouseEventHandler_ : public MouseEventHandler { public: - virtual bool handleMousePressed( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false;} - virtual bool handleMouseReleased( 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; } + virtual bool handleMousePressed( awt::MouseEvent const& /*e*/ ) override { return false;} + virtual bool handleMouseReleased( awt::MouseEvent const& /*e*/) override { return false;} + virtual bool handleMouseDragged( awt::MouseEvent const& /*e*/ ) override { return false;} + virtual bool handleMouseMoved( awt::MouseEvent const& /*e*/ ) override { return false; } }; /** @return one event has been posted @@ -126,7 +126,7 @@ public: maAnimationEventMap() {} - virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE + virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) override { ENSURE_OR_RETURN_FALSE( rNode, @@ -193,13 +193,13 @@ public: private: // triggered by API calls, e.g. space bar - virtual bool handleEvent() SAL_OVERRIDE + virtual bool handleEvent() override { return handleEvent_impl(); } // triggered by mouse release: - virtual bool handleMouseReleased( const awt::MouseEvent& evt ) SAL_OVERRIDE + virtual bool handleMouseReleased( const awt::MouseEvent& evt ) override { if(evt.Buttons != awt::MouseButton::LEFT) return false; @@ -245,7 +245,7 @@ public: void skipEffect() { handleEvent_impl(false); } private: - virtual bool handleEvent_impl() SAL_OVERRIDE + virtual bool handleEvent_impl() override { return handleEvent_impl(true); } @@ -391,14 +391,14 @@ public: mrCursorManager( rCursorManager ) {} - virtual bool handleMouseReleased( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseReleased( const awt::MouseEvent& e ) override { if(e.Buttons != awt::MouseButton::LEFT) return false; return processEvent( e ); } - virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseMoved( const awt::MouseEvent& e ) override { // TODO(P2): Maybe buffer last shape touched @@ -423,7 +423,7 @@ public: : MouseHandlerBase( rEventQueue ), mpLastShape() {} - virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseMoved( const awt::MouseEvent& e ) override { // TODO(P2): Maybe buffer last shape touched, and // check against that _first_ @@ -461,7 +461,7 @@ public: : MouseHandlerBase( rEventQueue ), maLastIter() {} - virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseMoved( const awt::MouseEvent& e ) 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 f725c5514e35..fd3314dea1ba 100644 --- a/slideshow/source/engine/waitsymbol.hxx +++ b/slideshow/source/engine/waitsymbol.hxx @@ -64,10 +64,10 @@ private: const UnoViewContainer& rViewContainer ); // ViewEventHandler - 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; + virtual void viewAdded( const UnoViewSharedPtr& rView ) override; + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override; + virtual void viewChanged( const UnoViewSharedPtr& rView ) override; + virtual void viewsChanged() 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 09efe7ed5a69..8cf7c5c6aecd 100644 --- a/slideshow/source/inc/delayevent.hxx +++ b/slideshow/source/inc/delayevent.hxx @@ -51,11 +51,11 @@ public: mbWasFired(false) {} // Event: - virtual bool fire() SAL_OVERRIDE; - virtual bool isCharged() const SAL_OVERRIDE; - virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE; + virtual bool fire() override; + virtual bool isCharged() const override; + virtual double getActivationTime( double nCurrentTime ) const override; // Disposable: - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: double const mnTimeout; diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx index a0cec175948d..f3cdd6c67cfa 100644 --- a/slideshow/source/inc/interruptabledelayevent.hxx +++ b/slideshow/source/inc/interruptabledelayevent.hxx @@ -44,7 +44,7 @@ namespace slideshow { } - virtual bool fire() SAL_OVERRIDE + virtual bool fire() override { if( mpEvent && isCharged() ) { @@ -57,7 +57,7 @@ namespace slideshow return false; } - virtual bool isCharged() const SAL_OVERRIDE + virtual bool isCharged() const 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 && mpEvent->isCharged(); } - virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE + virtual double getActivationTime( double nCurrentTime ) const override { // enforce _our_ timeout to our clients (this // overrides any timeout possibly set at the wrappee!) return nCurrentTime + mnTimeout; } - virtual void dispose() SAL_OVERRIDE + virtual void dispose() override { mpEvent.reset(); } diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx index e558d1c230ea..c97298ca9806 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 ) SAL_OVERRIDE; + virtual bool handlePause( bool bPauseShow ) override; // Disposable - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: SoundPlayer( diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx index 9751006fb89c..853ef58acbfd 100644 --- a/slideshow/source/inc/wakeupevent.hxx +++ b/slideshow/source/inc/wakeupevent.hxx @@ -45,10 +45,10 @@ public: std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase, ActivitiesQueue & rActivityQueue ); - virtual void dispose() SAL_OVERRIDE; - virtual bool fire() SAL_OVERRIDE; - virtual bool isCharged() const SAL_OVERRIDE; - virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE; + virtual void dispose() override; + virtual bool fire() override; + virtual bool isCharged() const override; + virtual double getActivationTime( double nCurrentTime ) const override; /// Start the internal timer void start(); |