Revertion of changes related to ExternalShapeBase

This reverts commits:
50b60c5508b3ba5a0b8dc05eac511d7edaa5a343
0ae0301d1cd6e690473f932411ca880c20f45e13
2a594eb22bfed62fdbcef51a56c2c180bea0283f

Got some suggestions that the deleted things can be usefull.

1 files changed, 15 insertions, 11 deletions

diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index d9fc316ba008..f5de6d81a68c 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -79,12 +79,6 @@ 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
@@ -102,6 +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;
 
             const OUString                           maServiceName;
             const char**                                    mpPropCopyTable;
@@ -251,7 +250,7 @@ namespace slideshow
 
 
 
-        void AppletShape::play()
+        bool AppletShape::implStartIntrinsicAnimation()
         {
             ::std::for_each( maViewAppletShapes.begin(),
                              maViewAppletShapes.end(),
@@ -259,37 +258,42 @@ namespace slideshow
                                             _1,
                                             ::boost::cref( getBounds() )));
             mbIsPlaying = true;
+
+            return true;
         }
 
 
 
-        void AppletShape::stop()
+        bool AppletShape::implEndIntrinsicAnimation()
         {
             ::std::for_each( maViewAppletShapes.begin(),
                              maViewAppletShapes.end(),
                              ::boost::mem_fn( &ViewAppletShape::endApplet ) );
 
             mbIsPlaying = false;
+
+            return true;
         }
 
 
 
-        void AppletShape::pause()
+        bool AppletShape::implPauseIntrinsicAnimation()
         {
             // TODO(F1): any way of temporarily disabling/deactivating
             // applets?
+            return true;
         }
 
 
 
-        bool AppletShape::isPlaying() const
+        bool AppletShape::implIsIntrinsicAnimationPlaying() const
         {
             return mbIsPlaying;
         }
 
 
 
-        void AppletShape::setMediaTime(double)
+        void AppletShape::implSetIntrinsicAnimationTime(double)
         {
             // No way of doing this, or?
         }