diff options
Diffstat (limited to 'slideshow/source/engine/slideshowimpl.cxx')
-rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 8e0d7f2443e8..ec0b720d9f7c 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -279,52 +279,52 @@ public: private: // XSlideShow: - virtual sal_Bool SAL_CALL nextEffect() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException); + virtual sal_Bool SAL_CALL nextEffect() throw (uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL startShapeActivity( uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL stopShapeActivity( uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual uno::Reference<drawing::XDrawPage> SAL_CALL getCurrentSlide() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual void SAL_CALL displaySlide( uno::Reference<drawing::XDrawPage> const& xSlide, uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages, uno::Reference<animations::XAnimationNode> const& xRootNode, uno::Sequence<beans::PropertyValue> const& rProperties ) - throw (uno::RuntimeException); - virtual void SAL_CALL registerUserPaintPolygons( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xDocFactory ) throw (::com::sun::star::uno::RuntimeException); + throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL registerUserPaintPolygons( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xDocFactory ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL setProperty( - beans::PropertyValue const& rProperty ) throw (uno::RuntimeException); + beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL addView( uno::Reference<presentation::XSlideShowView> const& xView ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL removeView( uno::Reference<presentation::XSlideShowView> const& xView ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL update( double & nNextTimeout ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual void SAL_CALL addSlideShowListener( uno::Reference<presentation::XSlideShowListener> const& xListener ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual void SAL_CALL removeSlideShowListener( uno::Reference<presentation::XSlideShowListener> const& xListener ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual void SAL_CALL addShapeEventListener( uno::Reference<presentation::XShapeEventListener> const& xListener, uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual void SAL_CALL removeShapeEventListener( uno::Reference<presentation::XShapeEventListener> const& xListener, uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual void SAL_CALL setShapeCursor( uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); // CursorManager @@ -1075,7 +1075,7 @@ void SlideShowImpl::displaySlide( uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages, uno::Reference<animations::XAnimationNode> const& xRootNode, uno::Sequence<beans::PropertyValue> const& rProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1232,7 +1232,7 @@ void SlideShowImpl::redisplayCurrentSlide (void) boost::mem_fn( &presentation::XSlideShowListener::slideTransitionStarted ) ); } -sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException) +sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1248,7 +1248,7 @@ sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException) return maEventMultiplexer.notifyNextEffect(); } -sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException) +sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1293,7 +1293,7 @@ void SlideShowImpl::rewindEffectToPreviousSlide (void) sal_Bool SlideShowImpl::startShapeActivity( uno::Reference<drawing::XShape> const& /*xShape*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1307,7 +1307,7 @@ sal_Bool SlideShowImpl::startShapeActivity( sal_Bool SlideShowImpl::stopShapeActivity( uno::Reference<drawing::XShape> const& /*xShape*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1320,7 +1320,7 @@ sal_Bool SlideShowImpl::stopShapeActivity( } sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1342,7 +1342,7 @@ sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow ) } uno::Reference<drawing::XDrawPage> SlideShowImpl::getCurrentSlide() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1360,7 +1360,7 @@ uno::Reference<drawing::XDrawPage> SlideShowImpl::getCurrentSlide() sal_Bool SlideShowImpl::addView( uno::Reference<presentation::XSlideShowView> const& xView ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1408,7 +1408,7 @@ sal_Bool SlideShowImpl::addView( sal_Bool SlideShowImpl::removeView( uno::Reference<presentation::XSlideShowView> const& xView ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1429,7 +1429,7 @@ sal_Bool SlideShowImpl::removeView( return true; } -void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMultiServiceFactory >& xDocFactory ) throw (uno::RuntimeException) +void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMultiServiceFactory >& xDocFactory ) throw (uno::RuntimeException, std::exception) { //Retrieve Polygons if user ends presentation by context menu if (mpCurrentSlide) @@ -1555,7 +1555,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult } sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1846,7 +1846,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) void SlideShowImpl::addSlideShowListener( uno::Reference<presentation::XSlideShowListener> const& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1859,7 +1859,7 @@ void SlideShowImpl::addSlideShowListener( void SlideShowImpl::removeSlideShowListener( uno::Reference<presentation::XSlideShowListener> const& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1870,7 +1870,7 @@ void SlideShowImpl::removeSlideShowListener( void SlideShowImpl::addShapeEventListener( uno::Reference<presentation::XShapeEventListener> const& xListener, uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1903,7 +1903,7 @@ void SlideShowImpl::addShapeEventListener( void SlideShowImpl::removeShapeEventListener( uno::Reference<presentation::XShapeEventListener> const& xListener, uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1930,7 +1930,7 @@ void SlideShowImpl::removeShapeEventListener( void SlideShowImpl::setShapeCursor( uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1999,7 +1999,7 @@ void SlideShowImpl::resetCursor() } sal_Bool SlideShowImpl::update( double & nNextTimeout ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); |