diff options
Diffstat (limited to 'sd/source/ui/slideshow')
| -rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 28 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 114 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 224 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 2 |
4 files changed, 184 insertions, 184 deletions
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 2093c96a27e7..006919aae283 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -289,7 +289,7 @@ void ShowWindow::GetFocus() Window::GetFocus(); } -// ----------------------------------------------------------------------------- + void ShowWindow::LoseFocus() { @@ -299,21 +299,21 @@ void ShowWindow::LoseFocus() TerminateShow(); } -// ----------------------------------------------------------------------------- + void ShowWindow::Resize() { ::sd::Window::Resize(); } -// ----------------------------------------------------------------------------- + void ShowWindow::Move() { ::sd::Window::Move(); } -// ----------------------------------------------------------------------------- + bool ShowWindow::SetEndMode() { @@ -336,7 +336,7 @@ bool ShowWindow::SetEndMode() return( SHOWWINDOWMODE_END == meShowWindowMode ); } -// ----------------------------------------------------------------------------- + bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo ) { @@ -376,7 +376,7 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout return( SHOWWINDOWMODE_PAUSE == meShowWindowMode ); } -// ----------------------------------------------------------------------------- + bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ) { @@ -400,14 +400,14 @@ bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan return( SHOWWINDOWMODE_BLANK == meShowWindowMode ); } -// ----------------------------------------------------------------------------- + void ShowWindow::SetPreviewMode() { meShowWindowMode = SHOWWINDOWMODE_PREVIEW; } -// ----------------------------------------------------------------------------- + void ShowWindow::TerminateShow() { @@ -435,14 +435,14 @@ void ShowWindow::TerminateShow() mnRestartPageIndex = PAGE_NO_END; } -// ----------------------------------------------------------------------------- + void ShowWindow::RestartShow() { RestartShow( mnRestartPageIndex ); } -// ----------------------------------------------------------------------------- + void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) @@ -486,7 +486,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) } } -// ----------------------------------------------------------------------------- + void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) { @@ -561,7 +561,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) } } -// ----------------------------------------------------------------------------- + void ShowWindow::DrawEndScene() { @@ -581,14 +581,14 @@ void ShowWindow::DrawEndScene() SetFont( aOldFont ); } -// ----------------------------------------------------------------------------- + void ShowWindow::DrawBlankScene() { // just blank through background color => nothing to be done here } -// ----------------------------------------------------------------------------- + IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer ) { diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 6795f92e8fb4..8f3f757bb182 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -102,7 +102,7 @@ namespace { ////////////////////////////////////////////////////////////////////////////// -// -------------------------------------------------------------------- + const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() { @@ -130,9 +130,9 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() return aPresentationPropertyMap_Impl; } -// -------------------------------------------------------------------- + // class SlideShow -// -------------------------------------------------------------------- + SlideShow::SlideShow( SdDrawDocument* pDoc ) : SlideshowBase( m_aMutex ) @@ -146,7 +146,7 @@ SlideShow::SlideShow( SdDrawDocument* pDoc ) { } -// -------------------------------------------------------------------- + void SlideShow::ThrowIfDisposed() throw (RuntimeException) { @@ -154,7 +154,7 @@ void SlideShow::ThrowIfDisposed() throw (RuntimeException) throw DisposedException(); } -// -------------------------------------------------------------------- + /// used by the model to create a slideshow for it rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc ) @@ -162,7 +162,7 @@ rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc ) return new SlideShow( pDoc ); } -// -------------------------------------------------------------------- + rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) { @@ -174,7 +174,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) return xRet; } -// -------------------------------------------------------------------- + rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument& rDocument ) { @@ -182,14 +182,14 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument& rDocument ) dynamic_cast< SlideShow* >( rDocument.getPresentation().get() ) ); } -// -------------------------------------------------------------------- + rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) { return GetSlideShow( rBase.GetDocument() ); } -// -------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SlideShow::GetSlideShowController(ViewShellBase& rBase ) { @@ -202,7 +202,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) return xRet; } -// -------------------------------------------------------------------- + bool SlideShow::StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, @@ -216,7 +216,7 @@ bool SlideShow::StartPreview( ViewShellBase& rBase, return false; } -// -------------------------------------------------------------------- + void SlideShow::Stop( ViewShellBase& rBase ) { @@ -225,7 +225,7 @@ void SlideShow::Stop( ViewShellBase& rBase ) xSlideShow->end(); } -// -------------------------------------------------------------------- + bool SlideShow::IsRunning( ViewShellBase& rBase ) { @@ -233,7 +233,7 @@ bool SlideShow::IsRunning( ViewShellBase& rBase ) return xSlideShow.is() && xSlideShow->isRunning(); } -// -------------------------------------------------------------------- + bool SlideShow::IsRunning( ViewShell& rViewShell ) { @@ -241,7 +241,7 @@ bool SlideShow::IsRunning( ViewShell& rViewShell ) return xSlideShow.is() && xSlideShow->isRunning() && (xSlideShow->mxController->getViewShell() == &rViewShell); } -// -------------------------------------------------------------------- + void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ) { @@ -561,7 +561,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const mpDoc->SetChanged( true ); } -// -------------------------------------------------------------------- + Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { @@ -629,33 +629,33 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U } } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { } -// -------------------------------------------------------------------- + // XPresentation -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::start() throw(RuntimeException) { @@ -663,7 +663,7 @@ void SAL_CALL SlideShow::start() throw(RuntimeException) startWithArguments( aArguments ); } -// -------------------------------------------------------------------- + WorkWindow *SlideShow::GetWorkWindow() { @@ -820,7 +820,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException) { @@ -830,9 +830,9 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException) startWithArguments( aArguments ); } -// -------------------------------------------------------------------- + // XPresentation2 -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rArguments ) throw (RuntimeException) { @@ -895,7 +895,7 @@ void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rA } -// -------------------------------------------------------------------- + ::sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException) { @@ -903,7 +903,7 @@ void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rA return mxController.is() && mxController->isRunning(); } -// -------------------------------------------------------------------- + Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (RuntimeException) { @@ -913,9 +913,9 @@ Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (R return xController; } -// -------------------------------------------------------------------- + // XComponent -// -------------------------------------------------------------------- + void SAL_CALL SlideShow::disposing (void) { @@ -938,7 +938,7 @@ void SAL_CALL SlideShow::disposing (void) mpDoc = 0; } -// --------------------------------------------------------- + bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, ::Window* pParent ) { @@ -965,21 +965,21 @@ bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Ref return true; } -// --------------------------------------------------------- + ShowWindow* SlideShow::getShowWindow() { return mxController.is() ? mxController->mpShowWindow : 0; } -// --------------------------------------------------------- + int SlideShow::getAnimationMode() { return mxController.is() ? mxController->meAnimationMode : ANIMATIONMODE_SHOW; } -// --------------------------------------------------------- + void SlideShow::jumpToPageIndex( sal_Int32 nPageIndex ) { @@ -987,7 +987,7 @@ void SlideShow::jumpToPageIndex( sal_Int32 nPageIndex ) mxController->displaySlideIndex( nPageIndex ); } -// --------------------------------------------------------- + void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber ) { @@ -995,14 +995,14 @@ void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber ) mxController->displaySlideNumber( nPageNumber ); } -// --------------------------------------------------------- + sal_Int32 SlideShow::getCurrentPageNumber() { return mxController.is() ? mxController->getCurrentSlideNumber() : 0; } -// --------------------------------------------------------- + void SlideShow::jumpToBookmark( const OUString& sBookmark ) { @@ -1010,14 +1010,14 @@ void SlideShow::jumpToBookmark( const OUString& sBookmark ) mxController->jumpToBookmark( sBookmark ); } -// --------------------------------------------------------- + bool SlideShow::isFullScreen() { return mxController.is() ? mxController->maPresSettings.mbFullScreen : false; } -// --------------------------------------------------------- + void SlideShow::resize( const Size &rSize ) { @@ -1025,7 +1025,7 @@ void SlideShow::resize( const Size &rSize ) mxController->resize( rSize ); } -// --------------------------------------------------------- + void SlideShow::activate( ViewShellBase& rBase ) { @@ -1058,21 +1058,21 @@ void SlideShow::activate( ViewShellBase& rBase ) } -// --------------------------------------------------------- + void SlideShow::deactivate( ViewShellBase& /*rBase*/ ) { mxController->deactivate(); } -// --------------------------------------------------------- + bool SlideShow::keyInput(const KeyEvent& rKEvt) { return mxController.is() ? mxController->keyInput(rKEvt) : false; } -// --------------------------------------------------------- + void SlideShow::paint( const Rectangle& rRect ) { @@ -1080,14 +1080,14 @@ void SlideShow::paint( const Rectangle& rRect ) mxController->paint( rRect ); } -// --------------------------------------------------------- + bool SlideShow::isAlwaysOnTop() { return mxController.is() ? mxController->maPresSettings.mbAlwaysOnTop : false; } -// --------------------------------------------------------- + bool SlideShow::pause( bool bPause ) { @@ -1101,7 +1101,7 @@ bool SlideShow::pause( bool bPause ) return true; } -// --------------------------------------------------------- + void SlideShow::receiveRequest(SfxRequest& rReq) { @@ -1109,35 +1109,35 @@ void SlideShow::receiveRequest(SfxRequest& rReq) mxController->receiveRequest( rReq ); } -// --------------------------------------------------------- + sal_Int32 SlideShow::getFirstPageNumber() { return mxController.is() ? mxController->getFirstSlideNumber() : 0; } -// --------------------------------------------------------- + sal_Int32 SlideShow::getLastPageNumber() { return mxController.is() ? mxController->getLastSlideNumber() : 0; } -// --------------------------------------------------------- + bool SlideShow::isEndless() { return mxController.is() ? mxController->isEndless() : false; } -// --------------------------------------------------------- + bool SlideShow::isDrawingPossible() { return mxController.is() ? mxController->getUsePen() : false; } -// --------------------------------------------------------- + void SlideShow::StartInPlacePresentationConfigurationCallback() { @@ -1147,7 +1147,7 @@ void SlideShow::StartInPlacePresentationConfigurationCallback() mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) ); } -// --------------------------------------------------------- + IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) { @@ -1156,7 +1156,7 @@ IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) return 0; } -// --------------------------------------------------------- + void SlideShow::StartInPlacePresentation() { @@ -1227,7 +1227,7 @@ void SlideShow::StartInPlacePresentation() } } -// --------------------------------------------------------- + void SlideShow::StartFullscreenPresentation( ) { @@ -1274,7 +1274,7 @@ void SlideShow::StartFullscreenPresentation( ) } } -// --------------------------------------------------------- + /// convert configuration setting display concept to real screens sal_Int32 SlideShow::GetDisplay() @@ -1297,7 +1297,7 @@ sal_Int32 SlideShow::GetDisplay() return nDisplay; } -// --------------------------------------------------------- + bool SlideShow::dependsOn( ViewShellBase* pViewShellBase ) @@ -1305,13 +1305,13 @@ bool SlideShow::dependsOn( ViewShellBase* pViewShellBase ) return mxController.is() && (pViewShellBase == mpCurrentViewShellBase) && mpFullScreenViewShellBase; } -// --------------------------------------------------------- + Reference< presentation::XPresentation2 > CreatePresentation( const SdDrawDocument& rDocument ) { return Reference< presentation::XPresentation2 >( SlideShow::Create( const_cast< SdDrawDocument* >( &rDocument ) ).get() ); } -// --------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index d04c43228261..eee338483171 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -915,7 +915,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) mbRehearseTimings = pPresSettings->mbRehearseTimings; } - // --- + OUString aPresSlide( maPresSettings.maPresPage ); SdPage* pStartPage = mpViewShell->GetActualPage(); @@ -1229,7 +1229,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException) { @@ -1237,7 +1237,7 @@ void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowLi mxListenerProxy->addSlideShowListener( xListener ); } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException) { @@ -1245,7 +1245,7 @@ void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideSho mxListenerProxy->removeSlideShowListener( xListener ); } -// --------------------------------------------------------- + void SlideshowImpl::slideEnded(const bool bReverse) { @@ -1255,7 +1255,7 @@ void SlideshowImpl::slideEnded(const bool bReverse) gotoNextSlide(); } -// --------------------------------------------------------- + void SlideshowImpl::removeShapeEvents() { @@ -1283,7 +1283,7 @@ void SlideshowImpl::removeShapeEvents() } } -// --------------------------------------------------------- + void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) { @@ -1318,7 +1318,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) } } -// --------------------------------------------------------- + void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Exception ) { @@ -1396,7 +1396,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( } } -// --------------------------------------------------------- + void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) { @@ -1427,7 +1427,7 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) } } -// --------------------------------------------------------- + void SlideshowImpl::endPresentation() { @@ -1442,7 +1442,7 @@ void SlideshowImpl::endPresentation() mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) ); } -// --------------------------------------------------------- + IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) { @@ -1453,7 +1453,7 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) return 0; } -// --------------------------------------------------------- + void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) { @@ -1481,7 +1481,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) } } -// --------------------------------------------------------- + void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) { @@ -1520,7 +1520,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) #endif } -// --------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException) { @@ -1528,7 +1528,7 @@ sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException) return mbIsPaused; } -// --------------------------------------------------------- + void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException) { @@ -1543,9 +1543,9 @@ void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeExcep } } -// --------------------------------------------------------- + // XShapeEventListener -// --------------------------------------------------------- + void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& /* aOriginalEvent */ ) { @@ -1665,7 +1665,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: } } -// --------------------------------------------------------- + sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark ) { @@ -1691,7 +1691,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark return ( nPgNum - 1) >> 1; } -// --------------------------------------------------------- + void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { @@ -1709,7 +1709,7 @@ void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (Runtim mpDocSh->OpenBookmark( aBookmark ); } -// --------------------------------------------------------- + void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber ) { @@ -1722,7 +1722,7 @@ void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber ) } } -// --------------------------------------------------------- + /** nSlideIndex == -1 displays current slide again */ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex ) @@ -1736,7 +1736,7 @@ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex ) } } -// --------------------------------------------------------- + void SlideshowImpl::jumpToBookmark( const OUString& sBookmark ) { @@ -1745,14 +1745,14 @@ void SlideshowImpl::jumpToBookmark( const OUString& sBookmark ) displaySlideNumber( nSlideNumber ); } -// --------------------------------------------------------- + sal_Int32 SlideshowImpl::getCurrentSlideNumber() { return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1; } -// --------------------------------------------------------- + sal_Int32 SlideshowImpl::getFirstSlideNumber() { @@ -1775,7 +1775,7 @@ sal_Int32 SlideshowImpl::getFirstSlideNumber() return nRet; } -// --------------------------------------------------------- + sal_Int32 SlideshowImpl::getLastSlideNumber() { @@ -1798,7 +1798,7 @@ sal_Int32 SlideshowImpl::getLastSlideNumber() return nRet; } -// --------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException ) { @@ -1806,7 +1806,7 @@ sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException ) return maPresSettings.mbEndless; } -// --------------------------------------------------------- + double SlideshowImpl::update() { @@ -1814,7 +1814,7 @@ double SlideshowImpl::update() return -1; } -// --------------------------------------------------------- + void SlideshowImpl::startUpdateTimer() { @@ -1823,7 +1823,7 @@ void SlideshowImpl::startUpdateTimer() maUpdateTimer.Start(); } -// --------------------------------------------------------- + /** this timer is called 20ms after a new slide was displayed. This is used to unfreeze user input that was disabled after @@ -1835,7 +1835,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl) return 0; } -// --------------------------------------------------------- + /** if I catch someone someday who calls this method by hand and not by using the timer, I will personaly punish this @@ -1938,7 +1938,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) return 0; } -// --------------------------------------------------------- + bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) { @@ -2145,7 +2145,7 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent ) return 0; } -// --------------------------------------------------------- + void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) { @@ -2156,7 +2156,7 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) } } -// --------------------------------------------------------- + IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) { @@ -2292,7 +2292,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) return 0; } -// --------------------------------------------------------- + IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) { @@ -2448,7 +2448,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) return 0; } -// --------------------------------------------------------- + Reference< XSlideShow > SlideshowImpl::createSlideShow() const { @@ -2474,7 +2474,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const return xShow; } -// --------------------------------------------------------- + void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { @@ -2564,7 +2564,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) } } -// --------------------------------------------------------- + typedef sal_uInt16 (*FncGetChildWindowId)(); @@ -2612,7 +2612,7 @@ void SlideshowImpl::hideChildWindows() } } -// --------------------------------------------------------- + void SlideshowImpl::showChildWindows() { @@ -2632,28 +2632,28 @@ void SlideshowImpl::showChildWindows() } } -// --------------------------------------------------------- + SfxViewFrame* SlideshowImpl::getViewFrame() const { return mpViewShell ? mpViewShell->GetViewFrame() : 0; } -// --------------------------------------------------------- + SfxDispatcher* SlideshowImpl::getDispatcher() const { return (mpViewShell && mpViewShell->GetViewFrame()) ? mpViewShell->GetViewFrame()->GetDispatcher() : 0; } -// --------------------------------------------------------- + SfxBindings* SlideshowImpl::getBindings() const { return (mpViewShell && mpViewShell->GetViewFrame()) ? &mpViewShell->GetViewFrame()->GetBindings() : 0; } -// --------------------------------------------------------- + void SlideshowImpl::resize( const Size& rSize ) { @@ -2681,7 +2681,7 @@ void SlideshowImpl::resize( const Size& rSize ) } } -// ----------------------------------------------------------------------------- + void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) { @@ -2715,7 +2715,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) } } -// ----------------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::activate() throw (RuntimeException) { @@ -2756,7 +2756,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException) } } -// ----------------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException) { @@ -2768,7 +2768,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException) } } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) { @@ -2792,7 +2792,7 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) return 0; } -// --------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException) { @@ -2800,7 +2800,7 @@ sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException) return mbActive; } -// ----------------------------------------------------------------------------- + void SlideshowImpl::receiveRequest(SfxRequest& rReq) { @@ -2854,7 +2854,7 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq) } } -// --------------------------------------------------------- + void SlideshowImpl::setAutoSaveState( bool bOn) { @@ -2880,7 +2880,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn) } } -// --------------------------------------------------------- + Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException) { @@ -2897,7 +2897,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE return xSlide; } -// --------------------------------------------------------- + sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException) { @@ -2913,23 +2913,23 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException) } } -// --------------------------------------------------------- + sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException) { return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1; } -// -------------------------------------------------------------------- + // ::com::sun::star::presentation::XSlideShowController: -// -------------------------------------------------------------------- + ::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException) { return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0; } -// -------------------------------------------------------------------- + Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException) { @@ -2945,7 +2945,7 @@ sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException) return maPresSettings.mbAlwaysOnTop; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException) { @@ -2957,7 +2957,7 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx } } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException) { @@ -2965,7 +2965,7 @@ sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException) return maPresSettings.mbFullScreen; } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException) { @@ -2973,7 +2973,7 @@ sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException) return maPresSettings.mbMouseVisible; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException) { @@ -2986,7 +2986,7 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime } } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException) { @@ -2994,7 +2994,7 @@ sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException) return mbUsePen; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException) { @@ -3037,7 +3037,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc } } -// -------------------------------------------------------------------- + double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException) { @@ -3045,7 +3045,7 @@ double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException) return mdUserPaintStrokeWidth; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException) { @@ -3054,7 +3054,7 @@ void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeEx setUsePen( true ); // enable pen mode, update color and width } -// -------------------------------------------------------------------- + sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException) { @@ -3062,7 +3062,7 @@ sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException) return mnUserPaintColor; } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException) { @@ -3071,13 +3071,13 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeExcep setUsePen( true ); // enable pen mode, update color } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setUseEraser( ::sal_Bool /*_usepen*/ ) throw (css::uno::RuntimeException) { } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException) { @@ -3086,7 +3086,7 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (css::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -3105,7 +3105,7 @@ void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (cs } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -3123,7 +3123,7 @@ void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometr "exception caught: " << comphelper::anyToString( cppu::getCaughtException() )); } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException) { @@ -3153,9 +3153,9 @@ void SAL_CALL SlideshowImpl::setEraserMode( bool /*bSwitchEraserMode*/ ) throw ( { } -// -------------------------------------------------------------------- + // XSlideShowController Methods -// -------------------------------------------------------------------- + sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException) { @@ -3163,7 +3163,7 @@ sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException) return mxShow.is(); } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException) { @@ -3191,7 +3191,7 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException) { @@ -3215,7 +3215,7 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException) { @@ -3238,7 +3238,7 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) { @@ -3311,7 +3311,7 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException) { @@ -3367,7 +3367,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException) { @@ -3393,7 +3393,7 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException) { @@ -3407,7 +3407,7 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru displaySlideNumber( nSlideNumber ); } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) throw(IllegalArgumentException, RuntimeException) @@ -3430,7 +3430,7 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) } } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException) { @@ -3442,7 +3442,7 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx displaySlideIndex( nIndex ); } -// -------------------------------------------------------------------- + void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) { @@ -3467,44 +3467,44 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) } } -// -------------------------------------------------------------------- + // XIndexAccess -// -------------------------------------------------------------------- + ::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (::com::sun::star::uno::RuntimeException) { return getSlideCount(); } -// -------------------------------------------------------------------- + ::com::sun::star::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return Any( getSlideByIndex( Index ) ); } -// -------------------------------------------------------------------- + ::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (::com::sun::star::uno::RuntimeException) { return cppu::UnoType<XDrawPage>::get(); } -// -------------------------------------------------------------------- + ::sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (::com::sun::star::uno::RuntimeException) { return getSlideCount() != 0; } -// -------------------------------------------------------------------- + Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException) { return mxShow; } -// -------------------------------------------------------------------- + PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r ) @@ -3631,9 +3631,9 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const //////////////////////////////// -// --------------------------------------------------------- + // XAnimationListener -// --------------------------------------------------------- + SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow ) : maListeners( m_aMutex ) @@ -3642,13 +3642,13 @@ SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowI { } -// --------------------------------------------------------- + SlideShowListenerProxy::~SlideShowListenerProxy() { } -// --------------------------------------------------------- + void SlideShowListenerProxy::addAsSlideShowListener() { @@ -3659,7 +3659,7 @@ void SlideShowListenerProxy::addAsSlideShowListener() } } -// --------------------------------------------------------- + void SlideShowListenerProxy::removeAsSlideShowListener() { @@ -3670,7 +3670,7 @@ void SlideShowListenerProxy::removeAsSlideShowListener() } } -// --------------------------------------------------------- + void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ) { @@ -3681,7 +3681,7 @@ void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< c } } -// --------------------------------------------------------- + void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ) { @@ -3692,21 +3692,21 @@ void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference } } -// --------------------------------------------------------- + void SlideShowListenerProxy::addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& xListener ) { maListeners.addInterface(xListener); } -// --------------------------------------------------------- + void SlideShowListenerProxy::removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& xListener ) { maListeners.removeInterface(xListener); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException) { @@ -3716,7 +3716,7 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNod maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::beginEvent, _1, boost::cref(xNode) )); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException) { @@ -3726,7 +3726,7 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::endEvent, _1, boost::cref(xNode) )); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException) { @@ -3736,9 +3736,9 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::repeat, _1, boost::cref(xNode), boost::cref(nRepeat) )); } -// --------------------------------------------------------- + // ::com::sun::star::presentation::XSlideShowListener: -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3748,7 +3748,7 @@ void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::R maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::paused ) ); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3758,7 +3758,7 @@ void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno:: maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::resumed ) ); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException) { @@ -3768,7 +3768,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionStarted ) ); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3778,7 +3778,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun: maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionEnded ) ); } -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException) { @@ -3788,7 +3788,7 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideAnimationsEnded ) ); } -// --------------------------------------------------------- + void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException) { @@ -3807,7 +3807,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti } } -// --------------------------------------------------------- + void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { @@ -3825,9 +3825,9 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro } } -// --------------------------------------------------------- + // XEventListener -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::EventObject& aDisposeEvent ) throw (RuntimeException) { @@ -3836,9 +3836,9 @@ void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::E mxSlideShow.clear(); } -// --------------------------------------------------------- + // XShapeEventListener -// --------------------------------------------------------- + void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException) { diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 45c9b2b1aa27..2eed17d46b69 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -314,7 +314,7 @@ void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeExcept SolarMutexGuard aSolarGuard; // fill the bounds rectangle in black - // ---------------------------------- + const Size aWindowSize( mrOutputWindow.GetSizePixel() ); |