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

[Stephan Bergmann]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |   28 ++++------
 1 file changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 9f994a9753fa134b2594b32b3b8ec1c1d13f0442
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jul 11 16:35:22 2016 +0200

    loplugin:staticmethods
    
    Change-Id: If898ac15d958d4f0a5bcf0062a8d9869ef5e84e5

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index d1d4c5e..e755c70 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -1134,23 +1134,9 @@ public:
 
 private:
     virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ) override;
-
-    Primitives_t makeLeavingSlide(double nTime) const;
 };
 
-void DiamondTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex,
-                                              double SlideWidthScale, double SlideHeightScale )
-{
-    CHECK_GL_ERROR();
-    applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
-
-    CHECK_GL_ERROR();
-    displaySlide( nTime, glLeavingSlideTex, makeLeavingSlide(nTime), SlideWidthScale, SlideHeightScale );
-    displaySlide( nTime, glEnteringSlideTex, getScene().getEnteringSlide(), SlideWidthScale, SlideHeightScale );
-    CHECK_GL_ERROR();
-}
-
-Primitives_t DiamondTransition::makeLeavingSlide(double nTime) const
+Primitives_t makeLeavingSlide(double nTime)
 {
     Primitive Slide2;
     if( nTime >= 0.5 ) {
@@ -1180,6 +1166,18 @@ Primitives_t DiamondTransition::makeLeavingSlide(double nTime) const
     return aLeavingSlidePrimitives;
 }
 
+void DiamondTransition::displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex,
+                                              double SlideWidthScale, double SlideHeightScale )
+{
+    CHECK_GL_ERROR();
+    applyOverallOperations( nTime, SlideWidthScale, SlideHeightScale );
+
+    CHECK_GL_ERROR();
+    displaySlide( nTime, glLeavingSlideTex, makeLeavingSlide(nTime), SlideWidthScale, SlideHeightScale );
+    displaySlide( nTime, glEnteringSlideTex, getScene().getEnteringSlide(), SlideWidthScale, SlideHeightScale );
+    CHECK_GL_ERROR();
+}
+
 std::shared_ptr<OGLTransitionImpl>
 makeDiamondTransition(const TransitionSettings& rSettings)
 {