1 files changed, 8 insertions, 24 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index b2f5beeb98ba..b5a600816bae 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -82,26 +82,18 @@ public:
     virtual void SAL_CALL   release() throw() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XCustomShapeEngine
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::awt::Rectangle SAL_CALL getTextBounds()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render() override;
+    virtual css::awt::Rectangle SAL_CALL getTextBounds() override;
+    virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction() override;
 };
 
 EnhancedCustomShapeEngine::EnhancedCustomShapeEngine() :
@@ -121,7 +113,6 @@ void SAL_CALL EnhancedCustomShapeEngine::release() throw()
 
 // XInitialization
 void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArguments )
-    throw ( Exception, RuntimeException, std::exception )
 {
     sal_Int32 i;
     Sequence< beans::PropertyValue > aParameter;
@@ -142,17 +133,14 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArg
 
 // XServiceInfo
 OUString SAL_CALL EnhancedCustomShapeEngine::getImplementationName()
-    throw( RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
 }
 sal_Bool SAL_CALL EnhancedCustomShapeEngine::supportsService( const OUString& rServiceName )
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 Sequence< OUString > SAL_CALL EnhancedCustomShapeEngine::getSupportedServiceNames()
-    throw ( RuntimeException, std::exception )
 {
     Sequence<OUString> aRet { "com.sun.star.drawing.CustomShapeEngine" };
     return aRet;
@@ -264,7 +252,6 @@ void SetTemporary( uno::Reference< drawing::XShape >& xShape )
 }
 
 Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
-    throw ( RuntimeException, std::exception )
 {
     Reference< drawing::XShape > xShape;
     SdrObject* pSdrObjCustomShape( dynamic_cast<SdrObjCustomShape*>( GetSdrObjectFromXShape( mxShape ) )  );
@@ -362,7 +349,6 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
 }
 
 awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds()
-    throw ( RuntimeException, std::exception )
 {
     awt::Rectangle aTextRect;
     SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
@@ -383,7 +369,6 @@ awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds()
 }
 
 drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeometry()
-    throw ( RuntimeException, std::exception )
 {
     drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords;
     SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
@@ -464,7 +449,6 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom
 }
 
 Sequence< Reference< drawing::XCustomShapeHandle > > SAL_CALL EnhancedCustomShapeEngine::getInteraction()
-    throw ( RuntimeException, std::exception )
 {
     sal_uInt32 i, nHdlCount = 0;
     SdrObject* pSdrObjCustomShape = GetSdrObjectFromXShape( mxShape );