diff options
-rw-r--r-- | slideshow/source/engine/opengl/TransitionerImpl.cxx | 10 | ||||
-rw-r--r-- | slideshow/source/engine/slide/slideimpl.cxx | 20 |
2 files changed, 4 insertions, 26 deletions
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index 6e2f5a98a055..ef1d385e77fb 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -201,7 +201,6 @@ private: void GLInitSlides(); bool impl_prepareTransition(); - void impl_finishTransition(); private: rtl::Reference<OpenGLContext> mpContext; @@ -412,12 +411,6 @@ bool OGLTransitionerImpl::impl_prepareTransition() return false; } -void OGLTransitionerImpl::impl_finishTransition() -{ - if( mpTransition && mpTransition->getSettings().mnRequiredGLVersion <= mnGLVersion ) - mpTransition->finish(); -} - bool OGLTransitionerImpl::setTransition( const std::shared_ptr<OGLTransitionImpl>& pTransition ) { if ( mpTransition ) // already initialized @@ -1106,7 +1099,8 @@ void OGLTransitionerImpl::impl_dispose() mpContext->makeCurrent(); CHECK_GL_ERROR(); - impl_finishTransition(); + if( mpTransition && mpTransition->getSettings().mnRequiredGLVersion <= mnGLVersion ) + mpTransition->finish(); disposeTextures(); if( mpContext.is() ) mpContext->dispose(); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 2d7dafcd6040..49e1aba38770 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -175,12 +175,6 @@ private: /// Prefetch show, but don't call applyInitialShapeAttributes() bool implPrefetchShow(); - /// Start GIF and other intrinsic shape animations - void endIntrinsicAnimations(); - - /// End GIF and other intrinsic shape animations - void startIntrinsicAnimations(); - /// Add Polygons to the member maPolygons void addPolygons(const PolyPolygonVector& rPolygons); @@ -465,7 +459,7 @@ void SlideImpl::show( bool bSlideBackgoundPainted ) // enable shape-intrinsic animations (drawing layer animations or // GIF animations) if( mbIntrinsicAnimationsAllowed ) - startIntrinsicAnimations(); + mpSubsettableShapeManager->notifyIntrinsicAnimationsEnabled(); // enable paint overlay, if maUserPaintColor is valid activatePaintOverlay(); @@ -491,7 +485,7 @@ void SlideImpl::hide() // switch off all shape-intrinsic animations. - endIntrinsicAnimations(); + mpSubsettableShapeManager->notifyIntrinsicAnimationsDisabled(); // force-end all SMIL animations, too maAnimations.end(); @@ -855,16 +849,6 @@ void SlideImpl::deactivatePaintOverlay() mbPaintOverlayActive = false; } -void SlideImpl::endIntrinsicAnimations() -{ - mpSubsettableShapeManager->notifyIntrinsicAnimationsDisabled(); -} - -void SlideImpl::startIntrinsicAnimations() -{ - mpSubsettableShapeManager->notifyIntrinsicAnimationsEnabled(); -} - void SlideImpl::applyShapeAttributes( const css::uno::Reference< css::animations::XAnimationNode >& xRootAnimationNode, bool bInitial) const |