[Libreoffice-commits] .: Branch 'libreoffice-4-0' - slideshow/source

[Libreoffice Gerrit user]

 slideshow/source/engine/slideshowimpl.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 9b696a67f92c7206fe947996931995a70229752e
Author: Michael Meeks <michael.me...@suse.com>
Date:   Tue Jan 29 11:24:36 2013 +1100

    fdo#59881 - sdremote: revert un-necessary locking change.
    
    Change-Id: Id455dd87f01bbea0c5a4ae26734c0aba5699ac71
    (cherry picked from commit ab8e37573628f2e5863e7fc0252103ab32203fc2)
    
    Signed-off-by: Thorsten Behrens <tbehr...@suse.com>

diff --git a/slideshow/source/engine/slideshowimpl.cxx 
b/slideshow/source/engine/slideshowimpl.cxx
index d3cdbbe..cf672ae 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();
     }
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits