summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/slideshowimpl.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-01-29 11:24:36 +1100
committerMichael Meeks <michael.meeks@suse.com>2013-01-29 11:26:04 +1100
commitab8e37573628f2e5863e7fc0252103ab32203fc2 (patch)
tree48ef54bbe09bf59621c3ff9a6e2a7dcff6beff46 /slideshow/source/engine/slideshowimpl.cxx
parent53e28cba18bfc1210f119c899e7559e70de360ac (diff)
fdo#59881 - sdremote: revert un-necessary locking change.
Change-Id: Id455dd87f01bbea0c5a4ae26734c0aba5699ac71
Diffstat (limited to 'slideshow/source/engine/slideshowimpl.cxx')
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx6
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();
}
}