diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-16 08:26:48 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-16 09:29:11 +0200 |
commit | 728acd3390ebcf546765f33b750f3c5f784d7aa3 (patch) | |
tree | e30ec993ed61633e26f1bdf91880cec22898fc20 /slideshow/source/engine/shapes/externalshapebase.cxx | |
parent | Update experimental hacks for using Clang from the NDK (diff) | |
download | core-728acd3390ebcf546765f33b750f3c5f784d7aa3.tar.gz core-728acd3390ebcf546765f33b750f3c5f784d7aa3.zip |
Revertion of changes related to ExternalShapeBase
This reverts commits:
50b60c5508b3ba5a0b8dc05eac511d7edaa5a343
0ae0301d1cd6e690473f932411ca880c20f45e13
2a594eb22bfed62fdbcef51a56c2c180bea0283f
Got some suggestions that the deleted things can be usefull.
Diffstat (limited to 'slideshow/source/engine/shapes/externalshapebase.cxx')
-rw-r--r-- | slideshow/source/engine/shapes/externalshapebase.cxx | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 05ad628bc9f5..00c0766df8a5 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -73,13 +73,11 @@ namespace slideshow virtual bool enableAnimations() SAL_OVERRIDE { - mrBase.play(); - return true; + return mrBase.implStartIntrinsicAnimation(); } virtual bool disableAnimations() SAL_OVERRIDE { - mrBase.stop(); - return true; + return mrBase.implEndIntrinsicAnimation(); } ExternalShapeBase& mrBase; @@ -128,6 +126,43 @@ namespace slideshow return mxShape; } + + + void ExternalShapeBase::play() + { + implStartIntrinsicAnimation(); + } + + + + void ExternalShapeBase::stop() + { + implEndIntrinsicAnimation(); + } + + + + void ExternalShapeBase::pause() + { + implPauseIntrinsicAnimation(); + } + + + + bool ExternalShapeBase::isPlaying() const + { + return implIsIntrinsicAnimationPlaying(); + } + + + + void ExternalShapeBase::setMediaTime(double fTime) + { + implSetIntrinsicAnimationTime(fTime); + } + + + bool ExternalShapeBase::update() const { return render(); |