diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:20:00 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:09 +0200 |
commit | ed6b8a100c1aabb342573f252509573bbe124d29 (patch) | |
tree | 35874493d9470202b3221aa2a1666b6647494242 /sd/source/ui/slideshow | |
parent | 78f6407978aa48c3cbb116bc281940dbf1f2dcbc (diff) |
remove whitespaces
Change-Id: I9daea42a433b5032931a722878874917cf37f4d1
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r-- | sd/source/ui/slideshow/PaneHider.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/slideshow/PaneHider.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/slideshow/SlideShowRestarter.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 36 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 107 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 223 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.hxx | 8 |
9 files changed, 0 insertions, 397 deletions
diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index c87f7532279d..7fb399ef13a0 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PaneHider.hxx" #include "ViewShell.hxx" @@ -81,9 +80,6 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow) } } - - - PaneHider::~PaneHider (void) { if (mxConfiguration.is() && mxConfigurationController.is()) @@ -100,7 +96,6 @@ PaneHider::~PaneHider (void) } } - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx index 097f8cabfe86..bfdda992f7a1 100644 --- a/sd/source/ui/slideshow/PaneHider.hxx +++ b/sd/source/ui/slideshow/PaneHider.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> - namespace sd { class ViewShell; diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index f9dcacf0a7e4..7f72a3c0ce6d 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawController.hxx" #include "SlideShowRestarter.hxx" #include "framework/ConfigurationController.hxx" @@ -34,7 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using ::sd::framework::FrameworkHelper; - namespace sd { SlideShowRestarter::SlideShowRestarter ( diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 00ffb1204cf0..f24e6a153e85 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/awt/Key.hpp> #include "showwindow.hxx" @@ -25,7 +24,6 @@ #include <unotools/syslocale.hxx> #include <sfx2/viewfrm.hxx> - #include "res_bmp.hrc" #include "slideshow.hxx" #include "ViewShellBase.hxx" @@ -43,8 +41,6 @@ namespace sd { static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; - - ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::Window* pParent ) : ::sd::Window( pParent ) , mnPauseTimeout( SLIDE_NO_TIMEOUT ) @@ -87,7 +83,6 @@ ShowWindow::~ShowWindow(void) maMouseTimer.Stop(); } - void ShowWindow::KeyInput(const KeyEvent& rKEvt) { bool bReturn = false; @@ -170,7 +165,6 @@ void ShowWindow::KeyInput(const KeyEvent& rKEvt) mpViewShell->SetActiveWindow( this ); } - void ShowWindow::MouseButtonDown(const MouseEvent& /*rMEvt*/) { if( SHOWWINDOWMODE_PREVIEW == meShowWindowMode ) @@ -183,7 +177,6 @@ void ShowWindow::MouseButtonDown(const MouseEvent& /*rMEvt*/) } } - void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) { if( mbMouseAutoHide ) @@ -225,7 +218,6 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) mpViewShell->SetActiveWindow( this ); } - void ShowWindow::MouseButtonUp(const MouseEvent& rMEvt) { if( SHOWWINDOWMODE_PREVIEW == meShowWindowMode ) @@ -289,8 +281,6 @@ void ShowWindow::GetFocus() Window::GetFocus(); } - - void ShowWindow::LoseFocus() { Window::LoseFocus(); @@ -299,22 +289,16 @@ void ShowWindow::LoseFocus() TerminateShow(); } - - void ShowWindow::Resize() { ::sd::Window::Resize(); } - - void ShowWindow::Move() { ::sd::Window::Move(); } - - bool ShowWindow::SetEndMode() { if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() ) @@ -336,8 +320,6 @@ bool ShowWindow::SetEndMode() return( SHOWWINDOWMODE_END == meShowWindowMode ); } - - bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo ) { rtl::Reference< SlideShow > xSlideShow; @@ -376,8 +358,6 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout return( SHOWWINDOWMODE_PAUSE == meShowWindowMode ); } - - bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ) { if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() ) @@ -400,15 +380,11 @@ bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan return( SHOWWINDOWMODE_BLANK == meShowWindowMode ); } - - void ShowWindow::SetPreviewMode() { meShowWindowMode = SHOWWINDOWMODE_PREVIEW; } - - void ShowWindow::TerminateShow() { maLogo.Clear(); @@ -435,15 +411,11 @@ void ShowWindow::TerminateShow() mnRestartPageIndex = PAGE_NO_END; } - - void ShowWindow::RestartShow() { RestartShow( mnRestartPageIndex ); } - - void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) { @@ -487,8 +459,6 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) } } - - void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) { const MapMode& rMap = GetMapMode(); @@ -562,8 +532,6 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) } } - - void ShowWindow::DrawEndScene() { const Font aOldFont( GetFont() ); @@ -582,15 +550,11 @@ void ShowWindow::DrawEndScene() SetFont( aOldFont ); } - - void ShowWindow::DrawBlankScene() { // just blank through background color => nothing to be done here } - - IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer ) { if( !( --mnPauseTimeout ) ) diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 36453062f051..57be255a37ff 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -70,7 +69,6 @@ using namespace ::com::sun::star::drawing::framework; extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); - namespace { /** This local version of the work window overloads DataChanged() so that it can restart the slide show when a display is added or removed. @@ -101,10 +99,6 @@ namespace { }; } - - - - const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() { // NOTE: First member must be sorted @@ -131,10 +125,8 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() return aPresentationPropertyMap_Impl; } - // class SlideShow - SlideShow::SlideShow( SdDrawDocument* pDoc ) : SlideshowBase( m_aMutex ) , maPropSet(ImplGetPresentationPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool()) @@ -159,8 +151,6 @@ rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc ) return new SlideShow( pDoc ); } - - rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) { rtl::Reference< SlideShow > xRet; @@ -171,23 +161,17 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument ) return xRet; } - - rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument& rDocument ) { return rtl::Reference< SlideShow >( 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 ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); @@ -199,8 +183,6 @@ 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, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, @@ -213,8 +195,6 @@ bool SlideShow::StartPreview( ViewShellBase& rBase, return false; } - - void SlideShow::Stop( ViewShellBase& rBase ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); @@ -222,24 +202,18 @@ void SlideShow::Stop( ViewShellBase& rBase ) xSlideShow->end(); } - - bool SlideShow::IsRunning( ViewShellBase& rBase ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); return xSlideShow.is() && xSlideShow->isRunning(); } - - bool SlideShow::IsRunning( ViewShell& rViewShell ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rViewShell.GetViewShellBase() ) ); return xSlideShow.is() && xSlideShow->isRunning() && (xSlideShow->mxController->getViewShell() == &rViewShell); } - - void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ) { DBG_ASSERT( !mxController.is(), "sd::SlideShow::CreateController(), clean up old controller first!" ); @@ -558,8 +532,6 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const mpDoc->SetChanged( true ); } - - Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -626,42 +598,30 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U } } - - void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - - void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - - void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - - void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - // XPresentation - void SAL_CALL SlideShow::start() throw(RuntimeException, std::exception) { const Sequence< PropertyValue > aArguments; startWithArguments( aArguments ); } - - WorkWindow *SlideShow::GetWorkWindow() { if( !mpFullScreenViewShellBase ) @@ -832,8 +792,6 @@ void SAL_CALL SlideShow::end() } } - - void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exception) { Sequence< PropertyValue > aArguments(1); @@ -842,10 +800,8 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exceptio startWithArguments( aArguments ); } - // XPresentation2 - void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rArguments) throw (RuntimeException, std::exception) { @@ -908,16 +864,12 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr } - - sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mxController.is() && mxController->isRunning(); } - - Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -926,10 +878,8 @@ Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (R return xController; } - // XComponent - void SAL_CALL SlideShow::disposing (void) { SolarMutexGuard aGuard; @@ -951,8 +901,6 @@ void SAL_CALL SlideShow::disposing (void) mpDoc = 0; } - - bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, ::Window* pParent ) { Sequence< PropertyValue > aArguments(4); @@ -978,68 +926,50 @@ 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 ) { if( mxController.is() ) mxController->displaySlideIndex( nPageIndex ); } - - void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber ) { if( mxController.is() ) mxController->displaySlideNumber( nPageNumber ); } - - sal_Int32 SlideShow::getCurrentPageNumber() { return mxController.is() ? mxController->getCurrentSlideNumber() : 0; } - - void SlideShow::jumpToBookmark( const OUString& sBookmark ) { if( mxController.is() ) mxController->jumpToBookmark( sBookmark ); } - - bool SlideShow::isFullScreen() { return mxController.is() && mxController->maPresSettings.mbFullScreen; } - - void SlideShow::resize( const Size &rSize ) { if( mxController.is() ) mxController->resize( rSize ); } - - void SlideShow::activate( ViewShellBase& rBase ) { if( (mpFullScreenViewShellBase == &rBase) && !mxController.is() ) @@ -1071,37 +1001,27 @@ void SlideShow::activate( ViewShellBase& rBase ) } - - void SlideShow::deactivate( ViewShellBase& /*rBase*/ ) { mxController->deactivate(); } - - bool SlideShow::keyInput(const KeyEvent& rKEvt) { return mxController.is() && mxController->keyInput(rKEvt); } - - void SlideShow::paint( const Rectangle& rRect ) { if( mxController.is() ) mxController->paint( rRect ); } - - bool SlideShow::isAlwaysOnTop() { return mxController.is() && mxController->maPresSettings.mbAlwaysOnTop; } - - bool SlideShow::pause( bool bPause ) { if( mxController.is() ) @@ -1114,44 +1034,32 @@ bool SlideShow::pause( bool bPause ) return true; } - - void SlideShow::receiveRequest(SfxRequest& rReq) { if( mxController.is() ) 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(); } - - bool SlideShow::isDrawingPossible() { return mxController.is() && mxController->getUsePen(); } - - void SlideShow::StartInPlacePresentationConfigurationCallback() { if( mnInPlaceConfigEvent != 0 ) @@ -1160,8 +1068,6 @@ void SlideShow::StartInPlacePresentationConfigurationCallback() mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) ); } - - IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) { mnInPlaceConfigEvent = 0; @@ -1169,8 +1075,6 @@ IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl) return 0; } - - void SlideShow::StartInPlacePresentation() { if( mpCurrentViewShellBase ) @@ -1240,8 +1144,6 @@ void SlideShow::StartInPlacePresentation() } } - - void SlideShow::StartFullscreenPresentation( ) { // Create the top level window in which the PresentationViewShell(Base) @@ -1284,8 +1186,6 @@ void SlideShow::StartFullscreenPresentation( ) } } - - /// convert configuration setting display concept to real screens sal_Int32 SlideShow::GetDisplay() { @@ -1307,21 +1207,14 @@ sal_Int32 SlideShow::GetDisplay() return nDisplay; } - - - 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 1341953d74e1..aeaf2121b707 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -113,7 +113,6 @@ static sal_uInt16 const pAllowed[] = SID_NAVIGATOR_OBJECT // 27293 }; - class AnimationSlideController { public: @@ -195,7 +194,6 @@ bool AnimationSlideController::isVisibleSlideNumber( sal_Int32 nSlideNumber ) co return false; } - void AnimationSlideController::setPreviewNode( const Reference< XAnimationNode >& xPreviewNode ) { mxPreviewNode = xPreviewNode; @@ -398,7 +396,6 @@ sal_Int32 AnimationSlideController::getNextSlideNumber() const } } - bool AnimationSlideController::nextSlide() { return jumpToSlideIndex( getNextSlideIndex() ); @@ -492,10 +489,6 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow } } - - - - SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow ) : SlideshowImplBase( m_aMutex ) , mxModel(pDoc->getUnoModel(),UNO_QUERY_THROW) @@ -908,8 +901,6 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) mbRehearseTimings = pPresSettings->mbRehearseTimings; } - - OUString aPresSlide( maPresSettings.maPresPage ); SdPage* pStartPage = mpViewShell->GetActualPage(); bool bStartWithActualSlide = pStartPage; @@ -1167,7 +1158,6 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp mxListenerProxy.set( new SlideShowListenerProxy( this, mxShow ) ); mxListenerProxy->addAsSlideShowListener(); - NotifyDocumentEvent( mpDoc, "OnStartPresentation"); displaySlideIndex( mpSlideController->getStartSlideIndex() ); @@ -1222,24 +1212,18 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) } } - - void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception) { if( mxListenerProxy.is() ) mxListenerProxy->addSlideShowListener( xListener ); } - - void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception) { if( mxListenerProxy.is() ) mxListenerProxy->removeSlideShowListener( xListener ); } - - void SlideshowImpl::slideEnded(const bool bReverse) { if (bReverse) @@ -1248,8 +1232,6 @@ void SlideshowImpl::slideEnded(const bool bReverse) gotoNextSlide(); } - - void SlideshowImpl::removeShapeEvents() { if( mxShow.is() && mxListenerProxy.is() ) try @@ -1276,8 +1258,6 @@ void SlideshowImpl::removeShapeEvents() } } - - void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) { if( nSlideNumber >= 0 ) try @@ -1311,8 +1291,6 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) } } - - void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Exception ) { try @@ -1389,8 +1367,6 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( } } - - void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) { stopSound(); @@ -1420,8 +1396,6 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects) } } - - void SlideshowImpl::endPresentation() { if( maPresSettings.mbMouseAsPen) @@ -1435,8 +1409,6 @@ void SlideshowImpl::endPresentation() mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) ); } - - IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) { mnEndShowEvent = 0; @@ -1446,8 +1418,6 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) return 0; } - - void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1474,8 +1444,6 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception) } } - - void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1513,16 +1481,12 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception) #endif } - - sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbIsPaused; } - - void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1536,10 +1500,8 @@ 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 */ ) { SolarMutexGuard aSolarGuard; @@ -1658,8 +1620,6 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: } } - - sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark ) { bool bIsMasterPage; @@ -1684,8 +1644,6 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark return ( nPgNum - 1) >> 1; } - - void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) { OUString aBookmark( aHyperLink ); @@ -1702,8 +1660,6 @@ void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (Runtim mpDocSh->OpenBookmark( aBookmark ); } - - void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber ) { if( mpSlideController.get() ) @@ -1715,8 +1671,6 @@ void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber ) } } - - /** nSlideIndex == -1 displays current slide again */ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex ) { @@ -1729,8 +1683,6 @@ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex ) } } - - void SlideshowImpl::jumpToBookmark( const OUString& sBookmark ) { sal_Int32 nSlideNumber = getSlideNumberForBookmark( sBookmark ); @@ -1738,15 +1690,11 @@ void SlideshowImpl::jumpToBookmark( const OUString& sBookmark ) displaySlideNumber( nSlideNumber ); } - - sal_Int32 SlideshowImpl::getCurrentSlideNumber() { return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1; } - - sal_Int32 SlideshowImpl::getFirstSlideNumber() { sal_Int32 nRet = 0; @@ -1768,8 +1716,6 @@ sal_Int32 SlideshowImpl::getFirstSlideNumber() return nRet; } - - sal_Int32 SlideshowImpl::getLastSlideNumber() { sal_Int32 nRet = 0; @@ -1791,24 +1737,18 @@ sal_Int32 SlideshowImpl::getLastSlideNumber() return nRet; } - - sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; return maPresSettings.mbEndless; } - - double SlideshowImpl::update() { startUpdateTimer(); return -1; } - - void SlideshowImpl::startUpdateTimer() { SolarMutexGuard aSolarGuard; @@ -1816,8 +1756,6 @@ 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 slide change to skip input that was buffered during slide @@ -1828,8 +1766,6 @@ 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 person seriously, even if this person is me. @@ -1839,9 +1775,6 @@ IMPL_LINK_NOARG(SlideshowImpl, updateHdl) return updateSlideShow(); } - - - IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener) { // prevent me from deletion when recursing (App::Reschedule does) @@ -1858,9 +1791,6 @@ IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener) return updateSlideShow(); } - - - sal_Int32 SlideshowImpl::updateSlideShow (void) { // prevent me from deletion when recursing (App::EnableYieldMode does) @@ -1929,8 +1859,6 @@ sal_Int32 SlideshowImpl::updateSlideShow (void) return 0; } - - bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) { if( !mxShow.is() || mbInputFreeze ) @@ -2136,8 +2064,6 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent ) return 0; } - - void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) { if( rMEvt.IsRight() && !mnContextMenuEvent ) @@ -2147,8 +2073,6 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) } } - - IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) { mnContextMenuEvent = 0; @@ -2283,8 +2207,6 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl) return 0; } - - IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) { if( pMenu ) @@ -2439,8 +2361,6 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu ) return 0; } - - Reference< XSlideShow > SlideshowImpl::createSlideShow() const { Reference< XSlideShow > xShow; @@ -2465,8 +2385,6 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const return xShow; } - - void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { const long nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD ); @@ -2493,7 +2411,6 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { sal_Int32 nFirstVisibleSlide = 0; - // normal presentation if( !rPresSlide.isEmpty() ) { @@ -2555,8 +2472,6 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) } } - - typedef sal_uInt16 (*FncGetChildWindowId)(); FncGetChildWindowId aShowChildren[] = @@ -2603,8 +2518,6 @@ void SlideshowImpl::hideChildWindows() } } - - void SlideshowImpl::showChildWindows() { if( ANIMATIONMODE_SHOW == meAnimationMode ) @@ -2623,29 +2536,21 @@ 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 ) { maPresSize = rSize; @@ -2672,8 +2577,6 @@ void SlideshowImpl::resize( const Size& rSize ) } } - - void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) { // in case of ActiveX control the toolbars should not be visible if slide show runs in window mode @@ -2706,8 +2609,6 @@ void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) } } - - void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2747,8 +2648,6 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) } } - - void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2759,8 +2658,6 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exceptio } } - - IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) { if( mbActive && mxShow.is() ) @@ -2783,16 +2680,12 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) return 0; } - - sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbActive; } - - void SlideshowImpl::receiveRequest(SfxRequest& rReq) { const SfxItemSet* pArgs = rReq.GetArgs(); @@ -2845,8 +2738,6 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq) } } - - void SlideshowImpl::setAutoSaveState( bool bOn) { try @@ -2871,8 +2762,6 @@ void SlideshowImpl::setAutoSaveState( bool bOn) } } - - Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2888,8 +2777,6 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE return xSlide; } - - sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2904,24 +2791,18 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, s } } - - sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException, std::exception) { return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1; } - // ::com::sun::star::presentation::XSlideShowController: - ::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException, std::exception) { return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0; } - - Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) { if( (mpSlideController.get() == 0 ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) ) @@ -2936,8 +2817,6 @@ sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException, std:: return maPresSettings.mbAlwaysOnTop; } - - void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2948,24 +2827,18 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx } } - - sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return maPresSettings.mbFullScreen; } - - sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return maPresSettings.mbMouseVisible; } - - void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2977,16 +2850,12 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime } } - - sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbUsePen; } - - void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3028,16 +2897,12 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc } } - - double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mdUserPaintStrokeWidth; } - - void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3045,16 +2910,12 @@ 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, std::exception) { SolarMutexGuard aSolarGuard; return mnUserPaintColor; } - - void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3062,14 +2923,10 @@ 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) { SolarMutexGuard aSolarGuard; @@ -3077,7 +2934,6 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc } - void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (css::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -3096,7 +2952,6 @@ 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; @@ -3115,7 +2970,6 @@ void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometr } } - void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException) { if( bEraseAllInk ) @@ -3144,18 +2998,14 @@ void SAL_CALL SlideshowImpl::setEraserMode( bool /*bSwitchEraserMode*/ ) throw ( { } - // XSlideShowController Methods - sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mxShow.is(); } - - void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3182,8 +3032,6 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::ex } } - - void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3206,8 +3054,6 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std } } - - void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3229,8 +3075,6 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::ex } } - - void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3302,8 +3146,6 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exc } } - - void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException, std::exception) { gotoPreviousSlide(false); @@ -3358,8 +3200,6 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) } } - - void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3384,8 +3224,6 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::excep } } - - void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3398,8 +3236,6 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru displaySlideNumber( nSlideNumber ); } - - void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) throw(IllegalArgumentException, RuntimeException, std::exception) { @@ -3421,8 +3257,6 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) } } - - void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3433,8 +3267,6 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx displaySlideIndex( nIndex ); } - - void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3458,46 +3290,33 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::excepti } } - // XIndexAccess - ::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { 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, std::exception) { return Any( getSlideByIndex( Index ) ); } - - ::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return cppu::UnoType<XDrawPage>::get(); } - - sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return getSlideCount() != 0; } - - Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException, std::exception) { return mxShow; } - - - PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r ) : PresentationSettings( r ) , mbRehearseTimings(r.mbRehearseTimings) @@ -3620,12 +3439,8 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const throw IllegalArgumentException(); } - - - // XAnimationListener - SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow ) : maListeners( m_aMutex ) , mxController( xController ) @@ -3633,14 +3448,10 @@ SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowI { } - - SlideShowListenerProxy::~SlideShowListenerProxy() { } - - void SlideShowListenerProxy::addAsSlideShowListener() { if( mxSlideShow.is() ) @@ -3650,8 +3461,6 @@ void SlideShowListenerProxy::addAsSlideShowListener() } } - - void SlideShowListenerProxy::removeAsSlideShowListener() { if( mxSlideShow.is() ) @@ -3661,8 +3470,6 @@ void SlideShowListenerProxy::removeAsSlideShowListener() } } - - void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ) { if( mxSlideShow.is() ) @@ -3672,8 +3479,6 @@ void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< c } } - - void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ) { if( mxSlideShow.is() ) @@ -3683,22 +3488,16 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3707,8 +3506,6 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3717,8 +3514,6 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3727,10 +3522,8 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3739,8 +3532,6 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3749,8 +3540,6 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3759,8 +3548,6 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3769,8 +3556,6 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3779,8 +3564,6 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideAnimationsEnded ) ); } - - void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException, std::exception) { { @@ -3798,8 +3581,6 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti } } - - void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception) { { @@ -3816,10 +3597,8 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro } } - // XEventListener - void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::EventObject& aDisposeEvent ) throw (RuntimeException, std::exception) { maListeners.disposeAndClear( aDisposeEvent ); @@ -3827,10 +3606,8 @@ 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, std::exception) { SolarMutexGuard aSolarGuard; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 8d54e5dec4b5..7514fdf51def 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -87,8 +87,6 @@ class SlideShowView; class AnimationSlideController; class PaneHider; - - struct PresentationSettingsEx : public PresentationSettings { bool mbRehearseTimings; @@ -105,8 +103,6 @@ struct PresentationSettingsEx : public PresentationSettings void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException); }; - - struct WrappedShapeEventImpl { css::presentation::ClickAction meClickAction; @@ -118,8 +114,6 @@ struct WrappedShapeEventImpl typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr; typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap; - - class SlideShowListenerProxy : private ::cppu::BaseMutex, public ::cppu::WeakImplHelper2< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > { @@ -162,8 +156,6 @@ public: css::uno::Reference< css::presentation::XSlideShow > mxSlideShow; }; - - typedef ::cppu::WeakComponentImplHelper2< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase; class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 30096f43d90c..093c920c7e23 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -31,7 +31,6 @@ #include <cppcanvas/vclfactory.hxx> #include <cppcanvas/basegfxfactory.hxx> - using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::Reference; @@ -49,7 +48,6 @@ using namespace ::com::sun::star; namespace sd { - // SlideShowViewListeners SlideShowViewListeners::SlideShowViewListeners( ::osl::Mutex& rMutex ) : mrMutex( rMutex ) @@ -111,7 +109,6 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) maListeners.clear(); } - // SlideShowViewPaintListeners SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex ) : SlideShowViewPaintListeners_Base( rMutex ) @@ -125,7 +122,6 @@ bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintL return true; // continue calling listeners } - // SlideShowViewMouseListeners SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseListeners_Base( rMutex ) @@ -157,7 +153,6 @@ bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseL return true; // continue calling listeners } - // SlideShowViewMouseMotionListeners SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mutex& rMutex ) : SlideShowViewMouseMotionListeners_Base( rMutex ) @@ -181,7 +176,6 @@ bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::X return true; // continue calling listeners } - // SlideShowView SlideShowView::SlideShowView( ShowWindow& rOutputWindow, SdDrawDocument* pDoc, @@ -304,7 +298,6 @@ void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeExcept // fill the bounds rectangle in black - const Size aWindowSize( mrOutputWindow.GetSizePixel() ); ::basegfx::B2DPolygon aPoly( ::basegfx::tools::createPolygonFromRect( diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index fb01e7e19135..0bfd22ce9228 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -97,7 +97,6 @@ struct WrappedMouseMotionEvent : public ::com::sun::star::lang::EventObject ::com::sun::star::awt::MouseEvent maEvent; }; - // SlideShowViewListeners typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > > ViewListenerVector; class SlideShowViewListeners @@ -117,7 +116,6 @@ protected: typedef ::std::auto_ptr< SlideShowViewListeners > SlideShowViewListenersPtr; - // SlideShowViewPaintListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XPaintListener, ::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base; @@ -132,7 +130,6 @@ protected: }; typedef ::std::auto_ptr< SlideShowViewPaintListeners > SlideShowViewPaintListenersPtr; - // SlideShowViewMouseListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseListener, WrappedMouseEvent > SlideShowViewMouseListeners_Base; @@ -148,8 +145,6 @@ protected: typedef ::std::auto_ptr< SlideShowViewMouseListeners > SlideShowViewMouseListenersPtr; - - // SlideShowViewMouseMotionListeners typedef ::comphelper::OListenerContainerBase< ::com::sun::star::awt::XMouseMotionListener, WrappedMouseMotionEvent > SlideShowViewMouseMotionListeners_Base; @@ -165,8 +160,6 @@ protected: }; typedef ::std::auto_ptr< SlideShowViewMouseMotionListeners > SlideShowViewMouseMotionListenersPtr; - - // SlideShowView class ShowWindow; class SlideshowImpl; @@ -258,7 +251,6 @@ private: ::com::sun::star::geometry::IntegerSize2D mTranslationOffset; }; - } // namespace ::sd #endif |