mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slideshow: these methods override public methods

Browse Source 
So make them public too.

Change-Id: I34baccd258ccd70185ee88efc8f09a8b868f6b67
This commit is contained in:
Zolnai Tamás
2014-04-15 22:23:42 +02:00
parent b4bcd9ee53
commit 50b60c5508
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slideshow/source/engine/shapes/appletshape.cxx
View File

@@ -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;

11
slideshow/source/engine/shapes/mediashape.cxx
View File

@@ -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;