1 files changed, 19 insertions, 56 deletions
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index eb850fae4082..ec65204dab54 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -136,7 +136,6 @@ ScShapeObj::~ScShapeObj()
 // XInterface
 
 uno::Any SAL_CALL ScShapeObj::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     uno::Any aRet = ScShapeObj_Base::queryInterface( rType );
 
@@ -225,7 +224,6 @@ static uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<u
 //  XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -321,9 +319,6 @@ static awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape,
 }
 
 void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const uno::Any& aValue)
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-          lang::IllegalArgumentException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -652,8 +647,6 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const
 }
 
 uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -838,8 +831,6 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
 
 void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyName,
                             const uno::Reference<beans::XPropertyChangeListener>& aListener)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -862,8 +853,6 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyNa
 
 void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropertyName,
                             const uno::Reference<beans::XPropertyChangeListener>& aListener)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -874,8 +863,6 @@ void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropert
 
 void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyName,
                             const uno::Reference<beans::XVetoableChangeListener>& aListener)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -886,8 +873,6 @@ void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyNa
 
 void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropertyName,
                             const uno::Reference<beans::XVetoableChangeListener>& aListener)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -899,7 +884,6 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropert
 //  XPropertyState
 
 beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPropertyName )
-                                throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -932,7 +916,6 @@ beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPro
 
 uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates(
                                 const uno::Sequence<OUString>& aPropertyNames )
-                            throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -947,8 +930,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates(
 }
 
 void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName )
-    throw (beans::UnknownPropertyException, uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -978,8 +959,6 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName )
 }
 
 uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName )
-                                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1003,7 +982,6 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName
 // XTextContent
 
 void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTextRange */ )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1011,7 +989,6 @@ void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTe
 }
 
 uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1052,7 +1029,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor()
 
 // XComponent
 
-void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScShapeObj::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -1063,7 +1040,6 @@ void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException, std::exception)
 
 void SAL_CALL ScShapeObj::addEventListener(
                         const uno::Reference<lang::XEventListener>& xListener )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1074,7 +1050,6 @@ void SAL_CALL ScShapeObj::addEventListener(
 
 void SAL_CALL ScShapeObj::removeEventListener(
                         const uno::Reference<lang::XEventListener>& xListener )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1102,7 +1077,6 @@ static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet
 void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRange>& xRange,
                                                 const uno::Reference<text::XTextContent>& xContent,
                                                 sal_Bool bAbsorb )
-                                    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1130,7 +1104,6 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan
 }
 
 void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent )
-                                throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1145,7 +1118,6 @@ void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextCon
 // Use own SvxUnoTextCursor subclass - everything is just passed to aggregated object
 
 uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1163,7 +1135,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor()
 
 uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange(
                                     const uno::Reference<text::XTextRange>& aTextPosition )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1187,7 +1158,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange(
 
 void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& xRange,
                                         const OUString& aString, sal_Bool bAbsorb )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1200,7 +1170,6 @@ void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>&
 
 void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange,
                                                 sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1214,13 +1183,13 @@ void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTe
 // XTextRange
 // (parent of XSimpleText)
 
-uno::Reference<text::XText> SAL_CALL ScShapeObj::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScShapeObj::getText()
 {
     SolarMutexGuard aGuard;
     return this;
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -1233,7 +1202,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::Runt
 //    return uno::Reference<text::XTextRange>();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -1246,7 +1215,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::Runtim
 //    return uno::Reference<text::XTextRange>();
 }
 
-OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScShapeObj::getString()
 {
     SolarMutexGuard aGuard;
 
@@ -1259,7 +1228,7 @@ OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException, std::exce
 //    return OUString();
 }
 
-void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScShapeObj::setString( const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -1272,7 +1241,7 @@ void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeE
 
 // XChild
 
-uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent()
 {
     SolarMutexGuard aGuard;
 
@@ -1307,14 +1276,14 @@ uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::R
     return nullptr;
 }
 
-void SAL_CALL ScShapeObj::setParent( const uno::Reference< uno::XInterface >& ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL ScShapeObj::setParent( const uno::Reference< uno::XInterface >& )
 {
     throw lang::NoSupportException();
 }
 
 // XTypeProvider
 
-uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes()
 {
     uno::Sequence< uno::Type > aBaseTypes( ScShapeObj_Base::getTypes() );
 
@@ -1335,7 +1304,6 @@ uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeExcep
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1372,10 +1340,7 @@ public:
     }
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw (lang::IllegalArgumentException, container::NoSuchElementException,
-               lang::WrappedTargetException, uno::RuntimeException,
-               std::exception) override
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override
     {
         if ( !hasByName( aName ) )
             throw container::NoSuchElementException();
@@ -1411,9 +1376,7 @@ public:
     }
 
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName )
-        throw (container::NoSuchElementException, lang::WrappedTargetException,
-               uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         uno::Sequence< beans::PropertyValue > aProperties;
         ScMacroInfo* pInfo = getInfo(false);
@@ -1437,24 +1400,24 @@ public:
         return uno::Any( aProperties );
     }
 
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames() override
     {
         uno::Sequence<OUString> aSeq { SC_EVENTACC_ONCLICK };
         return aSeq;
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         return aName == SC_EVENTACC_ONCLICK;
     }
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType() override
     {
         return cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements() throw(uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         // elements are always present (but contained property sequences may be empty)
         return true;
@@ -1462,22 +1425,22 @@ public:
 };
 
 ::uno::Reference< container::XNameReplace > SAL_CALL
-ScShapeObj::getEvents(  ) throw(uno::RuntimeException, std::exception)
+ScShapeObj::getEvents(  )
 {
     return new ShapeUnoEventAccessImpl( this );
 }
 
-OUString SAL_CALL ScShapeObj::getImplementationName(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScShapeObj::getImplementationName(  )
 {
     return OUString( "com.sun.star.comp.sc.ScShapeObj" );
 }
 
-sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames(  )
 {
     uno::Reference<lang::XServiceInfo> xSI;
     if ( mxShapeAgg.is() )