INTEGRATION: CWS presfixes12 (1.18.14); FILE MERGED
2007/03/05 15:29:07 thb 1.18.14.1: #i37778# Calling XSlideShow::update() after a repaint (slideshow handles all events asynchronously)
This commit is contained in:
parent
64048f0df3
commit
bb6b54c5c7
1 changed files with 13 additions and 12 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: slideshowviewimpl.cxx,v $
|
||||
*
|
||||
* $Revision: 1.18 $
|
||||
* $Revision: 1.19 $
|
||||
*
|
||||
* last change: $Author: rt $ $Date: 2007-01-29 14:51:34 $
|
||||
* last change: $Author: obo $ $Date: 2007-07-17 14:30:36 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -297,6 +297,16 @@ void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(Runtime
|
|||
}
|
||||
}
|
||||
|
||||
static void updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImpl* pSlideShow )
|
||||
{
|
||||
if( pSlideShow )
|
||||
{
|
||||
SlideShowImplGuard aSLGuard( pSlideShow );
|
||||
rGuard.clear();
|
||||
pSlideShow->startUpdateTimer();
|
||||
}
|
||||
}
|
||||
|
||||
void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeException)
|
||||
{
|
||||
::osl::ClearableMutexGuard aGuard( m_aMutex );
|
||||
|
@ -316,6 +326,7 @@ void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeExc
|
|||
awt::PaintEvent aEvent( e );
|
||||
aEvent.Source = static_cast< ::cppu::OWeakObject* >( this );
|
||||
mpPaintListeners->notify( aEvent );
|
||||
updateimpl( aGuard, mpSlideShow ); // warning: clears guard!
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -493,16 +504,6 @@ void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (Ru
|
|||
mxWindowPeer->setPointer( mxPointer );
|
||||
}
|
||||
|
||||
static void updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImpl* pSlideShow )
|
||||
{
|
||||
if( pSlideShow )
|
||||
{
|
||||
SlideShowImplGuard aSLGuard( pSlideShow );
|
||||
rGuard.clear();
|
||||
pSlideShow->startUpdateTimer();
|
||||
}
|
||||
}
|
||||
|
||||
// XWindowListener methods
|
||||
void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (RuntimeException)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue