[Libreoffice-commits] core.git: slideshow/source

[Zolnai Tamás]

 slideshow/source/engine/shapes/appletshape.cxx |   11 ++++++-----
 slideshow/source/engine/shapes/mediashape.cxx  |   11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 50b60c5508b3ba5a0b8dc05eac511d7edaa5a343
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date:   Tue Apr 15 22:23:42 2014 +0200

    Slideshow: these methods override public methods
    
    So make them public too.
    
    Change-Id: I34baccd258ccd70185ee88efc8f09a8b868f6b67

diff --git a/slideshow/source/engine/shapes/appletshape.cxx 
b/slideshow/source/engine/shapes/appletshape.cxx
index 85ec41f..d9fc316 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 ae13af3..83f3df8 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;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits