1 files changed, 13 insertions, 33 deletions
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 3b287a545136..e15fcafe58a0 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -148,19 +148,16 @@ UNO3_GETIMPLEMENTATION_IMPL( SdLayer );
 
 // XServiceInfo
 OUString SAL_CALL SdLayer::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SdUnoLayer");
 }
 
 sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     OUString aServiceName(UNO_PREFIX "drawing.Layer");
     uno::Sequence< OUString > aSeq( &aServiceName, 1 );
@@ -169,14 +166,12 @@ uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames()
 
 // beans::XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SdLayer::getPropertySetInfo(  )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return pPropSet->getPropertySetInfo();
 }
 
 void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -242,7 +237,6 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un
 }
 
 uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -283,10 +277,10 @@ uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName )
     return aValue;
 }
 
-void SAL_CALL SdLayer::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
+void SAL_CALL SdLayer::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {}
+void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {}
+void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {}
+void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {}
 
 bool SdLayer::get( LayerAttribute what ) throw()
 {
@@ -387,7 +381,6 @@ void SdLayer::set( LayerAttribute what, bool flag ) throw()
 
 // css::container::XChild
 uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -398,25 +391,23 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent()
 }
 
 void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& )
-    throw (css::lang::NoSupportException,
-        css::uno::RuntimeException, std::exception)
 {
     throw lang::NoSupportException ();
 }
 
 // XComponent
-void SAL_CALL SdLayer::dispose(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayer::dispose(  )
 {
     mxLayerManager.clear();
     pLayer = nullptr;
 }
 
-void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& )
 {
     OSL_FAIL("not implemented!");
 }
 
-void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& )
 {
     OSL_FAIL("not implemented!");
 }
@@ -437,7 +428,7 @@ SdLayerManager::~SdLayerManager() throw()
 UNO3_GETIMPLEMENTATION_IMPL( SdLayerManager );
 
 // XComponent
-void SAL_CALL SdLayerManager::dispose(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayerManager::dispose(  )
 {
     mpModel = nullptr;
     if( mpLayers )
@@ -449,31 +440,28 @@ void SAL_CALL SdLayerManager::dispose(  ) throw (uno::RuntimeException, std::exc
     }
 }
 
-void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& )
 {
     OSL_FAIL("not implemented!");
 }
 
-void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& )
 {
     OSL_FAIL("not implemented!");
 }
 
 // XServiceInfo
 OUString SAL_CALL SdLayerManager::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SdUnoLayerManager");
 }
 
 sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSeq { UNO_PREFIX "drawing.LayerManager" };
     return aSeq;
@@ -481,7 +469,6 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames()
 
 // XLayerManager
 uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal_Int32 nIndex )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -515,7 +502,6 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
 }
 
 void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& xLayer )
-    throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -536,7 +522,6 @@ void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& x
 }
 
 void SAL_CALL SdLayerManager::attachShapeToLayer( const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XLayer >& xLayer )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -557,7 +542,7 @@ void SAL_CALL SdLayerManager::attachShapeToLayer( const uno::Reference< drawing:
     mpModel->SetModified();
 }
 
-uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( const uno::Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception)
+uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( const uno::Reference< drawing::XShape >& xShape )
 {
     SolarMutexGuard aGuard;
 
@@ -582,7 +567,6 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( con
 
 // XIndexAccess
 sal_Int32 SAL_CALL SdLayerManager::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -599,7 +583,6 @@ sal_Int32 SAL_CALL SdLayerManager::getCount()
 }
 
 uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -622,7 +605,6 @@ uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer )
 
 // XNameAccess
 uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -638,7 +620,6 @@ uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -662,7 +643,7 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames()
     return aSeq;
 }
 
-sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
 
@@ -676,12 +657,11 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::
 
 // XElementAccess
 uno::Type SAL_CALL SdLayerManager::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<drawing::XLayer>::get();
 }
 
-sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdLayerManager::hasElements()
 {
     return getCount() > 0;
 }