summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2012-05-28 15:23:23 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-03-16 21:25:16 +0000
commit4d362d2362661670579c03bdccf0063ee6569604 (patch)
treed8ef2314ff7480cdef6d3f4b6320b5f613b430d0 /sd/source/ui/slideshow
parent67bdb8f14b30f4af03676d11dab4bfe3cfb536a2 (diff)
i53749 - Show Pause logo according to presentation settings
Original author: Tsutomu Uchino <hanya.runo at gmail.com>
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 15d2cc59b371..b21e0850bde3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3219,8 +3219,13 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException)
{
if( mpShowWindow )
{
- Graphic aGraphic( SfxApplication::GetApplicationLogo().GetBitmapEx() );
- mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic );
+ if ( maPresSettings.mbShowPauseLogo )
+ {
+ Graphic aGraphic( SfxApplication::GetApplicationLogo().GetBitmapEx() );
+ mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic );
+ }
+ else
+ mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout );
}
}
else