diff options
Diffstat (limited to 'sd/source/ui/slideshow/slideshow.cxx')
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index e9ebe9715fac..10ec1e0e5cb0 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,21 +121,21 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() // NOTE: First member must be sorted static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] = { - { MAP_CHAR_LEN("AllowAnimations"), ATTR_PRESENT_ANIMATION_ALLOWED, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("CustomShow"), ATTR_PRESENT_CUSTOMSHOW, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("Display"), ATTR_PRESENT_DISPLAY, &::getCppuType((const sal_Int32*)0), 0, 0 }, - { MAP_CHAR_LEN("FirstPage"), ATTR_PRESENT_DIANAME, &::getCppuType((const OUString*)0), 0, 0 }, - { MAP_CHAR_LEN("IsAlwaysOnTop"), ATTR_PRESENT_ALWAYS_ON_TOP, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsAutomatic"), ATTR_PRESENT_MANUEL, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsEndless"), ATTR_PRESENT_ENDLESS, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsFullScreen"), ATTR_PRESENT_FULLSCREEN, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsShowAll"), ATTR_PRESENT_ALL, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsMouseVisible"), ATTR_PRESENT_MOUSE, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsShowLogo"), ATTR_PRESENT_SHOW_PAUSELOGO, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("IsTransitionOnClick"), ATTR_PRESENT_CHANGE_PAGE, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, &::getCppuType((const sal_Int32*)0), 0, 0 }, - { MAP_CHAR_LEN("StartWithNavigator"), ATTR_PRESENT_NAVIGATOR, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN("UsePen"), ATTR_PRESENT_PEN, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("AllowAnimations"), ATTR_PRESENT_ANIMATION_ALLOWED, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("CustomShow"), ATTR_PRESENT_CUSTOMSHOW, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("Display"), ATTR_PRESENT_DISPLAY, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_CHAR_LEN("FirstPage"), ATTR_PRESENT_DIANAME, &::getCppuType((const OUString*)0), 0, 0 }, + { MAP_CHAR_LEN("IsAlwaysOnTop"), ATTR_PRESENT_ALWAYS_ON_TOP, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsAutomatic"), ATTR_PRESENT_MANUEL, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsEndless"), ATTR_PRESENT_ENDLESS, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsFullScreen"), ATTR_PRESENT_FULLSCREEN, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsShowAll"), ATTR_PRESENT_ALL, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsMouseVisible"), ATTR_PRESENT_MOUSE, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsShowLogo"), ATTR_PRESENT_SHOW_PAUSELOGO, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("IsTransitionOnClick"), ATTR_PRESENT_CHANGE_PAGE, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_CHAR_LEN("StartWithNavigator"), ATTR_PRESENT_NAVIGATOR, &::getBooleanCppuType(), 0, 0 }, + { MAP_CHAR_LEN("UsePen"), ATTR_PRESENT_PEN, &::getBooleanCppuType(), 0, 0 }, { 0,0,0,0,0,0} }; @@ -184,7 +184,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) if( pDocument ) xRet = rtl::Reference< SlideShow >( dynamic_cast< SlideShow* >( pDocument->getPresentation().get() ) ); - + return xRet; } @@ -200,7 +200,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SlideShow::GetSlideShowController(ViewShellBase& rBase ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); - + Reference< XSlideShowController > xRet; if( xSlideShow.is() ) xRet = xSlideShow->getController(); @@ -322,7 +322,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const case ATTR_PRESENT_ALL: { sal_Bool bVal = sal_False; - + if( aValue >>= bVal ) { bIllegalArgument = false; @@ -344,7 +344,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const if( aValue >>= bVal ) { bIllegalArgument = false; - + if( bVal == rPresSettings.mbLockedPages ) { bValuesChanged = true; @@ -357,7 +357,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const case ATTR_PRESENT_ANIMATION_ALLOWED: { sal_Bool bVal = sal_False; - + if( aValue >>= bVal ) { bIllegalArgument = false; @@ -686,7 +686,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) // gone wrong. OSL_ASSERT(!mbIsInStartup); mbIsInStartup = false; - + rtl::Reference< SlideshowImpl > xController( mxController ); if( xController.is() ) { @@ -1008,7 +1008,7 @@ void SlideShow::activate( ViewShellBase& rBase ) { pShell->FinishInitialization( mpFullScreenFrameView ); mpFullScreenFrameView = 0; - + CreateController( pShell.get(), pShell->GetView(), rBase.GetViewWindow() ); if( mxController->startShow(mxCurrentSettings.get()) ) @@ -1185,8 +1185,8 @@ void SlideShow::StartInPlacePresentation() { bSuccess = mxController->startShow(mxCurrentSettings.get()); } - - if( !bSuccess ) + + if( !bSuccess ) end(); } } @@ -1216,7 +1216,7 @@ void SlideShow::StartFullscreenPresentation( ) delete mpFullScreenFrameView; mpFullScreenFrameView = new FrameView(mpDoc, pOriginalFrameView); -// Reference<XController> xController; +// Reference<XController> xController; // The new frame is created hidden. To make it visible and activate the // new view shell--a prerequisite to process slot calls and initialize @@ -1246,7 +1246,7 @@ sal_Int32 SlideShow::GetDisplay() if( pOptions ) nDisplay = pOptions->GetDisplay(); - if (nDisplay <= 0 ) + if (nDisplay <= 0 ) { try { |