summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/shapes/appletshape.cxx
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-04-15 13:46:46 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-04-15 21:36:35 +0200
commit0ae0301d1cd6e690473f932411ca880c20f45e13 (patch)
tree40062bb70f050a64c14835c2a52e36ae97ac3985 /slideshow/source/engine/shapes/appletshape.cxx
parent2a594eb22bfed62fdbcef51a56c2c180bea0283f (diff)
Slideshow: remove unneded function duplicates
Change-Id: I682ae771f13e42dd1a4e1cf6a1ee062a5eca640f
Diffstat (limited to 'slideshow/source/engine/shapes/appletshape.cxx')
-rw-r--r--slideshow/source/engine/shapes/appletshape.cxx25
1 files changed, 10 insertions, 15 deletions
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index f5de6d81a68c..85ec41f6b8f0 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -96,11 +96,11 @@ 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 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 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;
@@ -250,7 +250,7 @@ namespace slideshow
- bool AppletShape::implStartIntrinsicAnimation()
+ void AppletShape::play()
{
::std::for_each( maViewAppletShapes.begin(),
maViewAppletShapes.end(),
@@ -258,42 +258,37 @@ namespace slideshow
_1,
::boost::cref( getBounds() )));
mbIsPlaying = true;
-
- return true;
}
- bool AppletShape::implEndIntrinsicAnimation()
+ void AppletShape::stop()
{
::std::for_each( maViewAppletShapes.begin(),
maViewAppletShapes.end(),
::boost::mem_fn( &ViewAppletShape::endApplet ) );
mbIsPlaying = false;
-
- return true;
}
- bool AppletShape::implPauseIntrinsicAnimation()
+ void AppletShape::pause()
{
// TODO(F1): any way of temporarily disabling/deactivating
// applets?
- return true;
}
- bool AppletShape::implIsIntrinsicAnimationPlaying() const
+ bool AppletShape::isPlaying() const
{
return mbIsPlaying;
}
- void AppletShape::implSetIntrinsicAnimationTime(double)
+ void AppletShape::setMediaTime(double)
{
// No way of doing this, or?
}