diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-11 16:35:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-07-11 16:35:22 +0200 |
| commit | 9f994a9753fa134b2594b32b3b8ec1c1d13f0442 (patch) | |
| tree | 66fbd9b2d3b9c4d4996d69c68e4e74bf62b34d3f /slideshow | |
| parent | 6f8d047519c8e80371a646ce4bad8f7304aab6ea (diff) | |
loplugin:staticmethods
Change-Id: If898ac15d958d4f0a5bcf0062a8d9869ef5e84e5
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index d1d4c5ea27c8..e755c7098c21 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) { |