diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess')
36 files changed, 692 insertions, 772 deletions
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index ab2072118632..485104be0c6d 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -50,13 +50,13 @@ public: OColumnPropertyListener(const OColumnPropertyListener&) = delete; const OColumnPropertyListener& operator=(const OColumnPropertyListener&) = delete; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception) override + virtual void SAL_CALL propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) override { if ( m_pComponent ) m_pComponent->notifyDataSourceModified(); } // XEventListener - virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) override + virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) override { } void clear() { m_pComponent = nullptr; } @@ -73,7 +73,7 @@ OComponentDefinition_Impl::~OComponentDefinition_Impl() // OComponentDefinition -void OComponentDefinition::initialize( const Sequence< Any >& aArguments ) throw(Exception, std::exception) +void OComponentDefinition::initialize( const Sequence< Any >& aArguments ) { OUString rName; if( (aArguments.getLength() == 1) && (aArguments[0] >>= rName) ) @@ -139,7 +139,6 @@ OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxCo } css::uno::Sequence<sal_Int8> OComponentDefinition::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -147,12 +146,12 @@ css::uno::Sequence<sal_Int8> OComponentDefinition::getImplementationId() IMPLEMENT_GETTYPES3(OComponentDefinition,ODataSettings,OContentHelper,OComponentDefinition_BASE); IMPLEMENT_FORWARD_XINTERFACE3( OComponentDefinition,OContentHelper,ODataSettings,OComponentDefinition_BASE) -OUString SAL_CALL OComponentDefinition::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL OComponentDefinition::getImplementationName() { return OUString("com.sun.star.comp.dba.OComponentDefinition"); } -Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames() { return { "com.sun.star.sdb.TableDefinition", "com.sun.star.ucb.Content" }; } @@ -179,7 +178,7 @@ IPropertyArrayHelper* OComponentDefinition::createArrayHelper( ) const return new OPropertyArrayHelper(aProps); } -Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo( ) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -192,7 +191,7 @@ OUString OComponentDefinition::determineContentType() const : OUString( "application/vnd.org.openoffice.DatabaseCommandDefinition" ); } -Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeException, std::exception) +Reference< XNameAccess> OComponentDefinition::getColumns() { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OContentHelper::rBHelper.bDisposed); @@ -234,7 +233,7 @@ Reference< XPropertySet > OComponentDefinition::createColumnDescriptor() return new OTableColumnDescriptor( true ); } -void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { ODataSettings::setFastPropertyValue_NoBroadcast(nHandle,rValue); notifyDataSourceModified(); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 84825edfc355..64a133a7a08d 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -110,26 +110,24 @@ public: ,bool _bTable = true ); - virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; // css::uno::XInterface DECLARE_XINTERFACE( ) // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XInitialization - virtual void SAL_CALL initialize( css::uno::Sequence< css::uno::Any > const & rArguments) throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize( css::uno::Sequence< css::uno::Any > const & rArguments) override; // css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XColumnsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -147,7 +145,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; // OContentHelper overridables virtual OUString determineContentType() const override; diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index b3466dccf604..4eea9fec1dbb 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -88,7 +88,7 @@ IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun. IMPLEMENT_IMPLEMENTATION_ID(OContentHelper) // XContent -Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw (RuntimeException, std::exception) +Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) { ::osl::MutexGuard aGuard(m_aMutex); OUString aIdentifier( "private:" + impl_getHierarchicalName( true ) ); @@ -119,7 +119,7 @@ OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer return sHierarchicalName; } -OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException, std::exception) +OUString SAL_CALL OContentHelper::getContentType() { ::osl::MutexGuard aGuard(m_aMutex); @@ -131,14 +131,14 @@ OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException, std: return *m_pImpl->m_aProps.aContentType; } -void SAL_CALL OContentHelper::addContentEventListener( const Reference< XContentEventListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL OContentHelper::addContentEventListener( const Reference< XContentEventListener >& _rxListener ) { ::osl::MutexGuard aGuard(m_aMutex); if ( _rxListener.is() ) m_aContentListeners.addInterface(_rxListener); } -void SAL_CALL OContentHelper::removeContentEventListener( const Reference< XContentEventListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL OContentHelper::removeContentEventListener( const Reference< XContentEventListener >& _rxListener ) { ::osl::MutexGuard aGuard(m_aMutex); if (_rxListener.is()) @@ -146,14 +146,14 @@ void SAL_CALL OContentHelper::removeContentEventListener( const Reference< XCont } // XCommandProcessor -sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier( ) { ::osl::MutexGuard aGuard(m_aMutex); // Just increase counter on every call to generate an identifier. return ++m_nCommandId; } -Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception) +Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment ) { Any aRet; if ( aCommand.Name == "getPropertyValues" ) @@ -231,12 +231,12 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma return aRet; } -void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ ) { } // XPropertiesChangeNotifier -void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) { ::osl::MutexGuard aGuard(m_aMutex); sal_Int32 nCount = PropertyNames.getLength(); @@ -258,7 +258,7 @@ void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUStr } } -void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) { ::osl::MutexGuard aGuard(m_aMutex); sal_Int32 nCount = PropertyNames.getLength(); @@ -281,18 +281,18 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OU } // XPropertyContainer -void SAL_CALL OContentHelper::addProperty( const OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OContentHelper::addProperty( const OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) { OSL_FAIL( "OContentHelper::addProperty: not implemented!" ); } -void SAL_CALL OContentHelper::removeProperty( const OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) +void SAL_CALL OContentHelper::removeProperty( const OUString& /*Name*/ ) { OSL_FAIL( "OContentHelper::removeProperty: not implemented!" ); } // XInitialization -void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) throw(Exception, RuntimeException, std::exception) +void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) { const Any* pBegin = _aArguments.getConstArray(); const Any* pEnd = pBegin + _aArguments.getLength(); @@ -553,7 +553,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent } // css::lang::XUnoTunnel -sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) { if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast<sal_Int64>(this); @@ -572,13 +572,13 @@ OContentHelper* OContentHelper::getImplementation( const Reference< XInterface > return pContent; } -Reference< XInterface > SAL_CALL OContentHelper::getParent( ) throw (RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OContentHelper::getParent( ) { ::osl::MutexGuard aGuard(m_aMutex); return m_xParentContainer; } -void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent ) { ::osl::MutexGuard aGuard(m_aMutex); m_xParentContainer = _xParent; @@ -613,7 +613,7 @@ void OContentHelper::impl_rename_throw(const OUString& _sNewName,bool _bNotify ) } } -void SAL_CALL OContentHelper::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL OContentHelper::rename( const OUString& newName ) { impl_rename_throw(newName); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index f76875ac5445..545b1c9e232b 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -138,17 +138,17 @@ public: void dispose(); // XDocumentSubStorageSupplier - virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nMode ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (IOException, RuntimeException, std::exception) override; + virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nMode ) override; + virtual Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) override; // XTransactionListener - virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; /// disposes all storages managed by this instance void disposeStorages(); @@ -302,7 +302,7 @@ bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits ) } -Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException, std::exception) +Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nDesiredMode ) { ::osl::MutexGuard aGuard( m_aMutex ); NamedStorages::const_iterator pos = m_aExposedStorages.find( aStorageName ); @@ -315,7 +315,7 @@ Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( con return pos->second; } -Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) throw (IOException, RuntimeException, std::exception) +Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) { Reference< XStorage > xRootStor( m_pModelImplementation->getRootStorage() ); if ( !xRootStor.is() ) @@ -334,12 +334,12 @@ Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames : Sequence< OUString >( &aNames[0], aNames.size() ); } -void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException, std::exception) +void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) { // not interested in } -void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEvent ) throw (RuntimeException, std::exception) +void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEvent ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -362,17 +362,17 @@ void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEv } } -void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException, std::exception) +void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& /*aEvent*/ ) { // not interested in } -void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception) +void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& /*aEvent*/ ) { // not interested in } -void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& Source ) throw ( RuntimeException, std::exception ) +void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& Source ) { OSL_ENSURE( Reference< XStorage >( Source.Source, UNO_QUERY ).is(), "DocumentStorageAccess::disposing: No storage? What's this?" ); @@ -620,7 +620,7 @@ void ODatabaseModelImpl::reset() } } -void SAL_CALL ODatabaseModelImpl::disposing( const css::lang::EventObject& Source ) throw(RuntimeException) +void SAL_CALL ODatabaseModelImpl::disposing( const css::lang::EventObject& Source ) { Reference<XConnection> xCon(Source.Source,UNO_QUERY); if ( xCon.is() ) diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 2c9511536d3b..71ecca9ed1c0 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -277,7 +277,7 @@ public: // XEventListener /// @throws css::uno::RuntimeException - void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException); + void SAL_CALL disposing( const css::lang::EventObject& Source ); void setModified( bool bModified ); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 4326b22bcd01..90a38b981341 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -45,7 +45,7 @@ void SAL_CALL OSharedConnection::disposing() OConnectionWrapper::disposing(); } -Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -53,7 +53,7 @@ Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) throw(SQ return m_xConnection->createStatement(); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -61,7 +61,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( co return m_xConnection->prepareStatement(sql); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -69,7 +69,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const O return m_xConnection->prepareCall(sql); } -OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -77,7 +77,7 @@ OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) throw(SQLE return m_xConnection->nativeSQL(sql); } -sal_Bool SAL_CALL OSharedConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OSharedConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -85,7 +85,7 @@ sal_Bool SAL_CALL OSharedConnection::getAutoCommit( ) throw(SQLException, Runti return m_xConnection->getAutoCommit(); } -void SAL_CALL OSharedConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSharedConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -93,7 +93,7 @@ void SAL_CALL OSharedConnection::commit( ) throw(SQLException, RuntimeException m_xConnection->commit(); } -void SAL_CALL OSharedConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSharedConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -101,7 +101,7 @@ void SAL_CALL OSharedConnection::rollback( ) throw(SQLException, RuntimeExcepti m_xConnection->rollback(); } -sal_Bool SAL_CALL OSharedConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OSharedConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xConnection.is() ) @@ -110,7 +110,7 @@ sal_Bool SAL_CALL OSharedConnection::isClosed( ) throw(SQLException, RuntimeExc return m_xConnection->isClosed(); } -Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -119,7 +119,7 @@ Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData( ) throw return m_xConnection->getMetaData(); } -sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -127,7 +127,7 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeE return m_xConnection->isReadOnly(); } -OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OSharedConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -135,7 +135,7 @@ OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeE return m_xConnection->getCatalog(); } -sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -143,7 +143,7 @@ sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation( ) throw(SQLExcep return m_xConnection->getTransactionIsolation(); } -Reference< css::container::XNameAccess > SAL_CALL OSharedConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OSharedConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index f4ae92491846..bfc5aa408f89 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -55,11 +55,11 @@ namespace dbaccess public: explicit OSharedConnection(css::uno::Reference< css::uno::XAggregation >& _rxProxyConnection); - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; virtual void SAL_CALL acquire() throw() override { OSharedConnection_BASE::acquire(); } virtual void SAL_CALL release() throw() override { OSharedConnection_BASE::release(); } - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override { return ::comphelper::concatSequences( OSharedConnection_BASE::getTypes(), @@ -67,7 +67,7 @@ namespace dbaccess ); } - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override { css::uno::Any aReturn = OSharedConnection_BASE::queryInterface(_rType); if ( !aReturn.hasValue() ) @@ -76,7 +76,7 @@ namespace dbaccess } // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL close( ) override { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -86,40 +86,40 @@ namespace dbaccess } // XConnection - virtual void SAL_CALL setAutoCommit( sal_Bool /*autoCommit*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setAutoCommit( sal_Bool /*autoCommit*/ ) override { throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any()); } - virtual void SAL_CALL setReadOnly( sal_Bool /*readOnly*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setReadOnly( sal_Bool /*readOnly*/ ) override { throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any()); } - virtual void SAL_CALL setCatalog( const OUString& /*catalog*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setCatalog( const OUString& /*catalog*/ ) override { throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any()); } - virtual void SAL_CALL setTransactionIsolation( sal_Int32 /*level*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setTransactionIsolation( sal_Int32 /*level*/ ) override { throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any()); } - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& /*typeMap*/ ) override { throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any()); } // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 3175df9bc65d..e45d54f34904 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -68,24 +68,24 @@ OBookmarkContainer::~OBookmarkContainer() } // XServiceInfo -OUString SAL_CALL OBookmarkContainer::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OBookmarkContainer::getImplementationName( ) { return OUString("com.sun.star.comp.dba.OBookmarkContainer"); } -sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames( ) { Sequence< OUString > aReturn { "com.sun.star.sdb.DefinitionContainer" }; return aReturn; } // XNameContainer -void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const Any& aElement ) { MutexGuard aGuard(m_rMutex); @@ -112,7 +112,7 @@ void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const An } } -void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName ) { OUString sOldBookmark; { @@ -143,7 +143,7 @@ void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName ) throw(N } // XNameReplace -void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const Any& aElement ) { ClearableMutexGuard aGuard(m_rMutex); @@ -177,14 +177,14 @@ void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const A } } -void SAL_CALL OBookmarkContainer::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception) +void SAL_CALL OBookmarkContainer::addContainerListener( const Reference< XContainerListener >& _rxListener ) { MutexGuard aGuard(m_rMutex); if (_rxListener.is()) m_aContainerListeners.addInterface(_rxListener); } -void SAL_CALL OBookmarkContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception) +void SAL_CALL OBookmarkContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener ) { MutexGuard aGuard(m_rMutex); if (_rxListener.is()) @@ -192,33 +192,33 @@ void SAL_CALL OBookmarkContainer::removeContainerListener( const Reference< XCon } // XElementAccess -Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException, std::exception) +Type SAL_CALL OBookmarkContainer::getElementType( ) { MutexGuard aGuard(m_rMutex); return ::cppu::UnoType<OUString>::get(); } -sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) { MutexGuard aGuard(m_rMutex); return !m_aBookmarks.empty(); } // XEnumerationAccess -Reference< XEnumeration > SAL_CALL OBookmarkContainer::createEnumeration( ) throw(RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL OBookmarkContainer::createEnumeration( ) { MutexGuard aGuard(m_rMutex); return new ::comphelper::OEnumerationByIndex(static_cast<XIndexAccess*>(this)); } // XIndexAccess -sal_Int32 SAL_CALL OBookmarkContainer::getCount( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OBookmarkContainer::getCount( ) { MutexGuard aGuard(m_rMutex); return m_aBookmarks.size(); } -Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) { MutexGuard aGuard(m_rMutex); @@ -228,7 +228,7 @@ Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutO return makeAny(m_aBookmarksIndexed[_nIndex]->second); } -Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) { MutexGuard aGuard(m_rMutex); @@ -238,7 +238,7 @@ Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) throw(NoSuc return makeAny(m_aBookmarks[_rName]); } -Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames( ) { MutexGuard aGuard(m_rMutex); @@ -256,7 +256,7 @@ Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames( ) throw(Runt return aNames; } -sal_Bool SAL_CALL OBookmarkContainer::hasByName( const OUString& _rName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OBookmarkContainer::hasByName( const OUString& _rName ) { MutexGuard aGuard(m_rMutex); @@ -308,12 +308,12 @@ void OBookmarkContainer::implReplace(const OUString& _rName, const OUString& _rN m_aBookmarks[_rName] = _rNewLink; } -Reference< XInterface > SAL_CALL OBookmarkContainer::getParent( ) throw (RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OBookmarkContainer::getParent( ) { return m_rParent; } -void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Parent*/ ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Parent*/ ) { throw NoSupportException(); } diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 1e3b8646b391..1f0f453add87 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -88,40 +88,40 @@ public: virtual void SAL_CALL release( ) throw() override; // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // css::container::XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // css::container::XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) override; // css::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) override; // css::container::XNameContainer - virtual void SAL_CALL insertByName( const OUString& _rName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& _rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& _rName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& _rName ) override; // css::container::XNameReplace - virtual void SAL_CALL replaceByName( const OUString& _rName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& _rName, const css::uno::Any& aElement ) override; // css::container::XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // css::container::XContainer - virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; // css::container::XChild - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; protected: /** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e. diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 243015b19bca..a089c9ddd976 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -57,7 +57,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandCo IMPLEMENT_GETTYPES2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE); css::uno::Sequence<sal_Int8> OCommandContainer::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -74,12 +73,12 @@ Reference< XContent > OCommandContainer::createObject( const OUString& _rName) return static_cast< css::sdb::XQueryDefinition * > ( new OCommandDefinition( *this, _rName, m_aContext, pElementContent ) ); } -Reference< XInterface > SAL_CALL OCommandContainer::createInstanceWithArguments(const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OCommandContainer::createInstanceWithArguments(const Sequence< Any >& /*aArguments*/ ) { return createInstance( ); } -Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) { if(m_bTables) return css::sdb::TableDefinition::createDefault( m_aContext ); diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index 3ca33c979c82..a309f0ece37d 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -50,14 +50,12 @@ public: DECLARE_XINTERFACE( ) - virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; // XSingleServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override; protected: virtual ~OCommandContainer() override; diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 10c767524d4c..8d34887c007a 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -78,7 +78,6 @@ OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContai } css::uno::Sequence<sal_Int8> OCommandDefinition::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -87,12 +86,12 @@ IMPLEMENT_GETTYPES2(OCommandDefinition,OCommandDefinition_Base,OComponentDefinit IMPLEMENT_FORWARD_XINTERFACE2( OCommandDefinition,OComponentDefinition,OCommandDefinition_Base) IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP) -OUString SAL_CALL OCommandDefinition::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL OCommandDefinition::getImplementationName() { return OUString("com.sun.star.comp.dba.OCommandDefinition"); } -css::uno::Sequence<OUString> SAL_CALL OCommandDefinition::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OCommandDefinition::getSupportedServiceNames() { return { "com.sun.star.sdb.QueryDefinition", @@ -101,7 +100,7 @@ css::uno::Sequence<OUString> SAL_CALL OCommandDefinition::getSupportedServiceNam }; } -void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL OCommandDefinition::rename( const OUString& newName ) { try { diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 135ee3990a18..f8372035ebe9 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -70,52 +70,49 @@ public: ,const TContentPtr& _pImpl ); - virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; // css::uno::XInterface DECLARE_XINTERFACE( ) // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XRename - virtual void SAL_CALL rename( const OUString& newName ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& newName ) override; // overrides to resolve ambiguity - virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override { OComponentDefinition::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override { return OComponentDefinition::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { OComponentDefinition::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { OComponentDefinition::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { OComponentDefinition::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { OComponentDefinition::removeVetoableChangeListener(p1, p2); } - virtual css::uno::Reference<css::ucb::XContentIdentifier> SAL_CALL getIdentifier() throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Reference<css::ucb::XContentIdentifier> SAL_CALL getIdentifier() override { return OComponentDefinition::getIdentifier(); } - virtual OUString SAL_CALL getContentType() throw( css::uno::RuntimeException, std::exception ) override + virtual OUString SAL_CALL getContentType() override { return OComponentDefinition::getContentType(); } - virtual void SAL_CALL addContentEventListener(const css::uno::Reference<css::ucb::XContentEventListener>& p1) throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL addContentEventListener(const css::uno::Reference<css::ucb::XContentEventListener>& p1) override { OComponentDefinition::addContentEventListener(p1); } - virtual void SAL_CALL removeContentEventListener(const css::uno::Reference<css::ucb::XContentEventListener>& p1) throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL removeContentEventListener(const css::uno::Reference<css::ucb::XContentEventListener>& p1) override { OComponentDefinition::removeContentEventListener(p1); } - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL dispose() override { OComponentDefinition::dispose(); } - virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override { OComponentDefinition::addEventListener(p1); } - virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override { OComponentDefinition::removeEventListener(p1); } // OPropertySetHelper - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; virtual cppu::IPropertyArrayHelper* createArrayHelper() const override; diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index c03734574d74..d3b928362293 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -76,17 +76,17 @@ namespace dbaccess { // XServiceInfo -OUString OConnection::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OConnection::getImplementationName( ) { return OUString("com.sun.star.comp.dbaccess.Connection"); } -sal_Bool OConnection::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool OConnection::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > OConnection::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OConnection::getSupportedServiceNames( ) { Sequence< OUString > aSupported = OConnectionWrapper::getSupportedServiceNames(); @@ -101,20 +101,20 @@ Sequence< OUString > OConnection::getSupportedServiceNames( ) throw (RuntimeExc } // XCloseable -void OConnection::close() throw( SQLException, RuntimeException, std::exception ) +void OConnection::close() { // being closed is the same as being disposed dispose(); } -sal_Bool OConnection::isClosed() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OConnection::isClosed() { MutexGuard aGuard(m_aMutex); return !m_xMasterConnection.is(); } // XConnection -Reference< XStatement > OConnection::createStatement() throw( SQLException, RuntimeException, std::exception ) +Reference< XStatement > OConnection::createStatement() { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -129,7 +129,7 @@ Reference< XStatement > OConnection::createStatement() throw( SQLException, Run return xStatement; } -Reference< XPreparedStatement > OConnection::prepareStatement(const OUString& sql) throw( SQLException, RuntimeException, std::exception ) +Reference< XPreparedStatement > OConnection::prepareStatement(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -145,7 +145,7 @@ Reference< XPreparedStatement > OConnection::prepareStatement(const OUString& s return xStatement; } -Reference< XPreparedStatement > OConnection::prepareCall(const OUString& sql) throw( SQLException, RuntimeException, std::exception ) +Reference< XPreparedStatement > OConnection::prepareCall(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -160,98 +160,98 @@ Reference< XPreparedStatement > OConnection::prepareCall(const OUString& sql) t return xStatement; } -OUString OConnection::nativeSQL(const OUString& sql) throw( SQLException, RuntimeException, std::exception ) +OUString OConnection::nativeSQL(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->nativeSQL(sql); } -void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, RuntimeException, std::exception ) +void OConnection::setAutoCommit(sal_Bool autoCommit) { MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setAutoCommit(autoCommit); } -sal_Bool OConnection::getAutoCommit() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OConnection::getAutoCommit() { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getAutoCommit(); } -void OConnection::commit() throw( SQLException, RuntimeException, std::exception ) +void OConnection::commit() { MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->commit(); } -void OConnection::rollback() throw( SQLException, RuntimeException, std::exception ) +void OConnection::rollback() { MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->rollback(); } -Reference< XDatabaseMetaData > OConnection::getMetaData() throw( SQLException, RuntimeException, std::exception ) +Reference< XDatabaseMetaData > OConnection::getMetaData() { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getMetaData(); } -void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeException, std::exception ) +void OConnection::setReadOnly(sal_Bool readOnly) { MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setReadOnly(readOnly); } -sal_Bool OConnection::isReadOnly() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OConnection::isReadOnly() { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->isReadOnly(); } -void OConnection::setCatalog(const OUString& catalog) throw( SQLException, RuntimeException, std::exception ) +void OConnection::setCatalog(const OUString& catalog) { MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setCatalog(catalog); } -OUString OConnection::getCatalog() throw( SQLException, RuntimeException, std::exception ) +OUString OConnection::getCatalog() { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getCatalog(); } -void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException, RuntimeException, std::exception ) +void OConnection::setTransactionIsolation(sal_Int32 level) { MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->setTransactionIsolation(level); } -sal_Int32 OConnection::getTransactionIsolation() throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OConnection::getTransactionIsolation() { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getTransactionIsolation(); } -Reference< XNameAccess > OConnection::getTypeMap() throw( SQLException, RuntimeException, std::exception ) +Reference< XNameAccess > OConnection::getTypeMap() { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getTypeMap(); } -void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQLException, RuntimeException, std::exception ) +void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -364,14 +364,14 @@ OConnection::~OConnection() } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OConnection::getWarnings() { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_aWarnings.getWarnings(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::clearWarnings( ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -397,7 +397,7 @@ namespace } // css::lang::XTypeProvider -Sequence< Type > OConnection::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > OConnection::getTypes() { TypeBag aNormalizedTypes; @@ -415,13 +415,13 @@ Sequence< Type > OConnection::getTypes() throw (RuntimeException, std::exception return comphelper::containerToSequence(aNormalizedTypes); } -Sequence< sal_Int8 > OConnection::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > OConnection::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // css::uno::XInterface -Any OConnection::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any OConnection::queryInterface( const Type & rType ) { if ( !m_bSupportsViews && rType.equals( cppu::UnoType<XViewsSupplier>::get() ) ) return Any(); @@ -496,20 +496,20 @@ void OConnection::disposing() } // XChild -Reference< XInterface > OConnection::getParent() throw( RuntimeException, std::exception ) +Reference< XInterface > OConnection::getParent() { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xParent; } -void OConnection::setParent(const Reference< XInterface > & /*Parent*/) throw( NoSupportException, RuntimeException, std::exception ) +void OConnection::setParent(const Reference< XInterface > & /*Parent*/) { throw NoSupportException(); } // XSQLQueryComposerFactory -Reference< XSQLQueryComposer > OConnection::createQueryComposer() throw( RuntimeException, std::exception ) +Reference< XSQLQueryComposer > OConnection::createQueryComposer() { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -567,7 +567,7 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed) } // XTablesSupplier -Reference< XNameAccess > OConnection::getTables() throw( RuntimeException, std::exception ) +Reference< XNameAccess > OConnection::getTables() { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -577,7 +577,7 @@ Reference< XNameAccess > OConnection::getTables() throw( RuntimeException, std: return m_pTables; } -Reference< XNameAccess > SAL_CALL OConnection::getViews( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OConnection::getViews( ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -588,7 +588,7 @@ Reference< XNameAccess > SAL_CALL OConnection::getViews( ) throw(RuntimeExcepti } // XQueriesSupplier -Reference< XNameAccess > OConnection::getQueries() throw( RuntimeException, std::exception ) +Reference< XNameAccess > OConnection::getQueries() { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -597,7 +597,7 @@ Reference< XNameAccess > OConnection::getQueries() throw( RuntimeException, std } // css::sdb::XCommandPreparation -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCommand( const OUString& command, sal_Int32 commandType ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCommand( const OUString& command, sal_Int32 commandType ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -628,7 +628,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCommand( const OUS return prepareStatement(aStatement); } -Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _sServiceSpecifier ) throw (Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _sServiceSpecifier ) { Reference< XServiceInfo > xRet; if ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier || _sServiceSpecifier == "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) @@ -658,12 +658,12 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _s return Reference<XInterface>(xRet, UNO_QUERY); } -Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw (Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) { return createInstance(_sServiceSpecifier); } -Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames( ) { Sequence< OUString > aRet { SERVICE_NAME_SINGLESELECTQUERYCOMPOSER }; return aRet; @@ -688,7 +688,7 @@ Reference< XTablesSupplier > const & OConnection::getMasterTables() } // XUsersSupplier -Reference< XNameAccess > SAL_CALL OConnection::getUsers( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OConnection::getUsers( ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -698,7 +698,7 @@ Reference< XNameAccess > SAL_CALL OConnection::getUsers( ) throw(RuntimeExcepti } // XGroupsSupplier -Reference< XNameAccess > SAL_CALL OConnection::getGroups( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OConnection::getGroups( ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -711,7 +711,7 @@ void OConnection::impl_loadConnectionTools_throw() m_xConnectionTools = css::sdb::tools::ConnectionTools::createWithConnection( m_aContext, this ); } -Reference< XTableName > SAL_CALL OConnection::createTableName( ) throw (RuntimeException, std::exception) +Reference< XTableName > SAL_CALL OConnection::createTableName( ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -720,7 +720,7 @@ Reference< XTableName > SAL_CALL OConnection::createTableName( ) throw (Runtime return m_xConnectionTools->createTableName(); } -Reference< XObjectNames > SAL_CALL OConnection::getObjectNames( ) throw (RuntimeException, std::exception) +Reference< XObjectNames > SAL_CALL OConnection::getObjectNames( ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -729,7 +729,7 @@ Reference< XObjectNames > SAL_CALL OConnection::getObjectNames( ) throw (Runtim return m_xConnectionTools->getObjectNames(); } -Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData( ) throw (RuntimeException, std::exception) +Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData( ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -738,7 +738,7 @@ Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData( ) return m_xConnectionTools->getDataSourceMetaData(); } -Reference< css::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) throw (css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -747,7 +747,7 @@ Reference< css::container::XNameAccess > SAL_CALL OConnection::getFieldsByComman return m_xConnectionTools->getFieldsByCommandDescriptor(commandType,command,keepFieldsAlive); } -Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (css::uno::RuntimeException, std::exception) +Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const OUString& command ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -790,7 +790,7 @@ void OConnection::impl_checkTableQueryNames_nothrow() } } -Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (RuntimeException, std::exception) +Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) { Reference< XGraphic > xReturn; @@ -806,7 +806,7 @@ Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& TableN return xReturn; } -Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) { Reference< XInterface > xReturn; diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index d1258f211467..35985fb42d73 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -111,11 +111,11 @@ public: ,const css::uno::Reference< css::uno::XComponentContext >& _rxORB); // css::lang::XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::uno::XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw( ) override; virtual void SAL_CALL release() throw( ) override; @@ -123,82 +123,82 @@ public: virtual void SAL_CALL disposing() override; // css::container::XChild - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; // css::sdbcx::XTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override; // css::sdbcx::XViewsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) override; // css::sdb::XQueriesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueries( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueries( ) override; // css::sdb::XSQLQueryComposerFactory - virtual css::uno::Reference< css::sdb::XSQLQueryComposer > SAL_CALL createQueryComposer( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdb::XSQLQueryComposer > SAL_CALL createQueryComposer( ) override; // css::sdb::XCommandPreparation - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const OUString& command, sal_Int32 commandType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const OUString& command, sal_Int32 commandType ) override; // css::sdbc::XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // css::sdbc::XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) override; // XUsersSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) override; // XGroupsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups( ) override; // XConnectionTools - virtual css::uno::Reference< css::sdb::tools::XTableName > SAL_CALL createTableName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdb::tools::XObjectNames > SAL_CALL getObjectNames( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdb::tools::XTableName > SAL_CALL createTableName( ) override; + virtual css::uno::Reference< css::sdb::tools::XObjectNames > SAL_CALL getObjectNames( ) override; + virtual css::uno::Reference< css::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) override; + virtual css::uno::Reference< css::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) override; // XTableUIProvider - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getTableEditor( const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getTableEditor( const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) override; // IRefreshListener virtual void refresh(const css::uno::Reference< css::container::XNameAccess >& _rToBeRefreshed) override; protected: /// @throws css::lang::DisposedException - inline void checkDisposed() throw (css::lang::DisposedException) + inline void checkDisposed() { if ( rBHelper.bDisposed || !m_xConnection.is() ) throw css::lang::DisposedException(); diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index f1eec5faefcd..a3fc0f66a7db 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -75,16 +75,16 @@ namespace DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; protected: virtual ~DataAccessDescriptor() override; protected: // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override; + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper @@ -164,23 +164,23 @@ namespace IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataAccessDescriptor, DataAccessDescriptor_TypeBase, DataAccessDescriptor_PropertyBase ); - OUString SAL_CALL DataAccessDescriptor::getImplementationName() throw (RuntimeException, std::exception) + OUString SAL_CALL DataAccessDescriptor::getImplementationName() { return OUString( "com.sun.star.comp.dba.DataAccessDescriptor" ); } - sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > SAL_CALL DataAccessDescriptor::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL DataAccessDescriptor::getSupportedServiceNames( ) { Sequence< OUString > aServices { "com.sun.star.sdb.DataAccessDescriptor" }; return aServices; } - Reference< XPropertySetInfo > SAL_CALL DataAccessDescriptor::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL DataAccessDescriptor::getPropertySetInfo() { Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -203,12 +203,12 @@ namespace { public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDataAccessDescriptorFactory - virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor( ) throw (RuntimeException, std::exception) override; + virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor( ) override; DataAccessDescriptorFactory(); }; @@ -217,23 +217,23 @@ namespace { } - OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException, std::exception) + OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() { return OUString( "com.sun.star.comp.dba.DataAccessDescriptorFactory" ); } - sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames() throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames() { Sequence< OUString > aServices { "com.sun.star.sdb.DataAccessDescriptorFactory" }; return aServices; } - Reference< XPropertySet > SAL_CALL DataAccessDescriptorFactory::createDataAccessDescriptor( ) throw (RuntimeException, std::exception) + Reference< XPropertySet > SAL_CALL DataAccessDescriptorFactory::createDataAccessDescriptor( ) { return new DataAccessDescriptor(); } diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 28984584f66e..35de41f191d3 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -110,10 +110,10 @@ namespace dbaccess private: // XTerminateListener - virtual void SAL_CALL queryTermination( const lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const lang::EventObject& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const lang::EventObject& Event ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; DatabaseDocumentLoader::DatabaseDocumentLoader( const Reference<XComponentContext> & rxContext ) @@ -130,7 +130,7 @@ namespace dbaccess } } - void SAL_CALL DatabaseDocumentLoader::queryTermination( const lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception) + void SAL_CALL DatabaseDocumentLoader::queryTermination( const lang::EventObject& /*Event*/ ) { ::std::list< const ODatabaseModelImpl* > aCpy(m_aDatabaseDocuments); for( const auto& pCopy : aCpy ) @@ -153,11 +153,11 @@ namespace dbaccess } } - void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) { } - void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ ) { } @@ -199,7 +199,7 @@ ODatabaseContext::~ODatabaseContext() } // Helper -OUString ODatabaseContext::getImplementationName_static() throw( RuntimeException ) +OUString ODatabaseContext::getImplementationName_static() { return OUString("com.sun.star.comp.dba.ODatabaseContext"); } @@ -209,24 +209,24 @@ Reference< XInterface > ODatabaseContext::Create(const Reference< XComponentCont return *( new ODatabaseContext( _rxContext ) ); } -Sequence< OUString > ODatabaseContext::getSupportedServiceNames_static() throw( RuntimeException ) +Sequence< OUString > ODatabaseContext::getSupportedServiceNames_static() { Sequence<OUString> aSNS { "com.sun.star.sdb.DatabaseContext" }; return aSNS; } // XServiceInfo -OUString ODatabaseContext::getImplementationName( ) throw(RuntimeException, std::exception) +OUString ODatabaseContext::getImplementationName( ) { return getImplementationName_static(); } -sal_Bool ODatabaseContext::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool ODatabaseContext::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > ODatabaseContext::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > ODatabaseContext::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } @@ -239,14 +239,14 @@ Reference< XInterface > ODatabaseContext::impl_createNewDataSource() return xDataSource.get(); } -Reference< XInterface > SAL_CALL ODatabaseContext::createInstance( ) throw (Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ODatabaseContext::createInstance( ) { // for convenience of the API user, we ensure the document is fully initialized (effectively: XLoadable::initNew // has been called at the DatabaseDocument). return impl_createNewDataSource(); } -Reference< XInterface > SAL_CALL ODatabaseContext::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ODatabaseContext::createInstanceWithArguments( const Sequence< Any >& _rArguments ) { ::comphelper::NamedValueCollection aArgs( _rArguments ); OUString sURL = aArgs.getOrDefault( INFO_POOLURL, OUString() ); @@ -286,7 +286,7 @@ void ODatabaseContext::disposing() } // XNamingService -Reference< XInterface > ODatabaseContext::getRegisteredObject(const OUString& _rName) throw( Exception, RuntimeException, std::exception ) +Reference< XInterface > ODatabaseContext::getRegisteredObject(const OUString& _rName) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); @@ -421,7 +421,7 @@ void ODatabaseContext::setTransientProperties(const OUString& _sURL, ODatabaseMo } } -void ODatabaseContext::registerObject(const OUString& _rName, const Reference< XInterface > & _rxObject) throw( Exception, RuntimeException, std::exception ) +void ODatabaseContext::registerObject(const OUString& _rName, const Reference< XInterface > & _rxObject) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); @@ -504,17 +504,17 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl } } -void SAL_CALL ODatabaseContext::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception) +void SAL_CALL ODatabaseContext::addContainerListener( const Reference< XContainerListener >& _rxListener ) { m_aContainerListeners.addInterface(_rxListener); } -void SAL_CALL ODatabaseContext::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception) +void SAL_CALL ODatabaseContext::removeContainerListener( const Reference< XContainerListener >& _rxListener ) { m_aContainerListeners.removeInterface(_rxListener); } -void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, RuntimeException, std::exception ) +void ODatabaseContext::revokeObject(const OUString& _rName) { ClearableMutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); @@ -540,58 +540,58 @@ void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, Ru m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent ); } -sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& Name ) { return m_xDatabaseRegistrations->hasRegisteredDatabase( Name ); } -Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames() { return m_xDatabaseRegistrations->getRegistrationNames(); } -OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& Name ) { return m_xDatabaseRegistrations->getDatabaseLocation( Name ); } -void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& Name, const OUString& Location ) { m_xDatabaseRegistrations->registerDatabaseLocation( Name, Location ); } -void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) +void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& Name ) { m_xDatabaseRegistrations->revokeDatabaseLocation( Name ); } -void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) +void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) { m_xDatabaseRegistrations->changeDatabaseLocation( Name, NewLocation ); } -sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& Name ) { return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( Name ); } -void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) { m_xDatabaseRegistrations->addDatabaseRegistrationsListener( Listener ); } -void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) { m_xDatabaseRegistrations->removeDatabaseRegistrationsListener( Listener ); } // css::container::XElementAccess -Type ODatabaseContext::getElementType( ) throw(RuntimeException, std::exception) +Type ODatabaseContext::getElementType( ) { return cppu::UnoType<XDataSource>::get(); } -sal_Bool ODatabaseContext::hasElements() throw( RuntimeException, std::exception ) +sal_Bool ODatabaseContext::hasElements() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); @@ -600,15 +600,14 @@ sal_Bool ODatabaseContext::hasElements() throw( RuntimeException, std::exception } // css::container::XEnumerationAccess -Reference< css::container::XEnumeration > ODatabaseContext::createEnumeration() throw( RuntimeException, std::exception ) +Reference< css::container::XEnumeration > ODatabaseContext::createEnumeration() { MutexGuard aGuard(m_aMutex); return new ::comphelper::OEnumerationByName(static_cast<XNameAccess*>(this)); } // css::container::XNameAccess -Any ODatabaseContext::getByName(const OUString& _rName) throw( NoSuchElementException, - WrappedTargetException, RuntimeException, std::exception ) +Any ODatabaseContext::getByName(const OUString& _rName) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); @@ -657,7 +656,7 @@ Any ODatabaseContext::getByName(const OUString& _rName) throw( NoSuchElementExce } } -Sequence< OUString > ODatabaseContext::getElementNames() throw( RuntimeException, std::exception ) +Sequence< OUString > ODatabaseContext::getElementNames() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); @@ -665,7 +664,7 @@ Sequence< OUString > ODatabaseContext::getElementNames() throw( RuntimeException return getRegistrationNames(); } -sal_Bool ODatabaseContext::hasByName(const OUString& _rName) throw( RuntimeException, std::exception ) +sal_Bool ODatabaseContext::hasByName(const OUString& _rName) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); @@ -715,7 +714,7 @@ void ODatabaseContext::databaseDocumentURLChange( const OUString& _rOldURL, cons m_aDatabaseObjects.erase( oldPos ); } -sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& rId ) { if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast<sal_Int64>(this); diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx index 14f4a0ba9568..b51425d3e312 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.hxx +++ b/dbaccess/source/core/dataaccess/databasecontext.hxx @@ -117,56 +117,56 @@ public: virtual void SAL_CALL disposing() override; // XSingleServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& _rArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& _rArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XNamingService - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokeObject( const OUString& Name ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) override; + virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) override; + virtual void SAL_CALL revokeObject( const OUString& Name ) override; // XDatabaseRegistrations - virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getRegistrationNames() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addDatabaseRegistrationsListener( const css::uno::Reference< css::sdb::XDatabaseRegistrationsListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDatabaseRegistrationsListener( const css::uno::Reference< css::sdb::XDatabaseRegistrationsListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRegistrationNames() override; + virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) override; + virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) override; + virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) override; + virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) override; + virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) override; + virtual void SAL_CALL addDatabaseRegistrationsListener( const css::uno::Reference< css::sdb::XDatabaseRegistrationsListener >& Listener ) override; + virtual void SAL_CALL removeDatabaseRegistrationsListener( const css::uno::Reference< css::sdb::XDatabaseRegistrationsListener >& Listener ) override; // XContainer - virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); void registerDatabaseDocument( ODatabaseModelImpl& _rModelImpl); diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index f067ed3185bd..8d92f735c12f 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -197,7 +197,7 @@ ODatabaseDocument::~ODatabaseDocument() m_pEventContainer = nullptr; } -Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType ) { // strip XEmbeddedScripts and XScriptInvocationContext if we have any form/report // which already contains macros. In this case, the database document itself is not @@ -225,7 +225,7 @@ void SAL_CALL ODatabaseDocument::release( ) throw () ODatabaseDocument_OfficeDocument::release(); } -Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException, std::exception) +Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) { Sequence< Type > aTypes = ::comphelper::concatSequences( ODatabaseDocument_OfficeDocument::getTypes(), @@ -266,7 +266,7 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeExceptio return aTypes; } -Sequence< sal_Int8 > SAL_CALL ODatabaseDocument::getImplementationId( ) throw (RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL ODatabaseDocument::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -372,7 +372,7 @@ static const char sPictures[] = "Pictures"; // I could check anyway ) /// @throws RuntimeException -void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibraryContainer >& xDlgCont, const Reference< XStorage >& xStorage, const Reference< XModel >& rxModel, const Reference<XComponentContext >& rxContext ) throw ( RuntimeException ) +void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibraryContainer >& xDlgCont, const Reference< XStorage >& xStorage, const Reference< XModel >& rxModel, const Reference<XComponentContext >& rxContext ) { Sequence< OUString > sLibraries = xDlgCont->getElementNames(); Reference< XStorage > xTmpPic = xStorage->openStorageElement( "tempPictures", ElementModes::READWRITE ); @@ -505,7 +505,7 @@ void ODatabaseDocument::impl_import_nolck_throw( const Reference< XComponentCont xStatusIndicator->end(); } -void SAL_CALL ODatabaseDocument::initNew( ) throw (DoubleInitializationException, IOException, Exception, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::initNew( ) { // SYNCHRONIZED -> DocumentGuard aGuard( *this, DocumentGuard::InitMethod ); @@ -538,7 +538,7 @@ void SAL_CALL ODatabaseDocument::initNew( ) throw (DoubleInitializationExceptio impl_notifyStorageChange_nolck_nothrow( xTempStor ); } -void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& Arguments ) throw (DoubleInitializationException, IOException, Exception, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& Arguments ) { // SYNCHRONIZED -> DocumentGuard aGuard( *this, DocumentGuard::InitMethod ); @@ -615,7 +615,7 @@ namespace } } -sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -653,7 +653,7 @@ sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() throw ( RuntimeE return false; } -void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception ) +void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); ModifyLock aLock( *this ); @@ -689,7 +689,7 @@ void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const OUString& i_TargetLo } } -void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception ) +void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) { try { @@ -742,7 +742,7 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocati } // XModel -sal_Bool SAL_CALL ODatabaseDocument::attachResource( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseDocument::attachResource( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) { if (_rURL.isEmpty() && _rArguments.getLength() == 1 && _rArguments[0].Name == "SetEmbedded") { @@ -809,19 +809,19 @@ bool ODatabaseDocument::impl_attachResource( const OUString& i_rLogicalDocumentU return true; } -OUString SAL_CALL ODatabaseDocument::getURL( ) throw (RuntimeException, std::exception) +OUString SAL_CALL ODatabaseDocument::getURL( ) { DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); return m_pImpl->getURL(); } -Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getArgs( ) throw (RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getArgs( ) { DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); return m_pImpl->getMediaDescriptor().getPropertyValues(); } -void SAL_CALL ODatabaseDocument::connectController( const Reference< XController >& _xController ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::connectController( const Reference< XController >& _xController ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -847,7 +847,7 @@ void SAL_CALL ODatabaseDocument::connectController( const Reference< XController m_pImpl->checkMacrosOnLoading(); } -void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XController >& _xController ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XController >& _xController ) { bool bNotifyViewClosed = false; bool bLastControllerGone = false; @@ -891,35 +891,35 @@ void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XControl } } -void SAL_CALL ODatabaseDocument::lockControllers( ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::lockControllers( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); ++m_pImpl->m_nControllerLockCount; } -void SAL_CALL ODatabaseDocument::unlockControllers( ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::unlockControllers( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); --m_pImpl->m_nControllerLockCount; } -sal_Bool SAL_CALL ODatabaseDocument::hasControllersLocked( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseDocument::hasControllersLocked( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); return m_pImpl->m_nControllerLockCount != 0; } -Reference< XController > SAL_CALL ODatabaseDocument::getCurrentController() throw (RuntimeException, std::exception) +Reference< XController > SAL_CALL ODatabaseDocument::getCurrentController() { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); return m_xCurrentController.is() ? m_xCurrentController : ( m_aControllers.empty() ? Reference< XController >() : *m_aControllers.begin() ); } -void SAL_CALL ODatabaseDocument::setCurrentController( const Reference< XController >& _xController ) throw (NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::setCurrentController( const Reference< XController >& _xController ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -948,7 +948,7 @@ void SAL_CALL ODatabaseDocument::setCurrentController( const Reference< XControl } } -Reference< XInterface > SAL_CALL ODatabaseDocument::getCurrentSelection( ) throw (RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ODatabaseDocument::getCurrentSelection( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -961,12 +961,12 @@ Reference< XInterface > SAL_CALL ODatabaseDocument::getCurrentSelection( ) thro } // XStorable -sal_Bool SAL_CALL ODatabaseDocument::hasLocation( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseDocument::hasLocation( ) { return !getLocation().isEmpty(); } -OUString SAL_CALL ODatabaseDocument::getLocation( ) throw (RuntimeException, std::exception) +OUString SAL_CALL ODatabaseDocument::getLocation( ) { DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); return m_pImpl->getURL(); @@ -974,13 +974,13 @@ OUString SAL_CALL ODatabaseDocument::getLocation( ) throw (RuntimeException, st // the location of the file which the document was possibly recovered from (which would be getDocFileLocation) } -sal_Bool SAL_CALL ODatabaseDocument::isReadonly( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseDocument::isReadonly( ) { DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); return m_pImpl->m_bDocumentReadOnly; } -void SAL_CALL ODatabaseDocument::store( ) throw (IOException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::store( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -1029,7 +1029,7 @@ void ODatabaseDocument::impl_throwIOExceptionCausedBySave_throw( const Any& i_rE } void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comphelper::NamedValueCollection& _rArguments, - const StoreType _eType, DocumentGuard& _rGuard ) throw (IOException, RuntimeException, std::exception) + const StoreType _eType, DocumentGuard& _rGuard ) { OSL_PRECOND( ( _eType == SAVE ) || ( _eType == SAVE_AS ), "ODatabaseDocument::impl_storeAs_throw: you introduced a new type which cannot be handled here!" ); @@ -1159,7 +1159,7 @@ Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const OUSt return Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aParam ), UNO_QUERY_THROW ); } -void SAL_CALL ODatabaseDocument::storeAsURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::storeAsURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) { // SYNCHRONIZED -> DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); @@ -1248,7 +1248,7 @@ void ODatabaseDocument::impl_storeToStorage_throw( const Reference< XStorage >& } } -void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); ModifyLock aLock( *this ); @@ -1290,27 +1290,27 @@ void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequen } // XModifyBroadcaster -void SAL_CALL ODatabaseDocument::addModifyListener( const Reference< XModifyListener >& _xListener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::addModifyListener( const Reference< XModifyListener >& _xListener ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); m_aModifyListeners.addInterface(_xListener); } -void SAL_CALL ODatabaseDocument::removeModifyListener( const Reference< XModifyListener >& _xListener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::removeModifyListener( const Reference< XModifyListener >& _xListener ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); m_aModifyListeners.removeInterface(_xListener); } // XModifiable -sal_Bool SAL_CALL ODatabaseDocument::isModified( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseDocument::isModified( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); return m_pImpl->m_bModified; } -void SAL_CALL ODatabaseDocument::setModified( sal_Bool _bModified ) throw (PropertyVetoException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::setModified( sal_Bool _bModified ) { DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); if ( impl_isInitialized() ) @@ -1341,27 +1341,27 @@ void ODatabaseDocument::impl_setModified_nothrow( bool _bModified, DocumentGuard } // css::document::XEventBroadcaster -void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& Listener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& Listener ) { m_aEventNotifier.addLegacyEventListener( Listener ); } -void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& Listener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& Listener ) { m_aEventNotifier.removeLegacyEventListener( Listener ); } -void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) { m_aEventNotifier.addDocumentEventListener( Listener ); } -void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) { m_aEventNotifier.removeDocumentEventListener( Listener ); } -void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& EventName, const Reference< XController2 >& ViewController, const Any& Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& EventName, const Reference< XController2 >& ViewController, const Any& Supplement ) { if ( EventName.isEmpty() ) throw IllegalArgumentException( OUString(), *this, 1 ); @@ -1380,18 +1380,18 @@ void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& EventName, m_aEventNotifier.notifyDocumentEvent( EventName, ViewController, Supplement ); } -Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getPrinter( ) throw (RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getPrinter( ) { OSL_FAIL( "ODatabaseDocument::getPrinter: not supported!" ); return Sequence< PropertyValue >(); } -void SAL_CALL ODatabaseDocument::setPrinter( const Sequence< PropertyValue >& /*aPrinter*/ ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::setPrinter( const Sequence< PropertyValue >& /*aPrinter*/ ) { OSL_FAIL( "ODatabaseDocument::setPrinter: not supported!" ); } -void SAL_CALL ODatabaseDocument::print( const Sequence< PropertyValue >& /*xOptions*/ ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::print( const Sequence< PropertyValue >& /*xOptions*/ ) { OSL_FAIL( "ODatabaseDocument::print: not supported!" ); } @@ -1497,7 +1497,6 @@ void ODatabaseDocument::impl_disposeControllerFrames_nothrow() } void SAL_CALL ODatabaseDocument::close(sal_Bool bDeliverOwnership) -throw (CloseVetoException, RuntimeException, std::exception) { // nearly everything below can/must be done without our mutex locked, the below is just for // the checks for being disposed and the like @@ -1540,25 +1539,25 @@ throw (CloseVetoException, RuntimeException, std::exception) // <- SYNCHRONIZED } -void SAL_CALL ODatabaseDocument::addCloseListener( const Reference< css::util::XCloseListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::addCloseListener( const Reference< css::util::XCloseListener >& Listener ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); m_aCloseListener.addInterface(Listener); } -void SAL_CALL ODatabaseDocument::removeCloseListener( const Reference< css::util::XCloseListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::removeCloseListener( const Reference< css::util::XCloseListener >& Listener ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); m_aCloseListener.removeInterface(Listener); } -Reference< XNameAccess > SAL_CALL ODatabaseDocument::getFormDocuments( ) throw (RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL ODatabaseDocument::getFormDocuments( ) { DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit ); return impl_getDocumentContainer_throw( ODatabaseModelImpl::E_FORM ); } -Reference< XNameAccess > SAL_CALL ODatabaseDocument::getReportDocuments( ) throw (RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL ODatabaseDocument::getReportDocuments( ) { DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit ); return impl_getDocumentContainer_throw( ODatabaseModelImpl::E_REPORT ); @@ -1722,12 +1721,12 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r m_pImpl->storeLibraryContainersTo( _rxTargetStorage ); } -Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurationManager( ) throw (RuntimeException, std::exception) +Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurationManager( ) { return Reference< XUIConfigurationManager >( getUIConfigurationManager2(), UNO_QUERY_THROW ); } -Reference< XUIConfigurationManager2 > const & ODatabaseDocument::getUIConfigurationManager2( ) throw (RuntimeException) +Reference< XUIConfigurationManager2 > const & ODatabaseDocument::getUIConfigurationManager2( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -1762,7 +1761,7 @@ Reference< XUIConfigurationManager2 > const & ODatabaseDocument::getUIConfigurat return m_xUIConfigurationManager; } -Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (RuntimeException, std::exception) +Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -1770,7 +1769,7 @@ Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const O return xStorageAccess->getDocumentSubStorage( aStorageName, nMode ); } -Sequence< OUString > SAL_CALL ODatabaseDocument::getDocumentSubStoragesNames( ) throw (css::io::IOException, RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODatabaseDocument::getDocumentSubStoragesNames( ) { Reference< XDocumentSubStorageSupplier > xStorageAccess( m_pImpl->getDocumentSubStorageSupplier() ); return xStorageAccess->getDocumentSubStoragesNames(); @@ -1867,38 +1866,38 @@ void ODatabaseDocument::disposing() } // XComponent -void SAL_CALL ODatabaseDocument::dispose( ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::dispose( ) { ::cppu::WeakComponentImplHelperBase::dispose(); } -void SAL_CALL ODatabaseDocument::addEventListener( const Reference< lang::XEventListener >& _xListener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::addEventListener( const Reference< lang::XEventListener >& _xListener ) { ::cppu::WeakComponentImplHelperBase::addEventListener( _xListener ); } -void SAL_CALL ODatabaseDocument::removeEventListener( const Reference< lang::XEventListener >& _xListener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::removeEventListener( const Reference< lang::XEventListener >& _xListener ) { ::cppu::WeakComponentImplHelperBase::removeEventListener( _xListener ); } // XServiceInfo -OUString ODatabaseDocument::getImplementationName() throw(RuntimeException, std::exception) +OUString ODatabaseDocument::getImplementationName() { return OUString("com.sun.star.comp.dba.ODatabaseDocument"); } -Sequence< OUString > ODatabaseDocument::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > ODatabaseDocument::getSupportedServiceNames() { return { "com.sun.star.sdb.OfficeDatabaseDocument", "com.sun.star.document.OfficeDocument" }; } -sal_Bool ODatabaseDocument::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool ODatabaseDocument::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Reference< XDataSource > SAL_CALL ODatabaseDocument::getDataSource() throw (RuntimeException, std::exception) +Reference< XDataSource > SAL_CALL ODatabaseDocument::getDataSource() { DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); return m_pImpl->getOrCreateDataSource(); @@ -1916,7 +1915,7 @@ comphelper::PropertyMapEntry const aEmbeddedImportInfoMap[] = }; } -void SAL_CALL ODatabaseDocument::loadFromStorage(const Reference<XStorage>& xStorage, const Sequence<PropertyValue>& rMediaDescriptor) throw (IllegalArgumentException, DoubleInitializationException, IOException, Exception, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::loadFromStorage(const Reference<XStorage>& xStorage, const Sequence<PropertyValue>& rMediaDescriptor) { DocumentGuard aGuard(*this, DocumentGuard::InitMethod); @@ -1945,13 +1944,13 @@ void SAL_CALL ODatabaseDocument::loadFromStorage(const Reference<XStorage>& xSto impl_setModified_nothrow(false, aGuard); } -void SAL_CALL ODatabaseDocument::storeToStorage( const Reference< XStorage >& _rxStorage, const Sequence< PropertyValue >& _rMediaDescriptor ) throw (IllegalArgumentException, IOException, Exception, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::storeToStorage( const Reference< XStorage >& _rxStorage, const Sequence< PropertyValue >& _rMediaDescriptor ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); impl_storeToStorage_throw( _rxStorage, _rMediaDescriptor, aGuard ); } -void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _rxNewRootStorage ) throw (IllegalArgumentException, IOException, Exception, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _rxNewRootStorage ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -1961,49 +1960,49 @@ void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _ impl_notifyStorageChange_nolck_nothrow( xNewRootStorage ); } -Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentStorage( ) throw (IOException, Exception, RuntimeException, std::exception) +Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentStorage( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); return m_pImpl->getOrCreateRootStorage(); } -void SAL_CALL ODatabaseDocument::addStorageChangeListener( const Reference< XStorageChangeListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::addStorageChangeListener( const Reference< XStorageChangeListener >& Listener ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); m_aStorageListeners.addInterface( Listener ); } -void SAL_CALL ODatabaseDocument::removeStorageChangeListener( const Reference< XStorageChangeListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::removeStorageChangeListener( const Reference< XStorageChangeListener >& Listener ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); m_aStorageListeners.addInterface( Listener ); } -Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getBasicLibraries() throw (RuntimeException, std::exception) +Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getBasicLibraries() { DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit ); return m_pImpl->getLibraryContainer( true ); } -Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getDialogLibraries() throw (RuntimeException, std::exception) +Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getDialogLibraries() { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); return m_pImpl->getLibraryContainer( false ); } -sal_Bool SAL_CALL ODatabaseDocument::getAllowMacroExecution() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseDocument::getAllowMacroExecution() { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); return m_pImpl->adjustMacroMode_AutoReject(); } -Reference< XEmbeddedScripts > SAL_CALL ODatabaseDocument::getScriptContainer() throw (RuntimeException, std::exception) +Reference< XEmbeddedScripts > SAL_CALL ODatabaseDocument::getScriptContainer() { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); return this; } -Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProvider( ) throw (RuntimeException, std::exception) +Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProvider( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -2024,7 +2023,7 @@ Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProv return xScriptProvider; } -Reference< XNameReplace > SAL_CALL ODatabaseDocument::getEvents( ) throw (RuntimeException, std::exception) +Reference< XNameReplace > SAL_CALL ODatabaseDocument::getEvents( ) { DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit ); return m_pEventContainer; @@ -2044,7 +2043,7 @@ struct CreateAny : public ::std::unary_function< Reference<XController>, Any> }; // XModel2 -Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers( ) throw (RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); uno::Sequence< Any> aController( m_aControllers.size() ); @@ -2052,18 +2051,18 @@ Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers( ) throw ( return new ::comphelper::OAnyEnumeration(aController); } -Sequence< OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames( ) { Sequence< OUString > aNames { SERVICE_SDB_APPLICATIONCONTROLLER }; return aNames; } -Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& Frame ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception) +Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& Frame ) { return createViewController( "Default", Sequence< PropertyValue >(), Frame); } -Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const OUString& ViewName, const Sequence< PropertyValue >& Arguments, const Reference< XFrame >& Frame ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception) +Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const OUString& ViewName, const Sequence< PropertyValue >& Arguments, const Reference< XFrame >& Frame ) { if ( ViewName != "Default" && ViewName != "Preview" ) throw IllegalArgumentException( OUString(), *this, 1 ); @@ -2137,7 +2136,6 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel // css.frame.XTitle OUString SAL_CALL ODatabaseDocument::getTitle() - throw (uno::RuntimeException, std::exception) { // SYNCHRONIZED -> DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit ); @@ -2146,7 +2144,6 @@ OUString SAL_CALL ODatabaseDocument::getTitle() // css.frame.XTitle void SAL_CALL ODatabaseDocument::setTitle( const OUString& sTitle ) - throw (uno::RuntimeException, std::exception) { // SYNCHRONIZED -> DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -2157,7 +2154,6 @@ void SAL_CALL ODatabaseDocument::setTitle( const OUString& sTitle ) // css.frame.XTitleChangeBroadcaster void SAL_CALL ODatabaseDocument::addTitleChangeListener( const uno::Reference< frame::XTitleChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { // SYNCHRONIZED -> DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -2168,7 +2164,6 @@ void SAL_CALL ODatabaseDocument::addTitleChangeListener( const uno::Reference< f // css.frame.XTitleChangeBroadcaster void SAL_CALL ODatabaseDocument::removeTitleChangeListener( const uno::Reference< frame::XTitleChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { // SYNCHRONIZED -> DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -2179,8 +2174,6 @@ void SAL_CALL ODatabaseDocument::removeTitleChangeListener( const uno::Reference // css.frame.XUntitledNumbers ::sal_Int32 SAL_CALL ODatabaseDocument::leaseNumber( const uno::Reference< uno::XInterface >& xComponent ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); return impl_getUntitledHelper_throw(xComponent)->leaseNumber (xComponent); @@ -2188,8 +2181,6 @@ void SAL_CALL ODatabaseDocument::removeTitleChangeListener( const uno::Reference // css.frame.XUntitledNumbers void SAL_CALL ODatabaseDocument::releaseNumber( ::sal_Int32 nNumber ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); impl_getUntitledHelper_throw()->releaseNumber (nNumber); @@ -2197,15 +2188,13 @@ void SAL_CALL ODatabaseDocument::releaseNumber( ::sal_Int32 nNumber ) // css.frame.XUntitledNumbers void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference< uno::XInterface >& xComponent ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); impl_getUntitledHelper_throw(xComponent)->releaseNumberForComponent (xComponent); } // css.frame.XUntitledNumbers -OUString SAL_CALL ODatabaseDocument::getUntitledPrefix() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ODatabaseDocument::getUntitledPrefix() { return OUString(); } diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 1fd7d3c60765..80bd42913c61 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -218,10 +218,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe const ::comphelper::NamedValueCollection& _rArguments, const StoreType _eType, DocumentGuard& _rGuard - ) - throw (css::io::IOException, - css::uno::RuntimeException, - std::exception); + ); /** notifies our storage change listeners that our underlying storage changed @@ -293,138 +290,138 @@ public: } // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) override; virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XModel - virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getURL( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL lockControllers( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL unlockControllers( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw (css::uno::RuntimeException, std::exception) override ; + virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override ; + virtual OUString SAL_CALL getURL( ) override ; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs( ) override ; + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& Controller ) override ; + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& Controller ) override ; + virtual void SAL_CALL lockControllers( ) override ; + virtual void SAL_CALL unlockControllers( ) override ; + virtual sal_Bool SAL_CALL hasControllersLocked( ) override ; + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController( ) override ; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) override ; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) override ; // XModel2 - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController( const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController( const OUString& ViewName, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers( ) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames( ) override ; + virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController( const css::uno::Reference< css::frame::XFrame >& Frame ) override ; + virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController( const OUString& ViewName, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XFrame >& Frame ) override ; // XStorable - virtual sal_Bool SAL_CALL hasLocation( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL isReadonly( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL store( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL storeAsURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL storeToURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override ; + virtual sal_Bool SAL_CALL hasLocation( ) override ; + virtual OUString SAL_CALL getLocation( ) override ; + virtual sal_Bool SAL_CALL isReadonly( ) override ; + virtual void SAL_CALL store( ) override ; + virtual void SAL_CALL storeAsURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override ; + virtual void SAL_CALL storeToURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override ; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // css::util::XModifiable - virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override ; + virtual sal_Bool SAL_CALL isModified( ) override ; + virtual void SAL_CALL setModified( sal_Bool bModified ) override ; // XEventBroadcaster - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) override; // XDocumentEventBroadcaster - virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) override; + virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) override; + virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) override; // XPrintable - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& aPrinter ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter( ) override ; + virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& aPrinter ) override ; + virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override ; // XFormDocumentsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFormDocuments( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFormDocuments( ) override; // XReportDocumentsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReportDocuments( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReportDocuments( ) override; // XCloseable - virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override; + virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override; + virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override; // XUIConfigurationManagerSupplier - virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) override; // XDocumentSubStorageSupplier - virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) override; // XOfficeDatabaseDocument - virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() override; // XStorageBasedDocument - virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage( ) throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) override; + virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) override; + virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage( ) override; + virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override; + virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override; // XEmbeddedScripts - virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() override; + virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() override; + virtual sal_Bool SAL_CALL getAllowMacroExecution() override; // XScriptInvocationContext - virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() override; // XScriptProviderSupplier - virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider( ) override; // XEventsSupplier - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; // XLoadable - virtual void SAL_CALL initNew( ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initNew( ) override; + virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; // css.document.XDocumentRecovery - virtual sal_Bool SAL_CALL wasModifiedSinceLastSave() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, css::lang::WrappedTargetException, std::exception ) override; - virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, css::lang::WrappedTargetException, std::exception ) override; + virtual sal_Bool SAL_CALL wasModifiedSinceLastSave() override; + virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) override; + virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) override; // XTitle - virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle( ) override; + virtual void SAL_CALL setTitle( const OUString& sTitle ) override; // XTitleChangeBroadcaster - virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override; + virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override; // XUntitledNumbers - virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUntitledPrefix( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) override; + virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) override; + virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) override; + virtual OUString SAL_CALL getUntitledPrefix( ) override; /** clears the given object container @@ -469,7 +466,7 @@ public: private: /// @throws css::uno::RuntimeException - css::uno::Reference< css::ui::XUIConfigurationManager2 > const & getUIConfigurationManager2() throw (css::uno::RuntimeException); + css::uno::Reference< css::ui::XUIConfigurationManager2 > const & getUIConfigurationManager2(); /** returns whether the model is currently being initialized */ diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 85f656b1a28f..2841f6b6b0a8 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -73,15 +73,15 @@ namespace dbaccess virtual ~DatabaseRegistrations() override; public: - virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getRegistrationNames() throw (RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override; - virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) override; - virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) override; - virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override; - virtual void SAL_CALL addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) override; + virtual Sequence< OUString > SAL_CALL getRegistrationNames() override; + virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) override; + virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) override; + virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) override; + virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) override; + virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) override; + virtual void SAL_CALL addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) override; + virtual void SAL_CALL removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) override; private: void @@ -236,14 +236,14 @@ namespace dbaccess throw IllegalArgumentException( OUString(), *this, 2 ); } - sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception) + sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& Name ) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( Name ); return aNodeForName.isValid(); } - Sequence< OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_aConfigurationRoot.isValid() ) @@ -265,7 +265,7 @@ namespace dbaccess return aDisplayNames; } - OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) + OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& Name ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -278,7 +278,7 @@ namespace dbaccess return sLocation; } - void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) + void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& Name, const OUString& Location ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -296,7 +296,7 @@ namespace dbaccess m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent ); } - void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) + void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& Name ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -321,7 +321,7 @@ namespace dbaccess m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent ); } - void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) + void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -346,20 +346,20 @@ namespace dbaccess m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::changedDatabaseLocation, aEvent ); } - sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) + sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& Name ) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw_must_exist(Name); return aDataSourceRegistration.isReadonly(); } - void SAL_CALL DatabaseRegistrations::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) + void SAL_CALL DatabaseRegistrations::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) { if ( Listener.is() ) m_aRegistrationListeners.addInterface( Listener ); } - void SAL_CALL DatabaseRegistrations::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) + void SAL_CALL DatabaseRegistrations::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) { if ( Listener.is() ) m_aRegistrationListeners.removeInterface( Listener ); diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 6d6771c2be88..76bf0882b269 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -123,9 +123,9 @@ protected: protected: // XFlushListener - virtual void SAL_CALL flushed( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flushed( const css::lang::EventObject& rEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener ) @@ -159,7 +159,7 @@ void SAL_CALL FlushNotificationAdapter::impl_dispose() m_aBroadcaster.clear(); } -void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent ) { Reference< XFlushListener > xListener( m_aListener ); if ( xListener.is() ) @@ -168,7 +168,7 @@ void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent ) thr impl_dispose(); } -void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) +void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) { Reference< XFlushListener > xListener( m_aListener ); if ( xListener.is() ) @@ -183,61 +183,61 @@ OAuthenticationContinuation::OAuthenticationContinuation() { } -sal_Bool SAL_CALL OAuthenticationContinuation::canSetRealm( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OAuthenticationContinuation::canSetRealm( ) { return false; } -void SAL_CALL OAuthenticationContinuation::setRealm( const OUString& /*Realm*/ ) throw(RuntimeException, std::exception) +void SAL_CALL OAuthenticationContinuation::setRealm( const OUString& /*Realm*/ ) { SAL_WARN("dbaccess","OAuthenticationContinuation::setRealm: not supported!"); } -sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName( ) { // we always allow this, even if the database document is read-only. In this case, // it's simply that the user cannot store the new user name. return m_bCanSetUserName; } -void SAL_CALL OAuthenticationContinuation::setUserName( const OUString& _rUser ) throw(RuntimeException, std::exception) +void SAL_CALL OAuthenticationContinuation::setUserName( const OUString& _rUser ) { m_sUser = _rUser; } -sal_Bool SAL_CALL OAuthenticationContinuation::canSetPassword( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OAuthenticationContinuation::canSetPassword( ) { return true; } -void SAL_CALL OAuthenticationContinuation::setPassword( const OUString& _rPassword ) throw(RuntimeException, std::exception) +void SAL_CALL OAuthenticationContinuation::setPassword( const OUString& _rPassword ) { m_sPassword = _rPassword; } -Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberPasswordModes( RememberAuthentication& _reDefault ) throw(RuntimeException, std::exception) +Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberPasswordModes( RememberAuthentication& _reDefault ) { Sequence< RememberAuthentication > aReturn(1); _reDefault = aReturn[0] = RememberAuthentication_SESSION; return aReturn; } -void SAL_CALL OAuthenticationContinuation::setRememberPassword( RememberAuthentication _eRemember ) throw(RuntimeException, std::exception) +void SAL_CALL OAuthenticationContinuation::setRememberPassword( RememberAuthentication _eRemember ) { m_bRemberPassword = (RememberAuthentication_NO != _eRemember); } -sal_Bool SAL_CALL OAuthenticationContinuation::canSetAccount( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OAuthenticationContinuation::canSetAccount( ) { return false; } -void SAL_CALL OAuthenticationContinuation::setAccount( const OUString& ) throw(RuntimeException, std::exception) +void SAL_CALL OAuthenticationContinuation::setAccount( const OUString& ) { SAL_WARN("dbaccess","OAuthenticationContinuation::setAccount: not supported!"); } -Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberAccountModes( RememberAuthentication& _reDefault ) throw(RuntimeException, std::exception) +Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberAccountModes( RememberAuthentication& _reDefault ) { Sequence < RememberAuthentication > aReturn(1); aReturn[0] = RememberAuthentication_NO; @@ -245,7 +245,7 @@ Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getReme return aReturn; } -void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication /*Remember*/ ) throw(RuntimeException, std::exception) +void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication /*Remember*/ ) { SAL_WARN("dbaccess","OAuthenticationContinuation::setRememberAccount: not supported!"); } @@ -300,7 +300,7 @@ protected: public: explicit OSharedConnectionManager(const Reference< XComponentContext >& _rxContext); - void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) override; Reference<XConnection> getConnection( const OUString& url, const OUString& user, const OUString& password, @@ -318,7 +318,7 @@ OSharedConnectionManager::~OSharedConnectionManager() { } -void SAL_CALL OSharedConnectionManager::disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception) +void SAL_CALL OSharedConnectionManager::disposing( const css::lang::EventObject& Source ) { MutexGuard aGuard(m_aMutex); Reference<XConnection> xConnection(Source.Source,UNO_QUERY); @@ -499,7 +499,7 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume } // css::lang::XTypeProvider -Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > ODatabaseSource::getTypes() { OTypeCollection aPropertyHelperTypes( cppu::UnoType<XFastPropertySet>::get(), cppu::UnoType<XPropertySet>::get(), @@ -511,13 +511,13 @@ Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException, std::excep ); } -Sequence< sal_Int8 > ODatabaseSource::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > ODatabaseSource::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // css::uno::XInterface -Any ODatabaseSource::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any ODatabaseSource::queryInterface( const Type & rType ) { Any aIface = ODatabaseSource_Base::queryInterface( rType ); if ( !aIface.hasValue() ) @@ -535,24 +535,24 @@ void ODatabaseSource::release() throw () ODatabaseSource_Base::release(); } -void SAL_CALL ODatabaseSource::disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception) +void SAL_CALL ODatabaseSource::disposing( const css::lang::EventObject& Source ) { if ( m_pImpl.is() ) m_pImpl->disposing(Source); } // XServiceInfo -OUString ODatabaseSource::getImplementationName( ) throw(RuntimeException, std::exception) +OUString ODatabaseSource::getImplementationName( ) { return OUString("com.sun.star.comp.dba.ODatabaseSource"); } -Sequence< OUString > ODatabaseSource::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > ODatabaseSource::getSupportedServiceNames( ) { return { SERVICE_SDB_DATASOURCE, "com.sun.star.sdb.DocumentDataSource" }; } -sal_Bool ODatabaseSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool ODatabaseSource::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -690,7 +690,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString } // OPropertySetHelper -Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (RuntimeException, std::exception) +Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ) ; } @@ -721,7 +721,7 @@ Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (Runt return *getArrayHelper(); } -sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException, RuntimeException, std::exception ) +sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) { bool bModified(false); if ( m_pImpl.is() ) @@ -864,7 +864,7 @@ namespace } } -void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) +void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { if ( m_pImpl.is() ) { @@ -995,40 +995,40 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con } // XDataSource -void ODatabaseSource::setLoginTimeout(sal_Int32 seconds) throw( SQLException, RuntimeException, std::exception ) +void ODatabaseSource::setLoginTimeout(sal_Int32 seconds) { ModelMethodGuard aGuard( *this ); m_pImpl->m_nLoginTimeout = seconds; } -sal_Int32 ODatabaseSource::getLoginTimeout() throw( SQLException, RuntimeException, std::exception ) +sal_Int32 ODatabaseSource::getLoginTimeout() { ModelMethodGuard aGuard( *this ); return m_pImpl->m_nLoginTimeout; } // XCompletedConnection -Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) { return connectWithCompletion(_rxHandler,false); } -Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password) throw( SQLException, RuntimeException, std::exception ) +Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password) { return getConnection(user,password,false); } -Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const OUString& user, const OUString& password ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const OUString& user, const OUString& password ) { return getConnection(user,password,true); } -Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) { return connectWithCompletion(_rxHandler,true); } -Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated ) { ModelMethodGuard aGuard( *this ); @@ -1128,7 +1128,7 @@ Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const OUString return xConn; } -Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password,bool _bIsolated) throw( SQLException, RuntimeException, std::exception ) +Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password,bool _bIsolated) { ModelMethodGuard aGuard( *this ); @@ -1159,13 +1159,13 @@ Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, co return xConn; } -Reference< XNameAccess > SAL_CALL ODatabaseSource::getBookmarks( ) throw (RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL ODatabaseSource::getBookmarks( ) { ModelMethodGuard aGuard( *this ); return static_cast< XNameContainer* >(m_xBookmarks.get()); } -Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) { ModelMethodGuard aGuard( *this ); @@ -1196,7 +1196,7 @@ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw( } // XTablesSupplier -Reference< XNameAccess > ODatabaseSource::getTables() throw( RuntimeException, std::exception ) +Reference< XNameAccess > ODatabaseSource::getTables() { ModelMethodGuard aGuard( *this ); @@ -1210,7 +1210,7 @@ Reference< XNameAccess > ODatabaseSource::getTables() throw( RuntimeException, return xContainer; } -void SAL_CALL ODatabaseSource::flush( ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseSource::flush( ) { try { @@ -1238,7 +1238,7 @@ void SAL_CALL ODatabaseSource::flush( ) throw (RuntimeException, std::exception } } -void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) { ModelMethodGuard aGuard( *this ); @@ -1270,31 +1270,31 @@ void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (R m_pImpl->setModified( bWasModified ); } -void SAL_CALL ODatabaseSource::addFlushListener( const Reference< css::util::XFlushListener >& _xListener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseSource::addFlushListener( const Reference< css::util::XFlushListener >& _xListener ) { m_aFlushListeners.addInterface(_xListener); } -void SAL_CALL ODatabaseSource::removeFlushListener( const Reference< css::util::XFlushListener >& _xListener ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseSource::removeFlushListener( const Reference< css::util::XFlushListener >& _xListener ) { m_aFlushListeners.removeInterface(_xListener); } -void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ ) { ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) m_pImpl->setModified(true); } -void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ ) { ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) m_pImpl->setModified(true); } -void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ ) { ModelMethodGuard aGuard( *this ); if ( m_pImpl.is() ) @@ -1302,7 +1302,7 @@ void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ } // XDocumentDataSource -Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument() throw (RuntimeException, std::exception) +Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument() { ModelMethodGuard aGuard( *this ); diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index 1ea921cfaa0f..8fa26c50cce1 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -109,33 +109,33 @@ public: ); // XContainerListener - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override; // css::sdbcx::XTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override; // css::lang::XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::uno::XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw( ) override; virtual void SAL_CALL release() throw( ) override; // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -147,43 +147,41 @@ public: css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue - ) - throw (css::uno::Exception, std::exception) override; + ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; // css::sdb::XCompletedConnection - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) override; // css::sdbc::XDataSource - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password ) override; + virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) override; + virtual sal_Int32 SAL_CALL getLoginTimeout( ) override; //::css::sdb::XBookmarksSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks( ) override; //::css::sdb::XQueryDefinitionsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueryDefinitions( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueryDefinitions( ) override; // css::sdbc::XIsolatedConnection - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getIsolatedConnection( const OUString& user, const OUString& password ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getIsolatedConnection( const OUString& user, const OUString& password ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) override; // XFlushable - virtual void SAL_CALL flush( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush( ) override; + virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override; + virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override; // XFlushListener - virtual void SAL_CALL flushed( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flushed( const css::lang::EventObject& rEvent ) override; // XDocumentDataSource - virtual css::uno::Reference< css::sdb::XOfficeDatabaseDocument > SAL_CALL getDatabaseDocument() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdb::XOfficeDatabaseDocument > SAL_CALL getDatabaseDocument() override; protected: // ModelDependentComponent overridables @@ -204,10 +202,10 @@ private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated) throw(css::sdbc::SQLException, css::uno::RuntimeException); + css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated); protected: using ::cppu::OPropertySetHelper::getFastPropertyValue; diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 6ad51b775129..69d3e3b82b97 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -147,18 +147,17 @@ IMPLEMENT_FORWARD_XINTERFACE2( ODefinitionContainer,OContentHelper,ODefinitionCo IMPLEMENT_GETTYPES2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base); css::uno::Sequence<sal_Int8> ODefinitionContainer::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -OUString SAL_CALL ODefinitionContainer::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODefinitionContainer::getImplementationName( ) { return OUString("com.sun.star.sdb.ODefinitionContainer"); } -Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames( ) { Sequence< OUString > aReturn(2); aReturn.getArray()[0] = "com.sun.star.sdb.DefinitionContainer"; @@ -167,7 +166,7 @@ Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames( ) } // XNameContainer -void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const Any& aElement ) { ResettableMutexGuard aGuard(m_aMutex); @@ -180,7 +179,7 @@ void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const notifyByName( aGuard, _rName, xNewElement, nullptr, E_INSERTED, ContainerListemers ); } -void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) { ResettableMutexGuard aGuard(m_aMutex); @@ -204,7 +203,7 @@ void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw } // XNameReplace -void SAL_CALL ODefinitionContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::replaceByName( const OUString& _rName, const Any& aElement ) { ResettableMutexGuard aGuard(m_aMutex); @@ -325,57 +324,57 @@ void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const OU _rGuard.reset(); } -void SAL_CALL ODefinitionContainer::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::addContainerListener( const Reference< XContainerListener >& _rxListener ) { if (_rxListener.is()) m_aContainerListeners.addInterface(_rxListener); } -void SAL_CALL ODefinitionContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener ) { if (_rxListener.is()) m_aContainerListeners.removeInterface(_rxListener); } -void SAL_CALL ODefinitionContainer::addContainerApproveListener( const Reference< XContainerApproveListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::addContainerApproveListener( const Reference< XContainerApproveListener >& Listener ) { if ( Listener.is() ) m_aApproveListeners.addInterface( Listener ); } -void SAL_CALL ODefinitionContainer::removeContainerApproveListener( const Reference< XContainerApproveListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::removeContainerApproveListener( const Reference< XContainerApproveListener >& Listener ) { if ( Listener.is() ) m_aApproveListeners.removeInterface( Listener ); } // XElementAccess -Type SAL_CALL ODefinitionContainer::getElementType( ) throw (RuntimeException, std::exception) +Type SAL_CALL ODefinitionContainer::getElementType( ) { return cppu::UnoType<XContent>::get(); } -sal_Bool SAL_CALL ODefinitionContainer::hasElements( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ODefinitionContainer::hasElements( ) { MutexGuard aGuard(m_aMutex); return !m_aDocuments.empty(); } // XEnumerationAccess -Reference< XEnumeration > SAL_CALL ODefinitionContainer::createEnumeration( ) throw(RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL ODefinitionContainer::createEnumeration( ) { MutexGuard aGuard(m_aMutex); return new ::comphelper::OEnumerationByIndex(static_cast<XIndexAccess*>(this)); } // XIndexAccess -sal_Int32 SAL_CALL ODefinitionContainer::getCount( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODefinitionContainer::getCount( ) { MutexGuard aGuard(m_aMutex); return m_aDocuments.size(); } -Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) { MutexGuard aGuard(m_aMutex); @@ -395,14 +394,14 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu return makeAny(xProp); } -Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName ) { MutexGuard aGuard(m_aMutex); return makeAny( implGetByName( _rName, true ) ); } -Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, bool _bReadIfNecessary) throw (NoSuchElementException) +Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, bool _bReadIfNecessary) { Documents::iterator aMapPos = m_aDocumentMap.find(_rName); if (aMapPos == m_aDocumentMap.end()) @@ -423,7 +422,7 @@ Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName return xProp; } -Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames( ) { MutexGuard aGuard(m_aMutex); @@ -441,14 +440,14 @@ Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames( ) throw(Ru return aNames; } -sal_Bool SAL_CALL ODefinitionContainer::hasByName( const OUString& _rName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ODefinitionContainer::hasByName( const OUString& _rName ) { MutexGuard aGuard(m_aMutex); return checkExistence(_rName); } -void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) throw(RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) { MutexGuard aGuard(m_aMutex); Reference< XContent > xSource(_rSource.Source, UNO_QUERY); @@ -617,7 +616,7 @@ void ODefinitionContainer::approveNewObject(const OUString& _sName,const Referen } // XPropertyChangeListener -void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) { ClearableMutexGuard aGuard(m_aMutex); if( evt.PropertyName == PROPERTY_NAME || evt.PropertyName == "Title" ) @@ -643,7 +642,7 @@ void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& e } // XVetoableChangeListener -void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& aEvent ) throw (PropertyVetoException, RuntimeException, std::exception) +void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& aEvent ) { MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 07f4d7458e5e..c7ddcb6686ac 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -113,7 +113,6 @@ ODocumentContainer::~ODocumentContainer() IMPLEMENT_FORWARD_XINTERFACE3( ODocumentContainer,ODefinitionContainer,ODocumentContainer_Base,OPropertyStateContainer) css::uno::Sequence<sal_Int8> ODocumentContainer::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -123,7 +122,7 @@ IMPLEMENT_SERVICE_INFO_IMPLNAME(ODocumentContainer, "com.sun.star.comp.dba.ODocu IMPLEMENT_SERVICE_INFO_SUPPORTS(ODocumentContainer); IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(ODocumentContainer) -Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames( ) { Sequence< OUString > aSupported(1); aSupported[0] = m_bFormsContainer ? OUString(SERVICE_NAME_FORM_COLLECTION) : OUString(SERVICE_NAME_REPORT_COLLECTION); @@ -145,7 +144,7 @@ Reference< XContent > ODocumentContainer::createObject( const OUString& _rName) return new ODocumentDefinition( *this, m_aContext, aFind->second, m_bFormsContainer ); } -Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const OUString& aServiceSpecifier ) throw (Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const OUString& aServiceSpecifier ) { return createInstanceWithArguments( aServiceSpecifier, Sequence< Any >() ); } @@ -163,7 +162,7 @@ namespace } } -Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& _aArguments ) { Reference< XInterface > xRet; Reference< XContent > xContent; @@ -383,7 +382,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments return xRet; } -Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames( ) { Sequence< OUString > aSe(3); aSe[0] = SERVICE_SDB_DOCUMENTDEFINITION; @@ -392,7 +391,7 @@ Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames( ) t return aSe; } -Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception) +Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) { Any aRet; if ( aCommand.Name == "open" ) @@ -506,7 +505,7 @@ namespace Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const OUString& _sURL , const OUString& /*TargetFrameName*/ , sal_Int32 /*SearchFlags*/ - , const Sequence< PropertyValue >& Arguments ) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) + , const Sequence< PropertyValue >& Arguments ) { ::SolarMutexGuard aSolarGuard; @@ -552,7 +551,7 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const return xComp; } -Any SAL_CALL ODocumentContainer::getByHierarchicalName( const OUString& _sName ) throw (NoSuchElementException, RuntimeException, std::exception) +Any SAL_CALL ODocumentContainer::getByHierarchicalName( const OUString& _sName ) { MutexGuard aGuard(m_aMutex); Any aContent; @@ -563,7 +562,7 @@ Any SAL_CALL ODocumentContainer::getByHierarchicalName( const OUString& _sName ) throw NoSuchElementException(_sName,*this); } -sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const OUString& _sName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const OUString& _sName ) { MutexGuard aGuard(m_aMutex); Any aContent; @@ -573,7 +572,7 @@ sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const OUString& _sN } // XHierarchicalNameContainer -void SAL_CALL ODocumentContainer::insertByHierarchicalName( const OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODocumentContainer::insertByHierarchicalName( const OUString& _sName, const Any& _aElement ) { Reference< XContent > xContent(_aElement,UNO_QUERY); if ( !xContent.is() ) @@ -598,7 +597,7 @@ void SAL_CALL ODocumentContainer::insertByHierarchicalName( const OUString& _sNa xNameContainer->insertByName(sName,_aElement); } -void SAL_CALL ODocumentContainer::removeByHierarchicalName( const OUString& _sName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODocumentContainer::removeByHierarchicalName( const OUString& _sName ) { if ( _sName.isEmpty() ) throw NoSuchElementException(_sName,*this); @@ -614,7 +613,7 @@ void SAL_CALL ODocumentContainer::removeByHierarchicalName( const OUString& _sNa } // XHierarchicalNameReplace -void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const OUString& _sName, const Any& _aElement ) { Reference< XContent > xContent(_aElement,UNO_QUERY); if ( !xContent.is() ) @@ -630,13 +629,13 @@ void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const OUString& _sN xNameContainer->replaceByName(sName,_aElement); } -OUString SAL_CALL ODocumentContainer::getHierarchicalName() throw (RuntimeException, std::exception) +OUString SAL_CALL ODocumentContainer::getHierarchicalName() { ::osl::MutexGuard aGuard( m_aMutex ); return impl_getHierarchicalName( false ); } -OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception) +OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i_rRelativeName ) { OUString aBuffer = getHierarchicalName() + "/" + i_rRelativeName; return aBuffer; @@ -662,7 +661,7 @@ void ODocumentContainer::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any _rDefault.clear(); } -void SAL_CALL ODocumentContainer::commit( ) throw (css::io::IOException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL ODocumentContainer::commit( ) { MutexGuard aGuard(m_aMutex); Documents::const_iterator aIter = m_aDocumentMap.begin(); @@ -678,7 +677,7 @@ void SAL_CALL ODocumentContainer::commit( ) throw (css::io::IOException, css::l xTrans->commit(); } -void SAL_CALL ODocumentContainer::revert( ) throw (css::io::IOException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL ODocumentContainer::revert( ) { MutexGuard aGuard(m_aMutex); Documents::const_iterator aIter = m_aDocumentMap.begin(); @@ -701,7 +700,7 @@ Reference< XStorage> ODocumentContainer::getContainerStorage() const : Reference< XStorage>(); } -void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName ) { ResettableMutexGuard aGuard(m_aMutex); @@ -727,7 +726,7 @@ void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName ) throw(N notifyByName( aGuard, _rName, nullptr, nullptr, E_REMOVED, ContainerListemers ); } -void SAL_CALL ODocumentContainer::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL ODocumentContainer::rename( const OUString& newName ) { try { diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index 27edbf3f9fa9..f1b5483d5fd3 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -60,52 +60,50 @@ public: // css::uno::XInterface DECLARE_XINTERFACE( ) - virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; // css::lang::XServiceInfo DECLARE_SERVICE_INFO(); // XComponentLoader - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL( const OUString& URL, const OUString& TargetFrameName, sal_Int32 SearchFlags, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL( const OUString& URL, const OUString& TargetFrameName, sal_Int32 SearchFlags, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // css::lang::XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) override; // XCommandProcessor - virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw (css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override ; // XHierarchicalNameAccess - virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& _sName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& _sName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& _sName ) override; + virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& _sName ) override; // XHierarchicalNameContainer - virtual void SAL_CALL insertByHierarchicalName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByHierarchicalName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByHierarchicalName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByHierarchicalName( const OUString& Name ) override; // XHierarchicalName - virtual OUString SAL_CALL getHierarchicalName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getHierarchicalName( ) override; + virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) override; // XNameContainer - virtual void SAL_CALL removeByName( const OUString& _rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName( const OUString& _rName ) override; // XHierarchicalNameReplace - virtual void SAL_CALL replaceByHierarchicalName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByHierarchicalName( const OUString& aName, const css::uno::Any& aElement ) override; // css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XTransactedObject - virtual void SAL_CALL commit( ) throw (css::io::IOException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revert( ) throw (css::io::IOException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL revert( ) override; // XRename - virtual void SAL_CALL rename( const OUString& newName ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& newName ) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index a0cdc67e12bd..8818e685be2c 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -182,9 +182,9 @@ namespace dbaccess osl_atomic_decrement( &m_refCount ); } - virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override; + virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) override; }; void SAL_CALL OEmbedObjectHolder::disposing() @@ -195,11 +195,11 @@ namespace dbaccess m_pDefinition = nullptr; } - void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) + void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) { } - void SAL_CALL OEmbedObjectHolder::stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) + void SAL_CALL OEmbedObjectHolder::stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) { if ( !m_bInStateChange && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition ) { @@ -214,7 +214,7 @@ namespace dbaccess } } - void SAL_CALL OEmbedObjectHolder::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) + void SAL_CALL OEmbedObjectHolder::disposing( const lang::EventObject& /*Source*/ ) { m_xBroadCaster = nullptr; } @@ -228,17 +228,17 @@ namespace dbaccess public: explicit OEmbeddedClientHelper(ODocumentDefinition* _pClient) :m_pClient(_pClient) {} - virtual void SAL_CALL saveObject( ) throw (ObjectSaveVetoException, Exception, RuntimeException, std::exception) override + virtual void SAL_CALL saveObject( ) override { } // XComponentSupplier - virtual Reference< util::XCloseable > SAL_CALL getComponent( ) throw (RuntimeException, std::exception) override + virtual Reference< util::XCloseable > SAL_CALL getComponent( ) override { return Reference< css::util::XCloseable >(); } // XEmbeddedClient - virtual void SAL_CALL visibilityChanged( sal_Bool /*bVisible*/ ) throw (WrongStateException, RuntimeException, std::exception) override + virtual void SAL_CALL visibilityChanged( sal_Bool /*bVisible*/ ) override { } inline void resetClient() { m_pClient = nullptr; } @@ -314,11 +314,11 @@ namespace dbaccess OSL_ENSURE( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" ); } - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; protected: }; - void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) { m_xClient.clear(); } @@ -336,10 +336,10 @@ namespace dbaccess const OUString& getName() const { return m_sName; } // XInteractionDocumentSave - virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) override; }; - void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException, std::exception) + void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent) { m_sName = _sName; m_xParentContainer = _xParent; @@ -478,7 +478,6 @@ void SAL_CALL ODocumentDefinition::disposing() } css::uno::Sequence<sal_Int8> ODocumentDefinition::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -520,7 +519,7 @@ void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int3 OPropertyStateContainer::getFastPropertyValue( o_rValue, i_nHandle ); } -Reference< XPropertySetInfo > SAL_CALL ODocumentDefinition::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL ODocumentDefinition::getPropertySetInfo( ) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -954,7 +953,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons return makeAny( xModel ); } -Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception) +Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) { Any aRet; @@ -1152,7 +1151,6 @@ namespace } void ODocumentDefinition::onCommandInsert( const OUString& _sURL, const Reference< XCommandEnvironment >& Environment ) - throw( Exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1789,7 +1787,7 @@ Reference< util::XCloseable > ODocumentDefinition::impl_getComponent_throw( cons return xComp; } -Reference< util::XCloseable > ODocumentDefinition::getComponent() throw (RuntimeException, std::exception) +Reference< util::XCloseable > ODocumentDefinition::getComponent() { ::osl::MutexGuard aGuard( m_aMutex ); return impl_getComponent_throw(); @@ -1867,17 +1865,17 @@ bool ODocumentDefinition::impl_close_throw() return bSuccess; } -Reference< XComponent > SAL_CALL ODocumentDefinition::open( ) throw (WrappedTargetException, RuntimeException, std::exception) +Reference< XComponent > SAL_CALL ODocumentDefinition::open( ) { return impl_openUI_nolck_throw( false ); } -Reference< XComponent > SAL_CALL ODocumentDefinition::openDesign( ) throw (WrappedTargetException, RuntimeException, std::exception) +Reference< XComponent > SAL_CALL ODocumentDefinition::openDesign( ) { return impl_openUI_nolck_throw( true ); } -void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODocumentDefinition::store( ) { ::osl::MutexGuard aGuard( m_aMutex ); try @@ -1892,7 +1890,7 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt } } -sal_Bool SAL_CALL ODocumentDefinition::close( ) throw (WrappedTargetException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODocumentDefinition::close( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1910,13 +1908,13 @@ sal_Bool SAL_CALL ODocumentDefinition::close( ) throw (WrappedTargetException, return bSuccess; } -OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException, std::exception) +OUString SAL_CALL ODocumentDefinition::getHierarchicalName() { ::osl::MutexGuard aGuard( m_aMutex ); return impl_getHierarchicalName( false ); } -OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception) +OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName ) { OUStringBuffer aBuffer; aBuffer.append( getHierarchicalName() ); @@ -1925,7 +1923,7 @@ OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& return aBuffer.makeStringAndClear(); } -void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) { try { @@ -2077,7 +2075,7 @@ void ODocumentDefinition::updateDocumentTitle() xTitle->setTitle(sName); } -void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) +void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) { (void) Source; (void) GetsOwnership; @@ -2092,11 +2090,11 @@ void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source } } -void SAL_CALL ODocumentDefinition::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ODocumentDefinition::notifyClosing( const lang::EventObject& /*Source*/ ) { } -void SAL_CALL ODocumentDefinition::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ODocumentDefinition::disposing( const lang::EventObject& /*Source*/ ) { } diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index bef6c99c9485..8b8125535994 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -89,16 +89,14 @@ public: const css::uno::Reference< css::sdbc::XConnection >& i_rConnection ); - virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; // css::uno::XInterface DECLARE_XINTERFACE( ) // css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( @@ -107,33 +105,33 @@ public: ) const override; // XComponentSupplier - virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent( ) override; // XSubDocument - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL open( ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::lang::XComponent > SAL_CALL openDesign( ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL store( ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL close( ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL open( ) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL openDesign( ) override; + virtual void SAL_CALL store( ) override; + virtual sal_Bool SAL_CALL close( ) override; // XHierarchicalName - virtual OUString SAL_CALL getHierarchicalName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getHierarchicalName( ) override; + virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // XCommandProcessor - virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw (css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override ; // XRename - virtual void SAL_CALL rename( const OUString& newName ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& newName ) override; // XCloseListener - virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override; + virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; /** returns the forms/reports container storage, depending on m_bForm. Our own storage inside this container storage is the one with the name as indicated by m_pImpl->m_aProps.sPersistentName. @@ -320,7 +318,7 @@ private: void onCommandGetDocumentProperties( css::uno::Any& _rProps ); /// @throws css::uno::Exception - void onCommandInsert( const OUString& _sURL, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw( css::uno::Exception ); + void onCommandInsert( const OUString& _sURL, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); void onCommandPreview( css::uno::Any& _rImage ); css::uno::Any onCommandOpenSomething( diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index f9de2d7d4bca..30026d4b325b 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -138,7 +138,7 @@ namespace dbaccess { } - void SAL_CALL DocumentEventExecutor::documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception) + void SAL_CALL DocumentEventExecutor::documentEventOccured( const DocumentEvent& Event ) { Reference< XEventsSupplier > xEventsSupplier( m_pData->xDocument.get(), UNO_QUERY ); if ( !xEventsSupplier.is() ) @@ -190,7 +190,7 @@ namespace dbaccess } } - void SAL_CALL DocumentEventExecutor::disposing( const lang::EventObject& /*_Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DocumentEventExecutor::disposing( const lang::EventObject& /*_Source*/ ) { // not interested in } diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx index ee3574ec023f..f60be3bd7aba 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx @@ -49,9 +49,9 @@ namespace dbaccess virtual ~DocumentEventExecutor() override; // css.document.XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) override; // css.lang.XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: ::std::unique_ptr< DocumentEventExecutor_Data > m_pData; diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 998d75426ec6..856a36396d9d 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -143,7 +143,7 @@ namespace dbaccess return false; } - void SAL_CALL DocumentEvents::replaceByName( const OUString& Name, const Any& Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL DocumentEvents::replaceByName( const OUString& Name, const Any& Element ) { ::osl::MutexGuard aGuard( m_pData->rMutex ); @@ -176,7 +176,7 @@ namespace dbaccess elementPos->second = aEventDescriptor; } - Any SAL_CALL DocumentEvents::getByName( const OUString& Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + Any SAL_CALL DocumentEvents::getByName( const OUString& Name ) { ::osl::MutexGuard aGuard( m_pData->rMutex ); @@ -191,26 +191,26 @@ namespace dbaccess return aReturn; } - Sequence< OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL DocumentEvents::getElementNames( ) { ::osl::MutexGuard aGuard( m_pData->rMutex ); return comphelper::mapKeysToSequence( m_pData->rEventsData ); } - sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& Name ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& Name ) { ::osl::MutexGuard aGuard( m_pData->rMutex ); return m_pData->rEventsData.find( Name ) != m_pData->rEventsData.end(); } - Type SAL_CALL DocumentEvents::getElementType( ) throw (RuntimeException, std::exception) + Type SAL_CALL DocumentEvents::getElementType( ) { return ::cppu::UnoType< Sequence< PropertyValue > >::get(); } - sal_Bool SAL_CALL DocumentEvents::hasElements( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DocumentEvents::hasElements( ) { ::osl::MutexGuard aGuard( m_pData->rMutex ); return !m_pData->rEventsData.empty(); diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index 51ed81b1b406..dc2ab8ac5f85 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -56,16 +56,16 @@ namespace dbaccess virtual void SAL_CALL release() throw() override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; private: ::std::unique_ptr< DocumentEvents_Data > m_pData; diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index a768615455c0..b1f55958ffe1 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -55,7 +55,6 @@ using namespace ::cppu; // the OSL_ENSURE in CTOR has to be changed too, when adding new defines void SAL_CALL OInterceptor::dispose() - throw( RuntimeException ) { EventObject aEvt( *this ); @@ -105,7 +104,7 @@ struct DispatchHelper }; //XDispatch -void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValue >& Arguments ) throw (RuntimeException, std::exception) +void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValue >& Arguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pContentHolder ) @@ -200,9 +199,6 @@ void SAL_CALL OInterceptor::addStatusListener( const Reference< XStatusListener >& Control, const URL& URL ) - throw ( - RuntimeException, std::exception - ) { if(!Control.is()) return; @@ -279,9 +275,6 @@ void SAL_CALL OInterceptor::removeStatusListener( const Reference< XStatusListener >& Control, const URL& URL ) - throw ( - RuntimeException, std::exception - ) { if(!(Control.is() && m_pStatCL)) return; @@ -294,7 +287,7 @@ void SAL_CALL OInterceptor::removeStatusListener( //XInterceptorInfo -Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) { // now implemented as update return m_aInterceptedURL; @@ -304,7 +297,6 @@ Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( Run // XDispatchProvider Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& URL,const OUString& TargetFrameName,sal_Int32 SearchFlags ) - throw (RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); const OUString* pIter = m_aInterceptedURL.getConstArray(); @@ -321,7 +313,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& URL,cons return Reference<XDispatch>(); } -Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence<DispatchDescriptor >& Requests ) throw ( RuntimeException, std::exception ) +Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence<DispatchDescriptor >& Requests ) { Sequence< Reference< XDispatch > > aRet; osl::MutexGuard aGuard(m_aMutex); @@ -350,7 +342,7 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons //XDispatchProviderInterceptor -Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException, std::exception ) +Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) { osl::MutexGuard aGuard(m_aMutex); return m_xSlaveDispatchProvider; @@ -358,7 +350,6 @@ Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( void SAL_CALL OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider ) - throw ( RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); m_xSlaveDispatchProvider = NewDispatchProvider; @@ -366,9 +357,6 @@ OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& Ne Reference< XDispatchProvider > SAL_CALL OInterceptor::getMasterDispatchProvider( ) - throw ( - RuntimeException, std::exception - ) { osl::MutexGuard aGuard(m_aMutex); return m_xMasterDispatchProvider; @@ -377,9 +365,6 @@ Reference< XDispatchProvider > SAL_CALL OInterceptor::getMasterDispatchProvider( void SAL_CALL OInterceptor::setMasterDispatchProvider( const Reference< XDispatchProvider >& NewSupplier ) - throw ( - RuntimeException, std::exception - ) { osl::MutexGuard aGuard(m_aMutex); m_xMasterDispatchProvider = NewSupplier; diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 09abd00b694a..39ed7fc428e5 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -45,81 +45,53 @@ public: explicit OInterceptor( ODocumentDefinition* _pContentHolder ); /// @throws css::uno::RuntimeException - void SAL_CALL dispose() throw(css::uno::RuntimeException); + void SAL_CALL dispose(); //XDispatch virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& Control, - const css::util::URL& URL ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + const css::util::URL& URL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& Control, - const css::util::URL& URL ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + const css::util::URL& URL ) override; //XInterceptorInfo virtual css::uno::Sequence< OUString > - SAL_CALL getInterceptedURLs( ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + SAL_CALL getInterceptedURLs( ) override; //XDispatchProvider ( inherited by XDispatchProviderInterceptor ) virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& URL, const OUString& TargetFrameName, - sal_Int32 SearchFlags ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + sal_Int32 SearchFlags ) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) override; //XDispatchProviderInterceptor virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL - getSlaveDispatchProvider( ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + getSlaveDispatchProvider( ) override; virtual void SAL_CALL setSlaveDispatchProvider( - const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider ) override; virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL - getMasterDispatchProvider( ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + getMasterDispatchProvider( ) override; virtual void SAL_CALL setMasterDispatchProvider( - const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier ) - throw ( - css::uno::RuntimeException, std::exception - ) override; + const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier ) override; private: diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index a9ea47f3ad9e..66bbef215ef8 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -339,7 +339,6 @@ void DataSupplier::close() } void DataSupplier::validate() - throw( ResultSetException ) { } diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 948303594a54..c2e431d8c799 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -55,8 +55,7 @@ public: virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; }; } |