summaryrefslogtreecommitdiff
path: root/slideshow/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 21:21:36 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 21:21:36 +0100
commit7ebd40d26d8069725ac77760e4324c21523400a2 (patch)
tree4bcc3aa9ef3286c7108d0740db7a0f2a8b6d1fa1 /slideshow/source
parentcd648c5a35dc581ef99763159032b3662236db57 (diff)
SAL_OVERRIDE, Mac OS X slideshow redux
Change-Id: I91d21fa4ebec26eaa59aff93eb730c48b0afad45
Diffstat (limited to 'slideshow/source')
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx30
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm10
2 files changed, 20 insertions, 20 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
index ecca64feb9ff..ef0d6ea554ad 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
@@ -198,9 +198,9 @@ class Iris : public SceneObject
public:
Iris ();
- virtual void prepare();
- virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
- virtual void finish();
+ virtual void prepare() SAL_OVERRIDE;
+ virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight) SAL_OVERRIDE;
+ virtual void finish() SAL_OVERRIDE;
private:
@@ -324,8 +324,8 @@ public:
class SRotate: public Operation
{
public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- virtual SRotate* clone();
+ void interpolate(double t,double SlideWidthScale,double SlideHeightScale) SAL_OVERRIDE;
+ virtual SRotate* clone() SAL_OVERRIDE;
/** Constructor
@@ -369,8 +369,8 @@ private:
class SScale: public Operation
{
public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- SScale* clone();
+ void interpolate(double t,double SlideWidthScale,double SlideHeightScale) SAL_OVERRIDE;
+ SScale* clone() SAL_OVERRIDE;
/** Constructor
@@ -402,8 +402,8 @@ private:
class STranslate: public Operation
{
public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- STranslate* clone();
+ void interpolate(double t,double SlideWidthScale,double SlideHeightScale) SAL_OVERRIDE;
+ STranslate* clone() SAL_OVERRIDE;
/** Constructor
@@ -433,8 +433,8 @@ private:
class SEllipseTranslate: public Operation
{
public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- SEllipseTranslate* clone();
+ void interpolate(double t,double SlideWidthScale,double SlideHeightScale) SAL_OVERRIDE;
+ SEllipseTranslate* clone() SAL_OVERRIDE;
/** Constructor
@@ -469,8 +469,8 @@ private:
class RotateAndScaleDepthByWidth: public Operation
{
public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- RotateAndScaleDepthByWidth* clone();
+ void interpolate(double t,double SlideWidthScale,double SlideHeightScale) SAL_OVERRIDE;
+ RotateAndScaleDepthByWidth* clone() SAL_OVERRIDE;
RotateAndScaleDepthByWidth(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1);
~RotateAndScaleDepthByWidth(){}
@@ -485,8 +485,8 @@ private:
class RotateAndScaleDepthByHeight: public Operation
{
public:
- void interpolate(double t,double SlideWidthScale,double SlideHeightScale);
- RotateAndScaleDepthByHeight* clone();
+ void interpolate(double t,double SlideWidthScale,double SlideHeightScale) SAL_OVERRIDE;
+ RotateAndScaleDepthByHeight* clone() SAL_OVERRIDE;
RotateAndScaleDepthByHeight(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1);
~RotateAndScaleDepthByHeight(){}
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index d490396156fb..47cdb2d7ee66 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -151,18 +151,18 @@ public:
// XTransition
virtual void SAL_CALL update( double nTime )
- throw (uno::RuntimeException);
+ throw (uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL viewChanged( const Reference< presentation::XSlideShowView >& rView,
const Reference< rendering::XBitmap >& rLeavingBitmap,
const Reference< rendering::XBitmap >& rEnteringBitmap )
- throw (uno::RuntimeException);
+ throw (uno::RuntimeException) SAL_OVERRIDE;
protected:
void disposeContextAndWindow();
void disposeTextures();
// WeakComponentImplHelperBase
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
bool isDisposed() const
{
@@ -929,7 +929,7 @@ public:
{}
// XTransitionFactory
- virtual ::sal_Bool SAL_CALL hasTransition( ::sal_Int16 transitionType, ::sal_Int16 transitionSubType ) throw (uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL hasTransition( ::sal_Int16 transitionType, ::sal_Int16 transitionSubType ) throw (uno::RuntimeException) SAL_OVERRIDE
{
if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) {
switch( transitionSubType )
@@ -971,7 +971,7 @@ public:
const uno::Reference< presentation::XSlideShowView >& view,
const uno::Reference< rendering::XBitmap >& leavingBitmap,
const uno::Reference< rendering::XBitmap >& enteringBitmap )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException) SAL_OVERRIDE
{
if( !hasTransition( transitionType, transitionSubType ) )
return uno::Reference< presentation::XTransition >();