summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /slideshow
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx35
-rw-r--r--slideshow/source/engine/opengl/TransitionerImpl.cxx61
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx2
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx67
-rw-r--r--slideshow/source/engine/slideview.cxx12
5 files changed, 65 insertions, 112 deletions
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 472d85d82d65..c707af32e91e 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -125,24 +125,17 @@ public:
virtual void SAL_CALL disposing() override;
private:
- virtual void SAL_CALL disposing( const lang::EventObject& Source )
- throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
// XMouseListener implementation
- virtual void SAL_CALL mousePressed( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL mouseReleased( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL mouseEntered( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL mouseExited( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL mousePressed( const awt::MouseEvent& e ) override;
+ virtual void SAL_CALL mouseReleased( const awt::MouseEvent& e ) override;
+ virtual void SAL_CALL mouseEntered( const awt::MouseEvent& e ) override;
+ virtual void SAL_CALL mouseExited( const awt::MouseEvent& e ) override;
// XMouseMotionListener implementation
- virtual void SAL_CALL mouseDragged( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL mouseMoved( const awt::MouseEvent& e )
- throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL mouseDragged( const awt::MouseEvent& e ) override;
+ virtual void SAL_CALL mouseMoved( const awt::MouseEvent& e ) override;
EventQueue* mpEventQueue;
@@ -309,7 +302,7 @@ void SAL_CALL EventMultiplexerListener::disposing()
}
void SAL_CALL EventMultiplexerListener::disposing(
- const lang::EventObject& /*rSource*/ ) throw (uno::RuntimeException, std::exception)
+ const lang::EventObject& /*rSource*/ )
{
// there's no real point in acting on this message - after all,
// the event sources are the XSlideShowViews, which must be
@@ -321,7 +314,7 @@ void SAL_CALL EventMultiplexerListener::disposing(
}
void SAL_CALL EventMultiplexerListener::mousePressed(
- const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+ const awt::MouseEvent& e )
{
osl::MutexGuard const guard( m_aMutex );
@@ -336,7 +329,7 @@ void SAL_CALL EventMultiplexerListener::mousePressed(
}
void SAL_CALL EventMultiplexerListener::mouseReleased(
- const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+ const awt::MouseEvent& e )
{
osl::MutexGuard const guard( m_aMutex );
@@ -351,20 +344,20 @@ void SAL_CALL EventMultiplexerListener::mouseReleased(
}
void SAL_CALL EventMultiplexerListener::mouseEntered(
- const awt::MouseEvent& /*e*/ ) throw (uno::RuntimeException, std::exception)
+ const awt::MouseEvent& /*e*/ )
{
// not used here
}
void SAL_CALL EventMultiplexerListener::mouseExited(
- const awt::MouseEvent& /*e*/ ) throw (uno::RuntimeException, std::exception)
+ const awt::MouseEvent& /*e*/ )
{
// not used here
}
// XMouseMotionListener implementation
void SAL_CALL EventMultiplexerListener::mouseDragged(
- const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+ const awt::MouseEvent& e )
{
osl::MutexGuard const guard( m_aMutex );
@@ -379,7 +372,7 @@ void SAL_CALL EventMultiplexerListener::mouseDragged(
}
void SAL_CALL EventMultiplexerListener::mouseMoved(
- const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+ const awt::MouseEvent& e )
{
osl::MutexGuard const guard( m_aMutex );
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 3758a2a24d49..d8925f3c1222 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -161,12 +161,10 @@ public:
const Reference< rendering::XBitmap >& xEnteringSlide );
// XTransition
- virtual void SAL_CALL update( double nTime )
- throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL update( double nTime ) override;
virtual void SAL_CALL viewChanged( const Reference< presentation::XSlideShowView >& rView,
const Reference< rendering::XBitmap >& rLeavingBitmap,
- const Reference< rendering::XBitmap >& rEnteringBitmap )
- throw (uno::RuntimeException, std::exception) override;
+ const Reference< rendering::XBitmap >& rEnteringBitmap ) override;
protected:
void disposeTextures();
@@ -458,25 +456,24 @@ namespace
uno::Sequence< sal_Int8 > maComponentTags;
uno::Sequence< sal_Int32 > maBitCounts;
- virtual sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override
+ virtual sal_Int8 SAL_CALL getType( ) override
{
return rendering::ColorSpaceType::RGB;
}
- virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags( ) override
{
return maComponentTags;
}
- virtual sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override
+ virtual sal_Int8 SAL_CALL getRenderingIntent( ) override
{
return rendering::RenderingIntent::PERCEPTUAL;
}
- virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override
{
return uno::Sequence< beans::PropertyValue >();
}
virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
- const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
- uno::RuntimeException, std::exception) override
+ const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
{
// TODO(P3): if we know anything about target
// colorspace, this can be greatly sped up
@@ -484,7 +481,7 @@ namespace
convertToARGB(deviceColor));
return targetColorSpace->convertFromARGB(aIntermediate);
}
- virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override
{
const double* pIn( deviceColor.getConstArray() );
const std::size_t nLen( deviceColor.getLength() );
@@ -501,7 +498,7 @@ namespace
}
return aRes;
}
- virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override
{
const double* pIn( deviceColor.getConstArray() );
const std::size_t nLen( deviceColor.getLength() );
@@ -518,7 +515,7 @@ namespace
}
return aRes;
}
- virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override
{
const double* pIn( deviceColor.getConstArray() );
const std::size_t nLen( deviceColor.getLength() );
@@ -535,7 +532,7 @@ namespace
}
return aRes;
}
- virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
const std::size_t nLen( rgbColor.getLength() );
@@ -552,7 +549,7 @@ namespace
}
return aRes;
}
- virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
const std::size_t nLen( rgbColor.getLength() );
@@ -569,7 +566,7 @@ namespace
}
return aRes;
}
- virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
const std::size_t nLen( rgbColor.getLength() );
@@ -588,21 +585,20 @@ namespace
}
// XIntegerBitmapColorSpace
- virtual sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override
+ virtual sal_Int32 SAL_CALL getBitsPerPixel( ) override
{
return 32;
}
- virtual uno::Sequence< sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< sal_Int32 > SAL_CALL getComponentBitCounts( ) override
{
return maBitCounts;
}
- virtual sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override
+ virtual sal_Int8 SAL_CALL getEndianness( ) override
{
return util::Endianness::LITTLE;
}
virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< sal_Int8 >& deviceColor,
- const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
- uno::RuntimeException, std::exception) override
+ const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
{
if( dynamic_cast<OGLColorSpace*>(targetColorSpace.get()) )
{
@@ -633,8 +629,7 @@ namespace
}
}
virtual uno::Sequence< sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< sal_Int8 >& deviceColor,
- const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
- uno::RuntimeException, std::exception) override
+ const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override
{
if( dynamic_cast<OGLColorSpace*>(targetColorSpace.get()) )
{
@@ -650,7 +645,7 @@ namespace
return targetColorSpace->convertIntegerFromARGB(aIntermediate);
}
}
- virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< sal_Int8 >& deviceColor ) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
const std::size_t nLen( deviceColor.getLength() );
@@ -671,7 +666,7 @@ namespace
return aRes;
}
- virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< sal_Int8 >& deviceColor ) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
const std::size_t nLen( deviceColor.getLength() );
@@ -693,7 +688,7 @@ namespace
return aRes;
}
- virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< sal_Int8 >& deviceColor ) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
const std::size_t nLen( deviceColor.getLength() );
@@ -716,7 +711,7 @@ namespace
return aRes;
}
- virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
const std::size_t nLen( rgbColor.getLength() );
@@ -734,7 +729,7 @@ namespace
return aRes;
}
- virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
const std::size_t nLen( rgbColor.getLength() );
@@ -752,7 +747,7 @@ namespace
return aRes;
}
- virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
const std::size_t nLen( rgbColor.getLength() );
@@ -1023,7 +1018,7 @@ void OGLTransitionerImpl::GLInitSlides()
CHECK_GL_ERROR();
}
-void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGLTransitionerImpl::update( double nTime )
{
#if OSL_DEBUG_LEVEL > 0
mnFrameCount ++;
@@ -1070,7 +1065,6 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
void SAL_CALL OGLTransitionerImpl::viewChanged( const Reference< presentation::XSlideShowView >& rView,
const Reference< rendering::XBitmap >& rLeavingBitmap,
const Reference< rendering::XBitmap >& rEnteringBitmap )
- throw (uno::RuntimeException, std::exception)
{
SAL_INFO("slideshow.opengl", "transitioner: view changed");
@@ -1176,7 +1170,7 @@ public:
{}
// XTransitionFactory
- virtual sal_Bool SAL_CALL hasTransition( sal_Int16 transitionType, sal_Int16 transitionSubType ) throw (uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL hasTransition( sal_Int16 transitionType, sal_Int16 transitionSubType ) override
{
// A set of css::animation::TransitionSubType that don't have any meaning (in the SMIL 2.0
// standard) for MISCSHAPEWIPE have been chosen to refer to some of these "fancy" optional
@@ -1228,8 +1222,7 @@ public:
sal_Int16 transitionSubType,
const uno::Reference< presentation::XSlideShowView >& view,
const uno::Reference< rendering::XBitmap >& leavingBitmap,
- const uno::Reference< rendering::XBitmap >& enteringBitmap )
- throw (uno::RuntimeException, std::exception) override
+ const uno::Reference< rendering::XBitmap >& enteringBitmap ) override
{
if( !hasTransition( transitionType, transitionSubType ) )
return uno::Reference< presentation::XTransition >();
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index c515b7a9fac1..386956215cfe 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -113,7 +113,7 @@ public:
}
//--- XGraphicRenderer -----------------------------------
- virtual void SAL_CALL render( const uno::Reference< graphic::XGraphic >& rGraphic ) throw (uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL render( const uno::Reference< graphic::XGraphic >& rGraphic ) override
{
::osl::MutexGuard aGuard( m_aMutex );
mxGraphic = rGraphic;
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<drawing::XShape> const& xShape )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<drawing::XShape> const& xShape ) override;
virtual sal_Bool SAL_CALL stopShapeActivity(
- uno::Reference<drawing::XShape> 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<drawing::XDrawPage> SAL_CALL getCurrentSlide()
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<drawing::XShape> const& xShape ) override;
+ virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow ) override;
+ virtual uno::Reference<drawing::XDrawPage> SAL_CALL getCurrentSlide() override;
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, 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<beans::PropertyValue> 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<presentation::XSlideShowView> const& xView )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<presentation::XSlideShowView> const& xView ) override;
virtual sal_Bool SAL_CALL removeView(
- uno::Reference<presentation::XSlideShowView> const& xView )
- throw (uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL update( double & nNextTimeout )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<presentation::XSlideShowView> const& xView ) override;
+ virtual sal_Bool SAL_CALL update( double & nNextTimeout ) override;
virtual void SAL_CALL addSlideShowListener(
- uno::Reference<presentation::XSlideShowListener> const& xListener )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<presentation::XSlideShowListener> const& xListener ) override;
virtual void SAL_CALL removeSlideShowListener(
- uno::Reference<presentation::XSlideShowListener> const& xListener )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<presentation::XSlideShowListener> const& xListener ) override;
virtual void SAL_CALL addShapeEventListener(
uno::Reference<presentation::XShapeEventListener> const& xListener,
- uno::Reference<drawing::XShape> const& xShape )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<drawing::XShape> const& xShape ) override;
virtual void SAL_CALL removeShapeEventListener(
uno::Reference<presentation::XShapeEventListener> const& xListener,
- uno::Reference<drawing::XShape> const& xShape )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<drawing::XShape> const& xShape ) override;
virtual void SAL_CALL setShapeCursor(
- uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape ) override;
// CursorManager
@@ -1064,7 +1051,6 @@ void SlideShowImpl::displaySlide(
uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages,
uno::Reference<animations::XAnimationNode> const& xRootNode,
uno::Sequence<beans::PropertyValue> 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<drawing::XShape> 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<drawing::XShape> 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<drawing::XDrawPage> SlideShowImpl::getCurrentSlide()
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard const guard( m_aMutex );
@@ -1341,7 +1323,6 @@ uno::Reference<drawing::XDrawPage> SlideShowImpl::getCurrentSlide()
sal_Bool SlideShowImpl::addView(
uno::Reference<presentation::XSlideShowView> 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<presentation::XSlideShowView> 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<presentation::XSlideShowListener> 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<presentation::XSlideShowListener> 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<presentation::XShapeEventListener> const& xListener,
uno::Reference<drawing::XShape> 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<presentation::XShapeEventListener> const& xListener,
uno::Reference<drawing::XShape> 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<drawing::XShape> 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 );
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index e82ab8011e5e..d215fcfdaa0e 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -705,14 +705,11 @@ private:
virtual bool isSoundEnabled() const override;
// XEventListener:
- virtual void SAL_CALL disposing( lang::EventObject const& evt )
- throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( lang::EventObject const& evt ) override;
// XModifyListener:
- virtual void SAL_CALL modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL modified( const lang::EventObject& aEvent ) override;
// XPaintListener:
- virtual void SAL_CALL windowPaint( const awt::PaintEvent& e )
- throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL windowPaint( const awt::PaintEvent& e ) override;
// WeakComponentImplHelperBase:
virtual void SAL_CALL disposing() override;
@@ -1015,7 +1012,6 @@ void SlideView::_dispose()
// XEventListener
void SlideView::disposing( lang::EventObject const& evt )
- throw (uno::RuntimeException, std::exception)
{
(void)evt;
@@ -1057,7 +1053,6 @@ struct WeakRefWrapper
// XModifyListener
void SlideView::modified( const lang::EventObject& /*aEvent*/ )
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard const guard( m_aMutex );
@@ -1105,7 +1100,6 @@ void SlideView::modified( const lang::EventObject& /*aEvent*/ )
// XPaintListener
void SlideView::windowPaint( const awt::PaintEvent& /*e*/ )
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( m_aMutex );