coverity#706300,306,983619: Uncaught exception

Change-Id: If46a483ba0a5334926ffb5c25db064a5d2b81e46

4 files changed, 16 insertions, 5 deletions

diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index c3a7be9a7d75..a3d09d46e992 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -63,7 +63,7 @@ OCalcConnection::~OCalcConnection()
 }
 
 void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
-    throw(SQLException)
+    throw(SQLException, RuntimeException, DeploymentException)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::construct" );
     //  open file
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 1309262fd25e..24ce44f3299f 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -93,7 +93,10 @@ sal_Bool OConnection::matchesExtension( const OUString& _rExt ) const
 }
 
 
-void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
+void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
+    throw( css::sdbc::SQLException,
+           css::uno::RuntimeException,
+           css::uno::DeploymentException)
 {
     osl_atomic_increment( &m_refCount );
 
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index 651e87412b7f..89903b283c4f 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -21,6 +21,7 @@
 #define _CONNECTIVITY_CALC_CONNECTION_HXX_
 
 #include "file/FConnection.hxx"
+#include <com/sun/star/uno/DeploymentException.hpp>
 
 namespace com { namespace sun { namespace star { namespace sheet {
     class XSpreadsheetDocument;
@@ -45,8 +46,10 @@ namespace connectivity
             virtual ~OCalcConnection();
 
             virtual void construct(const OUString& _rUrl,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo )
-                throw( ::com::sun::star::sdbc::SQLException) SAL_OVERRIDE;
+                                   const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo )
+                throw( css::sdbc::SQLException,
+                       css::uno::RuntimeException,
+                       css::uno::DeploymentException) SAL_OVERRIDE;
 
             // XServiceInfo
             DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index d700a34b02e4..58dd3c03f2ea 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -28,6 +28,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
+#include <com/sun/star/uno/DeploymentException.hpp>
 #include "connectivity/sqlparse.hxx"
 #include "connectivity/sqliterator.hxx"
 #include "TConnection.hxx"
@@ -77,7 +78,11 @@ namespace connectivity
 
             OConnection(OFileDriver*    _pDriver);
 
-            virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException);
+            virtual void construct(const OUString& _rUrl, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo )
+                throw( css::sdbc::SQLException,
+                       css::uno::RuntimeException,
+                       css::uno::DeploymentException);
+
 
             void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException);