diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-01-29 11:24:36 +1100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-01-29 09:56:02 +0100 |
| commit | 9b696a67f92c7206fe947996931995a70229752e (patch) | |
| tree | 017188a1ed819078811cb855ecc93c27e6b74f9c | |
| parent | a10f6afba65867a1460cbe63bcf6e3d6257aba69 (diff) | |
fdo#59881 - sdremote: revert un-necessary locking change.
Change-Id: Id455dd87f01bbea0c5a4ae26734c0aba5699ac71
(cherry picked from commit ab8e37573628f2e5863e7fc0252103ab32203fc2)
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
| -rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 6 |
1 files changed, 1 insertions, 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<presentation::XSlideShow> xThis( - static_cast< presentation::XSlideShow * >( this ), uno::UNO_QUERY_THROW ); - guard.reset(); // unlock maEventMultiplexer.notifySlideStartEvent(); } } |