diff options
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/transitions/slidechangebase.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/inc/hslcoloranimation.hxx | 4 | ||||
| -rw-r--r-- | slideshow/source/inc/numberanimation.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index 9db000fc1106..5cf130b5340a 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -132,7 +132,7 @@ protected: */ virtual void prepareForRun( const ViewEntry& rViewEntry, - const cppcanvas::CanvasSharedPtr& rDestinationCanvas ); + const std::shared_ptr<cppcanvas::Canvas>& rDestinationCanvas ); /** Called on derived classes to implement actual slide change. diff --git a/slideshow/source/inc/hslcoloranimation.hxx b/slideshow/source/inc/hslcoloranimation.hxx index 159c1255e47a..e20cbc8024f5 100644 --- a/slideshow/source/inc/hslcoloranimation.hxx +++ b/slideshow/source/inc/hslcoloranimation.hxx @@ -46,7 +46,7 @@ namespace slideshow @param rColor Current animation value. */ - virtual bool operator()( const ValueType& rColor ) = 0; + virtual bool operator()( const HSLColor& rColor ) = 0; /** Request the underlying value for this animation. @@ -58,7 +58,7 @@ namespace slideshow for the underlying value, if the animation has actually been started (via start() call). */ - virtual ValueType getUnderlyingValue() const = 0; + virtual HSLColor getUnderlyingValue() const = 0; }; typedef ::std::shared_ptr< HSLColorAnimation > HSLColorAnimationSharedPtr; diff --git a/slideshow/source/inc/numberanimation.hxx b/slideshow/source/inc/numberanimation.hxx index 71a6bc39e2c8..ab9e9a3939dd 100644 --- a/slideshow/source/inc/numberanimation.hxx +++ b/slideshow/source/inc/numberanimation.hxx @@ -48,7 +48,7 @@ namespace slideshow values will be clipped to the permissible range internally. */ - virtual bool operator()( ValueType x ) = 0; + virtual bool operator()( double x ) = 0; /** Request the underlying value for this animation. @@ -60,7 +60,7 @@ namespace slideshow for the underlying value, if the animation has actually been started (via start() call). */ - virtual ValueType getUnderlyingValue() const = 0; + virtual double getUnderlyingValue() const = 0; }; typedef ::std::shared_ptr< NumberAnimation > NumberAnimationSharedPtr; |