From e57ca02849c3d87142ff5ff9099a212e72b8139c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jan 2017 12:28:58 +0100 Subject: Remove dynamic exception specifications ...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- slideshow/source/engine/slideshowimpl.cxx | 67 +++++++++---------------------- 1 file changed, 20 insertions(+), 47 deletions(-) (limited to 'slideshow/source/engine/slideshowimpl.cxx') diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 64974d147d9d..0a5283387dc6 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -273,52 +273,39 @@ public: private: // XSlideShow: - virtual sal_Bool SAL_CALL nextEffect() throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nextEffect() override; + virtual sal_Bool SAL_CALL previousEffect() override; virtual sal_Bool SAL_CALL startShapeActivity( - uno::Reference const& xShape ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xShape ) override; virtual sal_Bool SAL_CALL stopShapeActivity( - uno::Reference const& xShape ) - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow ) - throw (uno::RuntimeException, std::exception) override; - virtual uno::Reference SAL_CALL getCurrentSlide() - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xShape ) override; + virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow ) override; + virtual uno::Reference SAL_CALL getCurrentSlide() override; virtual void SAL_CALL displaySlide( uno::Reference const& xSlide, uno::Reference const& xDrawPages, uno::Reference const& xRootNode, - uno::Sequence const& rProperties ) - throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerUserPaintPolygons( const css::uno::Reference< css::lang::XMultiServiceFactory >& xDocFactory ) throw (css::uno::RuntimeException, std::exception) override; + uno::Sequence const& rProperties ) override; + virtual void SAL_CALL registerUserPaintPolygons( const css::uno::Reference< css::lang::XMultiServiceFactory >& xDocFactory ) override; virtual sal_Bool SAL_CALL setProperty( - beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception) override; + beans::PropertyValue const& rProperty ) override; virtual sal_Bool SAL_CALL addView( - uno::Reference const& xView ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xView ) override; virtual sal_Bool SAL_CALL removeView( - uno::Reference const& xView ) - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL update( double & nNextTimeout ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xView ) override; + virtual sal_Bool SAL_CALL update( double & nNextTimeout ) override; virtual void SAL_CALL addSlideShowListener( - uno::Reference const& xListener ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xListener ) override; virtual void SAL_CALL removeSlideShowListener( - uno::Reference const& xListener ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xListener ) override; virtual void SAL_CALL addShapeEventListener( uno::Reference const& xListener, - uno::Reference const& xShape ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xShape ) override; virtual void SAL_CALL removeShapeEventListener( uno::Reference const& xListener, - uno::Reference const& xShape ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xShape ) override; virtual void SAL_CALL setShapeCursor( - uno::Reference const& xShape, sal_Int16 nPointerShape ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference const& xShape, sal_Int16 nPointerShape ) override; // CursorManager @@ -1064,7 +1051,6 @@ void SlideShowImpl::displaySlide( uno::Reference const& xDrawPages, uno::Reference const& xRootNode, uno::Sequence const& rProperties ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1213,7 +1199,7 @@ void SlideShowImpl::redisplayCurrentSlide() }); } -sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException, std::exception) +sal_Bool SlideShowImpl::nextEffect() { osl::MutexGuard const guard( m_aMutex ); @@ -1229,7 +1215,7 @@ sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException, std::exceptio return maEventMultiplexer.notifyNextEffect(); } -sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException, std::exception) +sal_Bool SlideShowImpl::previousEffect() { osl::MutexGuard const guard( m_aMutex ); @@ -1274,7 +1260,6 @@ void SlideShowImpl::rewindEffectToPreviousSlide() sal_Bool SlideShowImpl::startShapeActivity( uno::Reference const& /*xShape*/ ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1288,7 +1273,6 @@ sal_Bool SlideShowImpl::startShapeActivity( sal_Bool SlideShowImpl::stopShapeActivity( uno::Reference const& /*xShape*/ ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1301,7 +1285,6 @@ sal_Bool SlideShowImpl::stopShapeActivity( } sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1323,7 +1306,6 @@ sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow ) } uno::Reference SlideShowImpl::getCurrentSlide() - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1341,7 +1323,6 @@ uno::Reference SlideShowImpl::getCurrentSlide() sal_Bool SlideShowImpl::addView( uno::Reference const& xView ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1389,7 +1370,6 @@ sal_Bool SlideShowImpl::addView( sal_Bool SlideShowImpl::removeView( uno::Reference const& xView ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1410,7 +1390,7 @@ sal_Bool SlideShowImpl::removeView( return true; } -void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMultiServiceFactory >& xDocFactory ) throw (uno::RuntimeException, std::exception) +void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMultiServiceFactory >& xDocFactory ) { //Retrieve Polygons if user ends presentation by context menu if (mpCurrentSlide) @@ -1522,7 +1502,6 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult } sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1813,7 +1792,6 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty ) void SlideShowImpl::addSlideShowListener( uno::Reference const& xListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1826,7 +1804,6 @@ void SlideShowImpl::addSlideShowListener( void SlideShowImpl::removeSlideShowListener( uno::Reference const& xListener ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1837,7 +1814,6 @@ void SlideShowImpl::removeSlideShowListener( void SlideShowImpl::addShapeEventListener( uno::Reference const& xListener, uno::Reference const& xShape ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1870,7 +1846,6 @@ void SlideShowImpl::addShapeEventListener( void SlideShowImpl::removeShapeEventListener( uno::Reference const& xListener, uno::Reference const& xShape ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1897,7 +1872,6 @@ void SlideShowImpl::removeShapeEventListener( void SlideShowImpl::setShapeCursor( uno::Reference const& xShape, sal_Int16 nPointerShape ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -1958,7 +1932,6 @@ void SlideShowImpl::resetCursor() } sal_Bool SlideShowImpl::update( double & nNextTimeout ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); -- cgit v1.2.3