diff options
| author | sj <sj@openoffice.org> | 2010-06-04 22:30:37 +0200 |
|---|---|---|
| committer | sj <sj@openoffice.org> | 2010-06-04 22:30:37 +0200 |
| commit | 622fd52d858122833afb1ccd34bba38d231339fc (patch) | |
| tree | 35e37e01ce77799b174edb9f3c6252cda20f1ff0 /sd/source/ui/slideshow/slideshowimpl.cxx | |
| parent | 1663bdaf45e1558d2801e6bc1fdf9d090abc7078 (diff) | |
| parent | 38c1d35d15a0adc980c2355ff97ce327645cd954 (diff) | |
impress190: merge with dev300_m80
Diffstat (limited to 'sd/source/ui/slideshow/slideshowimpl.cxx')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index c2adccc82a80..5afcb65ab90c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -51,7 +51,8 @@ #include <sfx2/imagemgr.hxx> #include <sfx2/request.hxx> -#include "sfx2/docfile.hxx" +#include <sfx2/docfile.hxx> +#include <sfx2/app.hxx> #include <svx/unoapi.hxx> #include <svx/svdoole2.hxx> @@ -3472,39 +3473,11 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) { if( maPresSettings.mnPauseTimeout ) { - boost::scoped_ptr< Graphic > pGraphic; - - if( maPresSettings.mbShowPauseLogo ) + if( mpShowWindow ) { - // load about image from module path - String aBmpFileName( RTL_CONSTASCII_USTRINGPARAM("about.bmp") ); - INetURLObject aObj( SvtPathOptions().GetModulePath(), INET_PROT_FILE ); - aObj.insertName( aBmpFileName ); - SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ ); - if ( !aStrm.GetError() ) - { - Bitmap aBmp; - aStrm >> aBmp; - pGraphic.reset( new Graphic(aBmp) ); - pGraphic->SetPrefMapMode(MAP_PIXEL); - } - else - { - //if no image is located in the module path - //use default logo from iso resource: - - String aMgrName( RTL_CONSTASCII_USTRINGPARAM( "iso" ) ); - boost::scoped_ptr< ResMgr > pResMgr( ResMgr::CreateResMgr( U2S( aMgrName )) ); - DBG_ASSERT(pResMgr,"No ResMgr found"); - if(pResMgr.get()) - { - pGraphic.reset( new Graphic( Bitmap( ResId( RID_DEFAULT_ABOUT_BMP_LOGO, *pResMgr ) ) ) ); - pGraphic->SetPrefMapMode(MAP_PIXEL); - } - } + Graphic aGraphic( SfxApplication::GetApplicationLogo().GetBitmapEx() ); + mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic ); } - if( mpShowWindow ) - mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, pGraphic.get() ); } else { |