From ab8e37573628f2e5863e7fc0252103ab32203fc2 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 29 Jan 2013 11:24:36 +1100 Subject: fdo#59881 - sdremote: revert un-necessary locking change. Change-Id: Id455dd87f01bbea0c5a4ae26734c0aba5699ac71 --- slideshow/source/engine/slideshowimpl.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index d3cdbbea6ae7..cf672ae296ac 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -2131,7 +2131,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) void SlideShowImpl::notifySlideTransitionEnded( bool bPaintSlide ) { - osl::ResettableMutexGuard guard( m_aMutex ); + osl::MutexGuard const guard( m_aMutex ); OSL_ENSURE( !isDisposed(), "### already disposed!" ); OSL_ENSURE( mpCurrentSlide, @@ -2144,10 +2144,6 @@ void SlideShowImpl::notifySlideTransitionEnded( bool bPaintSlide ) // the chance to register SlideStartEvents const bool bBackgroundLayerRendered( !bPaintSlide ); mpCurrentSlide->show( bBackgroundLayerRendered ); - - uno::Reference xThis( - static_cast< presentation::XSlideShow * >( this ), uno::UNO_QUERY_THROW ); - guard.reset(); // unlock maEventMultiplexer.notifySlideStartEvent(); } } -- cgit v1.2.3