diff options
Diffstat (limited to 'connectivity/source/drivers/postgresql/pq_driver.cxx')
| -rw-r--r-- | connectivity/source/drivers/postgresql/pq_driver.cxx | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 5388f3409e50..21fa728448a0 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -81,7 +81,6 @@ Sequence< OUString > DriverGetSupportedServiceNames() Reference< XConnection > Driver::connect( const OUString& url,const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { if( ! acceptsURL( url ) ) // XDriver spec tells me to do so ... return Reference< XConnection > (); @@ -97,45 +96,40 @@ Reference< XConnection > Driver::connect( } sal_Bool Driver::acceptsURL( const OUString& url ) - throw (SQLException, RuntimeException, std::exception) { return url.startsWith( "sdbc:postgresql:" ); } Sequence< DriverPropertyInfo > Driver::getPropertyInfo( const OUString& url,const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { (void)url; (void)info; return Sequence< DriverPropertyInfo > (); } -sal_Int32 Driver::getMajorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 Driver::getMajorVersion( ) { return PQ_SDBC_MAJOR; } -sal_Int32 Driver::getMinorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 Driver::getMinorVersion( ) { return PQ_SDBC_MINOR; } // XServiceInfo OUString SAL_CALL Driver::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return DriverGetImplementationName(); } sal_Bool Driver::supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > Driver::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return DriverGetSupportedServiceNames(); } @@ -149,14 +143,12 @@ void Driver::disposing() Reference< XTablesSupplier > Driver::getDataDefinitionByConnection( const Reference< XConnection >& connection ) - throw (SQLException, RuntimeException, std::exception) { return Reference< XTablesSupplier >( connection , UNO_QUERY ); } Reference< XTablesSupplier > Driver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { return Reference< XTablesSupplier > ( connect( url, info ), UNO_QUERY ); } @@ -189,29 +181,24 @@ public: // XSingleComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( - Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override; + Reference< XComponentContext > const & xContext ) override; virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, - Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override; + Reference< XComponentContext > const & xContext ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return m_implName; } - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override { for( int i = 0 ; i < m_serviceNames.getLength() ; i ++ ) if( m_serviceNames[i] == ServiceName ) return true; return false; } - Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override + Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return m_serviceNames; } @@ -229,7 +216,6 @@ private: Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgumentsAndContext( Sequence< Any > const &rArguments, const Reference< XComponentContext > & ctx ) - throw( RuntimeException, Exception, std::exception ) { (void)rArguments; return createInstanceWithContext( ctx ); @@ -237,7 +223,6 @@ Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgument Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithContext( const Reference< XComponentContext > & ctx ) - throw( RuntimeException, Exception, std::exception ) { if( ! m_theInstance.is() ) { |