Author: arielch
Date: Mon May 28 16:23:23 2012
New Revision: 1343311
URL: http://svn.apache.org/viewvc?rev=1343311&view=rev
Log:
i53749 - Show Pause logo according to presentation settings
Original author: Tsutomu Uchino <hanya.runo at gmail.com>
Modified:
incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx
Modified: incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx?rev=1343311&r1=1343310&r2=1343311&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx Mon May
28 16:23:23 2012
@@ -3320,9 +3320,14 @@ void SAL_CALL SlideshowImpl::gotoNextSli
{
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
{
