diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-15 22:23:42 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-15 22:24:48 +0200 |
| commit | 50b60c5508b3ba5a0b8dc05eac511d7edaa5a343 (patch) | |
| tree | f1c3da4e13a8346055a3e24a9bd7bead82bdff87 /slideshow | |
| parent | b4bcd9ee53680bfb2a32ef273ab806b21830c6ce (diff) | |
Slideshow: these methods override public methods
So make them public too.
Change-Id: I34baccd258ccd70185ee88efc8f09a8b868f6b67
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/appletshape.cxx | 11 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/mediashape.cxx | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 85ec41f6b8f0..d9fc316ba008 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -79,6 +79,12 @@ namespace slideshow sal_Size nNumPropEntries, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; + 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; + private: // View layer methods @@ -96,11 +102,6 @@ namespace slideshow virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const SAL_OVERRIDE; virtual void implViewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; virtual void implViewsChanged() SAL_OVERRIDE; - 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; const OUString maServiceName; const char** mpPropCopyTable; diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index ae13af3eee45..83f3df8451ac 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -65,6 +65,12 @@ namespace slideshow double nPrio, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; + 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; + private: // View layer methods @@ -82,11 +88,6 @@ namespace slideshow virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const SAL_OVERRIDE; virtual void implViewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; virtual void implViewsChanged() SAL_OVERRIDE; - 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; /// the list of active view shapes (one for each registered view layer) typedef ::std::vector< ViewMediaShapeSharedPtr > ViewMediaShapeVector; |