coverity#738003 Uncaught exception

Change-Id: Iddb64e592ae47dd5f22430778b8018fc8c9880c5

4 files changed, 20 insertions, 9 deletions

diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 70ff3e985407..0fd533e14944 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -81,7 +81,8 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type&
     return aTypes;
 }
 
-SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr ) throw ()
+SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr )
+    throw (std::exception)
 {
     OUString aShapeType( xDescr->getShapeType() );
 
@@ -94,7 +95,8 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen
 
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >  SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const throw ()
+::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >  SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const
+    throw (std::exception)
 {
     if( FmFormInventor == pObj->GetObjInventor() )
     {
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index df3bc3eb86cc..4903b0a89db8 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -899,7 +899,9 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames(  ) throw (RuntimeE
 
 // -----------------------------------------------------------------------------
 
-::com::sun::star::awt::Size SAL_CALL Cell::getPreferredSize(  ) throw (RuntimeException)
+::com::sun::star::awt::Size SAL_CALL Cell::getPreferredSize()
+    throw (RuntimeException,
+           std::exception)
 {
     return getMinimumSize();
 }
@@ -1579,7 +1581,8 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(Unk
 // XMultiPropertyStates
 // -----------------------------------------------------------------------------
 
-void SAL_CALL Cell::setAllPropertiesToDefault(  ) throw (RuntimeException)
+void SAL_CALL Cell::setAllPropertiesToDefault()
+    throw (RuntimeException, std::exception)
 {
     delete mpProperties;
     mpProperties = new sdr::properties::CellProperties( static_cast< SdrTableObj& >( GetObject() ), this );
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index e427878cde95..4e3e04c9ca97 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -120,7 +120,9 @@ public:
     SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize()
         throw (::com::sun::star::uno::RuntimeException,
                std::exception);
-    SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize()
+        throw (::com::sun::star::uno::RuntimeException,
+               std::exception);
     SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (::com::sun::star::uno::RuntimeException);
 
     // XMergeableCell
@@ -159,7 +161,9 @@ public:
     SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XMultiPropertyStates
-    SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
+    SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault()
+        throw (::com::sun::star::uno::RuntimeException,
+               std::exception);
     SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index a0c66808fa2f..53391731dc4f 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -233,7 +233,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape
 }
 
 void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException )
+    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -430,7 +430,8 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
         mpModel->SetChanged();
 }
 
-SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & xShape ) throw()
+SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xShape)
+    throw (std::exception)
 {
     sal_uInt16 nType = 0;
     sal_uInt32 nInventor = 0;
@@ -785,7 +786,8 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
     return pRet;
 }
 
-Reference< drawing::XShape >  SvxDrawPage::_CreateShape( SdrObject *pObj ) const throw()
+Reference< drawing::XShape >  SvxDrawPage::_CreateShape( SdrObject *pObj ) const
+    throw (std::exception)
 {
     Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(),
                                               pObj->GetObjInventor(),