diff options
Diffstat (limited to 'dbaccess/source/core')
111 files changed, 2338 insertions, 2451 deletions
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index d37b285d6fe3..5bdabccf53e3 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -47,32 +47,32 @@ void OBookmarkSet::reset(const Reference< XResultSet>& _xDriverSet) construct(_xDriverSet, m_sRowSetFilter); } -Any SAL_CALL OBookmarkSet::getBookmark() throw(SQLException, RuntimeException) +Any SAL_CALL OBookmarkSet::getBookmark() { return m_xRowLocate->getBookmark(); } -bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark ) { return m_xRowLocate->moveToBookmark(bookmark); } -sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second ) { return m_xRowLocate->compareBookmarks(_first,_second); } -bool SAL_CALL OBookmarkSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) +bool SAL_CALL OBookmarkSet::hasOrderedBookmarks( ) { return m_xRowLocate->hasOrderedBookmarks(); } -sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark ) { return m_xRowLocate->hashBookmark(bookmark); } -void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) { Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY); if(!xUpdRow.is()) @@ -96,7 +96,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this ); } -void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) { Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY); if(!xUpdRow.is()) @@ -119,7 +119,7 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this ); } -void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ ) { Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY); diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index ae4449372e52..8c34c2e0156b 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -42,15 +42,15 @@ namespace dbaccess virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override; virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override; // css::sdbcx::XRowLocate - virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getBookmark() override; + virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override; + virtual bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 01a01fa9f6ff..3912b16181ce 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -85,7 +85,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData return *static_cast< ::comphelper::OPropertyArrayUsageHelper< ORowSetColumn >* >(this)->getArrayHelper(); } -void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue )throw (Exception, std::exception) +void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue ) { OSL_ENSURE( nHandle != PROPERTY_ID_VALUE, "ORowSetColumn::setFastPropertyValue_NoBroadcast: hmm? This property is marked as READONLY!" ); if ( nHandle != PROPERTY_ID_VALUE ) diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index 0218d769927a..25c4b3310705 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -42,7 +42,7 @@ namespace dbaccess virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,const css::uno::Any& rValue )throw (css::uno::Exception, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,const css::uno::Any& rValue ) override; }; } diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index 72767f2bf4eb..d36278cbbbdc 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -124,7 +124,7 @@ void SAL_CALL ORowSetDataColumn::getFastPropertyValue( Any& rValue, sal_Int32 nH ODataColumn::getFastPropertyValue( rValue, nHandle ); } -void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue )throw (Exception, std::exception) +void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue ) { switch( nHandle ) { @@ -147,7 +147,7 @@ void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHan sal_Bool SAL_CALL ORowSetDataColumn::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, - const Any& rValue ) throw (IllegalArgumentException) + const Any& rValue ) { bool bModified = false; switch( nHandle ) @@ -174,7 +174,7 @@ sal_Bool SAL_CALL ORowSetDataColumn::convertFastPropertyValue( Any & rConvertedV return bModified; } -Sequence< sal_Int8 > ORowSetDataColumn::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > ORowSetDataColumn::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -231,7 +231,7 @@ void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColu reFill(_rVector); } -void ORowSetDataColumns::impl_refresh() throw(css::uno::RuntimeException) +void ORowSetDataColumns::impl_refresh() { } diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index 76cdcf3018e8..a09bc21230fc 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -56,7 +56,7 @@ namespace dbaccess // css::lang::XTypeProvider - 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; // comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -66,9 +66,9 @@ namespace dbaccess virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue )throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue ) override; virtual void fireValueChange(const ::connectivity::ORowSetValue& _rOldValue) override; protected: @@ -81,7 +81,7 @@ namespace dbaccess ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: ORowSetDataColumns( bool _bCase, diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 723e2925a4fd..ed1a12a4e8c8 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -133,7 +133,7 @@ OCacheSet::~OCacheSet() } -void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) throw(SQLException, RuntimeException) +void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) { OSL_ENSURE(_xTable.is(),"OCacheSet::fillTableName: PropertySet is empty!"); if(m_aComposedTableName.isEmpty() && _xTable.is() ) @@ -148,7 +148,7 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) throw(SQL } } -void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) { Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -273,7 +273,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow } } -void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) { Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -317,7 +317,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR m_bUpdated = xPrep->executeUpdate() > 0; } -void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) +void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable ) { Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -396,159 +396,159 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) } } -sal_Bool SAL_CALL OCacheSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCacheSet::wasNull( ) { return m_xDriverRow->wasNull(); } -OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) { return m_xDriverRow->getString(columnIndex); } -sal_Bool SAL_CALL OCacheSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCacheSet::getBoolean( sal_Int32 columnIndex ) { return m_xDriverRow->getBoolean(columnIndex); } -sal_Int8 SAL_CALL OCacheSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OCacheSet::getByte( sal_Int32 columnIndex ) { return m_xDriverRow->getByte(columnIndex); } -sal_Int16 SAL_CALL OCacheSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OCacheSet::getShort( sal_Int32 columnIndex ) { return m_xDriverRow->getShort(columnIndex); } -sal_Int32 SAL_CALL OCacheSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCacheSet::getInt( sal_Int32 columnIndex ) { return m_xDriverRow->getInt(columnIndex); } -sal_Int64 SAL_CALL OCacheSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OCacheSet::getLong( sal_Int32 columnIndex ) { return m_xDriverRow->getLong(columnIndex); } -float SAL_CALL OCacheSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OCacheSet::getFloat( sal_Int32 columnIndex ) { return m_xDriverRow->getFloat(columnIndex); } -double SAL_CALL OCacheSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OCacheSet::getDouble( sal_Int32 columnIndex ) { return m_xDriverRow->getDouble(columnIndex); } -Sequence< sal_Int8 > SAL_CALL OCacheSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OCacheSet::getBytes( sal_Int32 columnIndex ) { return m_xDriverRow->getBytes(columnIndex); } -css::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex ) { return m_xDriverRow->getDate(columnIndex); } -css::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex ) { return m_xDriverRow->getTime(columnIndex); } -css::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex ) { return m_xDriverRow->getTimestamp(columnIndex); } -Reference< css::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex ) { return m_xDriverRow->getBinaryStream(columnIndex); } -Reference< css::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex ) { return m_xDriverRow->getCharacterStream(columnIndex); } -Any SAL_CALL OCacheSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OCacheSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) { return m_xDriverRow->getObject(columnIndex,typeMap); } -Reference< XRef > SAL_CALL OCacheSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OCacheSet::getRef( sal_Int32 columnIndex ) { return m_xDriverRow->getRef(columnIndex); } -Reference< XBlob > SAL_CALL OCacheSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OCacheSet::getBlob( sal_Int32 columnIndex ) { return m_xDriverRow->getBlob(columnIndex); } -Reference< XClob > SAL_CALL OCacheSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OCacheSet::getClob( sal_Int32 columnIndex ) { return m_xDriverRow->getClob(columnIndex); } -Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex ) { return m_xDriverRow->getArray(columnIndex); } // XResultSet -bool SAL_CALL OCacheSet::next() throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OCacheSet::next() { m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->next(); } -bool SAL_CALL OCacheSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +bool SAL_CALL OCacheSet::isBeforeFirst( ) { return m_xDriverSet->isBeforeFirst(); } -bool SAL_CALL OCacheSet::isAfterLast( ) throw(SQLException, RuntimeException) +bool SAL_CALL OCacheSet::isAfterLast( ) { return m_xDriverSet->isAfterLast(); } -void SAL_CALL OCacheSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OCacheSet::beforeFirst( ) { m_bInserted = m_bUpdated = m_bDeleted = false; m_xDriverSet->beforeFirst(); } -void SAL_CALL OCacheSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCacheSet::afterLast( ) { m_bInserted = m_bUpdated = m_bDeleted = false; m_xDriverSet->afterLast(); } -bool SAL_CALL OCacheSet::first() throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OCacheSet::first() { m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->first(); } -bool SAL_CALL OCacheSet::last() throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OCacheSet::last() { m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->last(); } -sal_Int32 SAL_CALL OCacheSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCacheSet::getRow( ) { return m_xDriverSet->getRow(); } -bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) { m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->absolute(row); } -bool SAL_CALL OCacheSet::previous( ) throw(SQLException, RuntimeException) +bool SAL_CALL OCacheSet::previous( ) { m_bInserted = m_bUpdated = m_bDeleted = false; return m_xDriverSet->previous(); @@ -569,22 +569,22 @@ bool OCacheSet::absolute_checked( sal_Int32 row,bool /*i_bFetchRow*/ ) return absolute(row); } -void SAL_CALL OCacheSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCacheSet::refreshRow( ) { m_xDriverSet->refreshRow(); } -bool SAL_CALL OCacheSet::rowUpdated( ) throw(SQLException, RuntimeException) +bool SAL_CALL OCacheSet::rowUpdated( ) { return m_xDriverSet->rowUpdated(); } -bool SAL_CALL OCacheSet::rowInserted( ) throw(SQLException, RuntimeException) +bool SAL_CALL OCacheSet::rowInserted( ) { return m_xDriverSet->rowInserted(); } -bool SAL_CALL OCacheSet::rowDeleted( ) throw(SQLException, RuntimeException) +bool SAL_CALL OCacheSet::rowDeleted( ) { return m_xDriverSet->rowDeleted(); } diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index f813114c9179..214f50986ea9 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -71,7 +71,7 @@ namespace dbaccess ,::std::vector< sal_Int32>& _rOrgValues); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable) throw(css::sdbc::SQLException, css::uno::RuntimeException); + void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable); OUString getIdentifierQuoteString() const; public: @@ -81,95 +81,95 @@ namespace dbaccess virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // css::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // css::sdbc::XResultSet /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + virtual bool SAL_CALL next(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual bool SAL_CALL isBeforeFirst( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual bool SAL_CALL isAfterLast( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual void SAL_CALL beforeFirst( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL afterLast( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + virtual bool SAL_CALL first(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + virtual bool SAL_CALL last(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getRow( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + virtual bool SAL_CALL absolute( sal_Int32 row ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual bool SAL_CALL previous( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL refreshRow( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual bool SAL_CALL rowUpdated( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual bool SAL_CALL rowInserted( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual bool SAL_CALL rowDeleted( ); // css::sdbcx::XRowLocate /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0; + virtual css::uno::Any SAL_CALL getBookmark() = 0; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0; + virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) = 0; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) = 0; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0; + virtual bool SAL_CALL hasOrderedBookmarks( ) = 0; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) = 0; // css::sdbc::XResultSetUpdate /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0; + virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) = 0; virtual bool isResultSetChanged() const; virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) = 0; diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 5b794a91955c..e0d61ef24136 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -390,7 +390,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto m_bConstructed = false; } - void OFilteredContainer::impl_refresh() throw(RuntimeException) + void OFilteredContainer::impl_refresh() { if ( m_pRefreshListener ) { diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index 482d84c6ec0a..1f9bbb46e0d4 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -47,7 +47,7 @@ namespace dbaccess ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(RuntimeException) override {} + virtual void impl_refresh() override {} virtual Reference< XPropertySet > createDescriptor() override { return nullptr; @@ -80,7 +80,7 @@ namespace dbaccess OSQLTables m_aTables; protected: virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(RuntimeException) override {} + virtual void impl_refresh() override {} virtual Reference< XPropertySet > createDescriptor() override { return nullptr; diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 18724f60c20a..1a9dcff9df76 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -413,14 +413,14 @@ void OKeySet::invalidateRow() ::comphelper::disposeComponent(m_xSet); } -Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException) +Any SAL_CALL OKeySet::getBookmark() { OSL_ENSURE(m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(), "getBookmark is only possible when we stand on a valid row!"); return makeAny(m_aKeyIter->first); } -bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) { m_bInserted = m_bUpdated = m_bDeleted = false; m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark)); @@ -428,7 +428,7 @@ bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, return m_aKeyIter != m_aKeyMap.end(); } -sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second ) { sal_Int32 nFirst = 0, nSecond = 0; _first >>= nFirst; @@ -437,18 +437,18 @@ sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _sec return (nFirst != nSecond) ? CompareBookmark::NOT_EQUAL : CompareBookmark::EQUAL; } -bool SAL_CALL OKeySet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::hasOrderedBookmarks( ) { return true; } -sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark ) { return ::comphelper::getINT32(bookmark); } -void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) { Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -617,7 +617,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO } } -void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) { Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -861,7 +861,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sa } } -void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) +void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) { Reference<XPropertySet> xSet(_xTable,UNO_QUERY); fillTableName(xSet); @@ -1003,7 +1003,7 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const return xKeyColumns; } -bool SAL_CALL OKeySet::next() throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OKeySet::next() { m_bInserted = m_bUpdated = m_bDeleted = false; @@ -1031,24 +1031,24 @@ bool SAL_CALL OKeySet::next() throw(SQLException, RuntimeException, std::excepti return !isAfterLast(); } -bool SAL_CALL OKeySet::isBeforeFirst( ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::isBeforeFirst( ) { return m_aKeyIter == m_aKeyMap.begin(); } -bool SAL_CALL OKeySet::isAfterLast( ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::isAfterLast( ) { return m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end(); } -void SAL_CALL OKeySet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OKeySet::beforeFirst( ) { m_bInserted = m_bUpdated = m_bDeleted = false; m_aKeyIter = m_aKeyMap.begin(); invalidateRow(); } -void SAL_CALL OKeySet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL OKeySet::afterLast( ) { m_bInserted = m_bUpdated = m_bDeleted = false; fillAllRows(); @@ -1056,7 +1056,7 @@ void SAL_CALL OKeySet::afterLast( ) throw(SQLException, RuntimeException) invalidateRow(); } -bool SAL_CALL OKeySet::first() throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OKeySet::first() { m_bInserted = m_bUpdated = m_bDeleted = false; m_aKeyIter = m_aKeyMap.begin(); @@ -1074,7 +1074,7 @@ bool SAL_CALL OKeySet::first() throw(SQLException, RuntimeException, std::except return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(); } -bool SAL_CALL OKeySet::last( ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::last( ) { return last_checked(true); } @@ -1093,7 +1093,7 @@ bool OKeySet::last_checked( bool /* i_bFetchRow */ ) return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(); } -sal_Int32 SAL_CALL OKeySet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OKeySet::getRow( ) { OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!"); OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!"); @@ -1101,7 +1101,7 @@ sal_Int32 SAL_CALL OKeySet::getRow( ) throw(SQLException, RuntimeException) return ::std::distance(m_aKeyMap.begin(),m_aKeyIter); } -bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::absolute( sal_Int32 row ) { return absolute_checked(row,true); } @@ -1176,12 +1176,12 @@ bool OKeySet::previous_checked( bool /* i_bFetchRow */ ) return m_aKeyIter != m_aKeyMap.begin(); } -bool SAL_CALL OKeySet::previous( ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::previous( ) { return previous_checked(true); } -bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException, std::exception) +bool OKeySet::doTryRefetch_throw() { ensureStatement( ); // we just reassign the base members @@ -1225,7 +1225,7 @@ bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException, std::e return m_xSet->next(); } -void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OKeySet::refreshRow() { invalidateRow(); @@ -1333,7 +1333,7 @@ bool OKeySet::fillAllRows() } // XRow -sal_Bool SAL_CALL OKeySet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OKeySet::wasNull( ) { if ( ! m_xRow.is() ) throwGenericSQLException("Must call getFOO() for some FOO before wasNull()", *this); @@ -1342,7 +1342,7 @@ sal_Bool SAL_CALL OKeySet::wasNull( ) throw(SQLException, RuntimeException, std return m_xRow->wasNull(); } -inline void OKeySet::ensureRowForData( ) throw(SQLException, RuntimeException) +inline void OKeySet::ensureRowForData( ) { if (! m_xRow.is() ) refreshRow(); @@ -1352,131 +1352,131 @@ inline void OKeySet::ensureRowForData( ) throw(SQLException, RuntimeException) OSL_ENSURE(m_xRow.is(),"m_xRow is null! I've called throwSQLException but execution continued?"); } -OUString SAL_CALL OKeySet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OKeySet::getString( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getString(columnIndex); } -sal_Bool SAL_CALL OKeySet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OKeySet::getBoolean( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getBoolean(columnIndex); } -sal_Int8 SAL_CALL OKeySet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OKeySet::getByte( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getByte(columnIndex); } -sal_Int16 SAL_CALL OKeySet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OKeySet::getShort( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getShort(columnIndex); } -sal_Int32 SAL_CALL OKeySet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OKeySet::getInt( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getInt(columnIndex); } -sal_Int64 SAL_CALL OKeySet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OKeySet::getLong( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getLong(columnIndex); } -float SAL_CALL OKeySet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OKeySet::getFloat( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getFloat(columnIndex); } -double SAL_CALL OKeySet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OKeySet::getDouble( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getDouble(columnIndex); } -Sequence< sal_Int8 > SAL_CALL OKeySet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OKeySet::getBytes( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getBytes(columnIndex); } -css::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getDate(columnIndex); } -css::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getTime(columnIndex); } -css::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getTimestamp(columnIndex); } -Reference< css::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getBinaryStream(columnIndex); } -Reference< css::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getCharacterStream(columnIndex); } -Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) { ensureRowForData(); return m_xRow->getObject(columnIndex,typeMap); } -Reference< XRef > SAL_CALL OKeySet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OKeySet::getRef( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getRef(columnIndex); } -Reference< XBlob > SAL_CALL OKeySet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OKeySet::getBlob( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getBlob(columnIndex); } -Reference< XClob > SAL_CALL OKeySet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OKeySet::getClob( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getClob(columnIndex); } -Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex ) { ensureRowForData(); return m_xRow->getArray(columnIndex); } -bool SAL_CALL OKeySet::rowUpdated( ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::rowUpdated( ) { return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2; } -bool SAL_CALL OKeySet::rowInserted( ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::rowInserted( ) { return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1; } -bool SAL_CALL OKeySet::rowDeleted( ) throw(SQLException, RuntimeException) +bool SAL_CALL OKeySet::rowDeleted( ) { bool bDeleted = m_bDeleted; m_bDeleted = false; diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 74a490e2a978..f8c65d78a426 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -139,7 +139,7 @@ namespace dbaccess OUStringBuffer createKeyFilter( ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool doTryRefetch_throw() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + bool doTryRefetch_throw(); void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); void executeUpdate(const ORowSetRow& _rInsertRow, const ORowSetRow& _rOriginalRow, const OUString& i_sSQL, const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>()); void executeInsert( const ORowSetRow& _rInsertRow, const OUString& i_sSQL, const OUString& i_sTableName, bool bRefetch = false); @@ -160,61 +160,61 @@ namespace dbaccess virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override; // css::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - - virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; + + + virtual bool SAL_CALL rowUpdated( ) override; + virtual bool SAL_CALL rowInserted( ) override; + virtual bool SAL_CALL rowDeleted( ) override; // css::sdbc::XResultSet - virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual bool SAL_CALL next() override; + virtual bool SAL_CALL isBeforeFirst( ) override; + virtual bool SAL_CALL isAfterLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual bool SAL_CALL first() override; + virtual bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual bool SAL_CALL absolute( sal_Int32 row ) override; + virtual bool SAL_CALL previous( ) override; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL ensureRowForData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL ensureRowForData( ); + virtual void SAL_CALL refreshRow( ) override; // css::sdbcx::XRowLocate - virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getBookmark() override; - virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override; - virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual bool SAL_CALL hasOrderedBookmarks( ) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; virtual bool previous_checked( bool i_bFetchRow ) override; diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 4deceec8f5e0..88eb6a1696d7 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -167,7 +167,7 @@ void OptimisticSet::makeNewStatement( ) ::comphelper::disposeComponent(xAnalyzer); } -void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) { if ( m_aJoinedKeyColumns.empty() ) throw SQLException(); @@ -236,7 +236,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow } } -void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) { TSQLStatements aSql; TSQLStatements aParameter; @@ -331,7 +331,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn } } -void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ ) { OUString aQuote = getIdentifierQuoteString(); TSQLStatements aKeyConditions; diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index 8d5f5e1beeea..92766fd8abe4 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -59,9 +59,9 @@ namespace dbaccess virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; // CacheSet virtual bool isResultSetChanged() const override; diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx index c1b69fb4ffdf..22adc74f138a 100644 --- a/dbaccess/source/core/api/PrivateRow.cxx +++ b/dbaccess/source/core/api/PrivateRow.cxx @@ -30,101 +30,101 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star; -sal_Bool SAL_CALL OPrivateRow::wasNull( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OPrivateRow::wasNull( ) { return m_aRow[m_nPos].isNull(); } - OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - sal_Bool SAL_CALL OPrivateRow::getBoolean( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + sal_Bool SAL_CALL OPrivateRow::getBoolean( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return bool(m_aRow[m_nPos]); } - ::sal_Int8 SAL_CALL OPrivateRow::getByte( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + ::sal_Int8 SAL_CALL OPrivateRow::getByte( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - ::sal_Int16 SAL_CALL OPrivateRow::getShort( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + ::sal_Int16 SAL_CALL OPrivateRow::getShort( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - ::sal_Int32 SAL_CALL OPrivateRow::getInt( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + ::sal_Int32 SAL_CALL OPrivateRow::getInt( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - ::sal_Int64 SAL_CALL OPrivateRow::getLong( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + ::sal_Int64 SAL_CALL OPrivateRow::getLong( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - float SAL_CALL OPrivateRow::getFloat( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + float SAL_CALL OPrivateRow::getFloat( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - double SAL_CALL OPrivateRow::getDouble( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + double SAL_CALL OPrivateRow::getDouble( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - Sequence< ::sal_Int8 > SAL_CALL OPrivateRow::getBytes( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + Sequence< ::sal_Int8 > SAL_CALL OPrivateRow::getBytes( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - css::util::Date SAL_CALL OPrivateRow::getDate( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + css::util::Date SAL_CALL OPrivateRow::getDate( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - css::util::Time SAL_CALL OPrivateRow::getTime( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + css::util::Time SAL_CALL OPrivateRow::getTime( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - css::util::DateTime SAL_CALL OPrivateRow::getTimestamp( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + css::util::DateTime SAL_CALL OPrivateRow::getTimestamp( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return m_aRow[m_nPos]; } - Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getBinaryStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getBinaryStream( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return Reference< css::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY); } - Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getCharacterStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getCharacterStream( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return Reference< css::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY); } - Any SAL_CALL OPrivateRow::getObject( ::sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& ) throw (SQLException, RuntimeException, std::exception) + Any SAL_CALL OPrivateRow::getObject( ::sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& ) { m_nPos = columnIndex; return m_aRow[m_nPos].makeAny(); } - Reference< XRef > SAL_CALL OPrivateRow::getRef( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + Reference< XRef > SAL_CALL OPrivateRow::getRef( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return Reference< XRef >(m_aRow[m_nPos].makeAny(),UNO_QUERY); } - Reference< XBlob > SAL_CALL OPrivateRow::getBlob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + Reference< XBlob > SAL_CALL OPrivateRow::getBlob( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return Reference< XBlob >(m_aRow[m_nPos].makeAny(),UNO_QUERY); } - Reference< XClob > SAL_CALL OPrivateRow::getClob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + Reference< XClob > SAL_CALL OPrivateRow::getClob( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return Reference< XClob >(m_aRow[m_nPos].makeAny(),UNO_QUERY); } - Reference< XArray > SAL_CALL OPrivateRow::getArray( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) + Reference< XArray > SAL_CALL OPrivateRow::getArray( ::sal_Int32 columnIndex ) { m_nPos = columnIndex; return Reference< XArray >(m_aRow[m_nPos].makeAny(),UNO_QUERY); diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx index 439fbe984fb8..3f8edf0bc7b9 100644 --- a/dbaccess/source/core/api/PrivateRow.hxx +++ b/dbaccess/source/core/api/PrivateRow.hxx @@ -33,26 +33,26 @@ namespace dbaccess explicit OPrivateRow(const ORowSetValueVector::Vector& i_aRow) : m_aRow(i_aRow),m_nPos(0) { } - virtual sal_Bool SAL_CALL wasNull( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getInt( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getLong( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( ::sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) override; + virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) override; + virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) override; + virtual ::sal_Int32 SAL_CALL getInt( ::sal_Int32 columnIndex ) override; + virtual ::sal_Int64 SAL_CALL getLong( ::sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( ::sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( ::sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( ::sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( ::sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( ::sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( ::sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( ::sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( ::sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( ::sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( ::sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( ::sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) override; }; } // dbaccess #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_PRIVATEROW_HXX diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 7eb40876718b..f8e26041972c 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -280,7 +280,7 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c } // typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_Prop; -void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -419,7 +419,7 @@ void SAL_CALL ORowSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } // css::XTypeProvider -Sequence< Type > SAL_CALL ORowSet::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > SAL_CALL ORowSet::getTypes() { OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), @@ -428,13 +428,13 @@ Sequence< Type > SAL_CALL ORowSet::getTypes() throw (RuntimeException, std::exce return aTypes.getTypes(); } -Sequence< sal_Int8 > SAL_CALL ORowSet::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL ORowSet::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // css::XInterface -Any SAL_CALL ORowSet::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any SAL_CALL ORowSet::queryInterface( const Type & rType ) { return ORowSet_BASE1::queryInterface( rType); } @@ -450,7 +450,7 @@ void SAL_CALL ORowSet::release() throw() } // css::XUnoTunnel -sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) { if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast<sal_Int64>(this); @@ -474,7 +474,7 @@ Sequence< sal_Int8 > ORowSet::getUnoTunnelImplementationId() } // css::XAggregation -Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) { Any aRet(ORowSetBase::queryInterface(rType)); if (!aRet.hasValue()) @@ -483,17 +483,17 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeExcepti } // css::XServiceInfo -OUString SAL_CALL ORowSet::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL ORowSet::getImplementationName() { return OUString("com.sun.star.comp.dba.ORowSet"); } -sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames() { Sequence< OUString > aSNS( 5 ); aSNS[0] = SERVICE_SDBC_RESULTSET; @@ -644,7 +644,7 @@ void ORowSet::setActiveConnection( Reference< XConnection >& _rxNewConn, bool _b } // css::XEventListener -void SAL_CALL ORowSet::disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSet::disposing( const css::lang::EventObject& Source ) { // close rowset because the connection is going to be deleted (someone told me :-) Reference<XConnection> xCon(Source.Source,UNO_QUERY); @@ -660,7 +660,7 @@ void SAL_CALL ORowSet::disposing( const css::lang::EventObject& Source ) throw(R } // XCloseable -void SAL_CALL ORowSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::close( ) { { MutexGuard aGuard( m_aMutex ); @@ -701,7 +701,7 @@ void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x) } // XRowUpdate -void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -716,67 +716,67 @@ void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, R aNotify.firePropertyChange(); } -void SAL_CALL ORowSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { updateValue(columnIndex, static_cast<bool>(x)); } -void SAL_CALL ORowSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateFloat( sal_Int32 columnIndex, float x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateDouble( sal_Int32 columnIndex, double x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateString( sal_Int32 columnIndex, const OUString& x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { updateValue(columnIndex,x); } -void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -791,7 +791,7 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc } } -void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -804,7 +804,7 @@ void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Refer aNotify.firePropertyChange(); } -void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -849,7 +849,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw } } -void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -885,7 +885,7 @@ namespace } // XResultSetUpdate -void SAL_CALL ORowSet::insertRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::insertRow() { ProtectFlag aFlagControl(m_bInsertingRow); @@ -944,7 +944,7 @@ void SAL_CALL ORowSet::insertRow() throw(SQLException, RuntimeException, std::ex fireRowcount(); } -void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::updateRow( ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); // not allowed when standing on insert row @@ -1003,7 +1003,7 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException, std:: } } -void SAL_CALL ORowSet::deleteRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::deleteRow( ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -1093,12 +1093,12 @@ void ORowSet::implCancelRowUpdates( bool _bNotifyModified ) } } -void SAL_CALL ORowSet::cancelRowUpdates( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::cancelRowUpdates( ) { implCancelRowUpdates( true ); } -void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& listener ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -1107,7 +1107,7 @@ void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& li m_aRowsetListeners.addInterface(listener); } -void SAL_CALL ORowSet::removeRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSet::removeRowSetListener( const Reference< XRowSetListener >& listener ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -1178,7 +1178,7 @@ void ORowSet::fireRowcount() } } -void SAL_CALL ORowSet::moveToInsertRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::moveToInsertRow( ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -1266,7 +1266,7 @@ void ORowSet::impl_restoreDataColumnsWriteable_throw() m_aReadOnlyDataColumns.clear(); } -void SAL_CALL ORowSet::moveToCurrentRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::moveToCurrentRow( ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -1302,7 +1302,7 @@ void SAL_CALL ORowSet::moveToCurrentRow( ) throw(SQLException, RuntimeException } // XRow -sal_Bool SAL_CALL ORowSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSet::wasNull( ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -1320,80 +1320,80 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex) return getValue(columnIndex); } -OUString SAL_CALL ORowSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ORowSet::getString( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -sal_Bool SAL_CALL ORowSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSet::getBoolean( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); // the extra cast is to recognise the "true" or "false" strings return static_cast<bool>(getInsertValue(columnIndex)); } -sal_Int8 SAL_CALL ORowSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL ORowSet::getByte( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -sal_Int16 SAL_CALL ORowSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL ORowSet::getShort( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -sal_Int32 SAL_CALL ORowSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ORowSet::getInt( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -sal_Int64 SAL_CALL ORowSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL ORowSet::getLong( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -float SAL_CALL ORowSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL ORowSet::getFloat( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -double SAL_CALL ORowSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL ORowSet::getDouble( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -css::util::Date SAL_CALL ORowSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL ORowSet::getDate( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -css::util::Time SAL_CALL ORowSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL ORowSet::getTime( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -css::util::DateTime SAL_CALL ORowSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL ORowSet::getTimestamp( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex); } -Reference< css::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); if ( m_pCache && isInsertRow() ) @@ -1405,7 +1405,7 @@ Reference< css::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32 return ORowSetBase::getBinaryStream(columnIndex); } -Reference< css::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); if(m_pCache && isInsertRow() ) @@ -1417,18 +1417,18 @@ Reference< css::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int return ORowSetBase::getCharacterStream(columnIndex); } -Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getInsertValue(columnIndex).makeAny(); } -Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 /*columnIndex*/ ) { return Reference< XRef >(); } -Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) { if ( m_pCache && isInsertRow() ) { @@ -1438,17 +1438,17 @@ Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) throw(SQLE return ORowSetBase::getBlob(columnIndex); } -Reference< XClob > SAL_CALL ORowSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL ORowSet::getClob( sal_Int32 columnIndex ) { return Reference< XClob >(getInsertValue(columnIndex).makeAny(),UNO_QUERY); } -Reference< XArray > SAL_CALL ORowSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL ORowSet::getArray( sal_Int32 /*columnIndex*/ ) { return Reference< XArray >(); } -void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) { if (!_rxHandler.is()) execute(); @@ -1504,7 +1504,7 @@ void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandl execute_NoApprove_NoNewConn(aGuard); } -Reference< XIndexAccess > SAL_CALL ORowSet::getParameters( ) throw (RuntimeException, std::exception) +Reference< XIndexAccess > SAL_CALL ORowSet::getParameters( ) { ::osl::MutexGuard aGuard( *m_pMutex ); ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -1533,7 +1533,7 @@ Reference< XIndexAccess > SAL_CALL ORowSet::getParameters( ) throw (RuntimeExce return m_pParameters.get(); } -void ORowSet::approveExecution() throw (RowSetVetoException, RuntimeException) +void ORowSet::approveExecution() { ::osl::MutexGuard aGuard( m_aColumnsMutex ); EventObject aEvt(*this); @@ -1562,7 +1562,7 @@ void ORowSet::approveExecution() throw (RowSetVetoException, RuntimeException) } // XRowSet -void SAL_CALL ORowSet::execute( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::execute( ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -2051,7 +2051,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi } // XRowSetApproveBroadcaster -void SAL_CALL ORowSet::addRowSetApproveListener( const Reference< XRowSetApproveListener >& listener ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSet::addRowSetApproveListener( const Reference< XRowSetApproveListener >& listener ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -2060,7 +2060,7 @@ void SAL_CALL ORowSet::addRowSetApproveListener( const Reference< XRowSetApprove m_aApproveListeners.addInterface(listener); } -void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& listener ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& listener ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -2070,7 +2070,7 @@ void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetAppr } // XRowsChangeBroadcaster -void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListener >& listener ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListener >& listener ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -2079,7 +2079,7 @@ void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListen m_aRowsChangeListener.addInterface(listener); } -void SAL_CALL ORowSet::removeRowsChangeListener( const Reference< XRowsChangeListener >& listener ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSet::removeRowsChangeListener( const Reference< XRowsChangeListener >& listener ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -2089,7 +2089,7 @@ void SAL_CALL ORowSet::removeRowsChangeListener( const Reference< XRowsChangeLis } // XResultSetAccess -Reference< XResultSet > SAL_CALL ORowSet::createResultSet( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ORowSet::createResultSet( ) { ::osl::MutexGuard aGuard( m_aColumnsMutex ); @@ -2104,13 +2104,13 @@ Reference< XResultSet > SAL_CALL ORowSet::createResultSet( ) throw(SQLException } // css::util::XCancellable -void SAL_CALL ORowSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSet::cancel( ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); } // css::sdbcx::XDeleteRows -Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -2200,7 +2200,7 @@ void ORowSet::notifyRowSetAndClonesRowDeleted( const Any& _rBookmark, sal_Int32 } } -Reference< XConnection > ORowSet::calcConnection(const Reference< XInteractionHandler >& _rxHandler) throw( SQLException, RuntimeException, std::exception ) +Reference< XConnection > ORowSet::calcConnection(const Reference< XInteractionHandler >& _rxHandler) { MutexGuard aGuard(m_aMutex); if (!m_xActiveConnection.is()) @@ -2502,7 +2502,7 @@ ORowSetValue& ORowSet::getParameterStorage(sal_Int32 parameterIndex) } // XParameters -void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) { ::osl::MutexGuard aGuard( m_aColumnsMutex ); @@ -2510,7 +2510,7 @@ void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ m_bParametersDirty = true; } -void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) { setNull( parameterIndex, sqlType ); } @@ -2523,67 +2523,67 @@ void ORowSet::setParameter(sal_Int32 parameterIndex, const ORowSetValue& x) m_bParametersDirty = true; } -void SAL_CALL ORowSet::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { setParameter(parameterIndex, static_cast<bool>(x)); } -void SAL_CALL ORowSet::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setByte( sal_Int32 parameterIndex, sal_Int8 x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setLong( sal_Int32 parameterIndex, sal_Int64 x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setFloat( sal_Int32 parameterIndex, float x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setDouble( sal_Int32 parameterIndex, double x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setString( sal_Int32 parameterIndex, const OUString& x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) { setParameter(parameterIndex,x); } -void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { ::osl::MutexGuard aGuard( m_aColumnsMutex ); ORowSetValue& rParamValue( getParameterStorage( parameterIndex ) ); @@ -2602,7 +2602,7 @@ void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Referenc } } -void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { ::osl::MutexGuard aGuard( m_aColumnsMutex ); ORowSetValue& rParamValue( getParameterStorage( parameterIndex ) ); @@ -2625,7 +2625,7 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer } } -void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) { if ( ::dbtools::implSetObject( this, parameterIndex, x ) ) { @@ -2637,7 +2637,7 @@ void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw } } -void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 /*scale*/ ) { ::osl::MutexGuard aGuard( m_aColumnsMutex ); ORowSetValue& rParamValue( getParameterStorage( parameterIndex ) ); @@ -2645,27 +2645,27 @@ void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x rParamValue.setTypeKind( targetSqlType ); } -void SAL_CALL ORowSet::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL ORowSet::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL ORowSet::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL ORowSet::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL ORowSet::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::clearParameters( ) { ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); @@ -2677,12 +2677,12 @@ void SAL_CALL ORowSet::clearParameters( ) throw(SQLException, RuntimeException, m_aParametersSet.clear(); } -Any SAL_CALL ORowSet::getWarnings( ) throw (SQLException, RuntimeException, std::exception) +Any SAL_CALL ORowSet::getWarnings( ) { return m_aWarnings.getWarnings(); } -void SAL_CALL ORowSet::clearWarnings( ) throw (SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::clearWarnings( ) { m_aWarnings.clearWarnings(); } @@ -2745,7 +2745,7 @@ void ORowSet::checkUpdateConditions(sal_Int32 columnIndex) ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_INDEX ), StandardSQLState::INVALID_DESCRIPTOR_INDEX, *this ); } -void SAL_CALL ORowSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSet::refreshRow( ) { ORowSetNotifier aNotifier( this ); @@ -2867,13 +2867,13 @@ ORowSetClone::~ORowSetClone() } // css::XTypeProvider -Sequence< Type > ORowSetClone::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > ORowSetClone::getTypes() { return ::comphelper::concatSequences(OSubComponent::getTypes(),ORowSetBase::getTypes()); } // css::XInterface -Any ORowSetClone::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any ORowSetClone::queryInterface( const Type & rType ) { Any aRet = ORowSetBase::queryInterface(rType); if(!aRet.hasValue()) @@ -2892,17 +2892,17 @@ void ORowSetClone::release() throw() } // XServiceInfo -OUString ORowSetClone::getImplementationName( ) throw(RuntimeException, std::exception) +OUString ORowSetClone::getImplementationName( ) { return OUString("com.sun.star.sdb.ORowSetClone"); } -sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > ORowSetClone::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > ORowSetClone::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBC_RESULTSET; @@ -2922,7 +2922,7 @@ void ORowSetClone::disposing() } // XCloseable -void ORowSetClone::close() throw( SQLException, RuntimeException, std::exception ) +void ORowSetClone::close() { { MutexGuard aGuard( m_aMutex ); @@ -2963,7 +2963,7 @@ Sequence< sal_Int8 > ORowSetClone::getUnoTunnelImplementationId() } // css::XUnoTunnel -sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId ) { if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast<sal_Int64>(this); @@ -2971,7 +2971,7 @@ sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId ) return 0; } -void SAL_CALL ORowSetClone::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void SAL_CALL ORowSetClone::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if ( nHandle == PROPERTY_ID_FETCHSIZE ) { @@ -3001,17 +3001,17 @@ bool ORowSetClone::isNew( ) return false; } -void SAL_CALL ORowSetClone::execute( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSetClone::execute( ) { throwFunctionNotSupportedSQLException( "RowSetClone::XRowSet::execute", *this ); } -void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& ) { throwFunctionNotSupportedRuntimeException( "RowSetClone::XRowSet", *this ); } -void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException, std::exception) +void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& ) { throwFunctionNotSupportedRuntimeException( "RowSetClone::XRowSet", *this ); } diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 01a85fbfd1e9..0e92d1cc3391 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -197,7 +197,7 @@ namespace dbaccess /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Reference< css::sdbc::XConnection > calcConnection(const css::uno::Reference< css::task::XInteractionHandler >& _rxHandler) throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); + css::uno::Reference< css::sdbc::XConnection > calcConnection(const css::uno::Reference< css::task::XInteractionHandler >& _rxHandler); // free clones and ParseTree. Plus, if _bComplete is <TRUE/>, *all* other associated resources void freeResources( bool _bComplete ); @@ -222,7 +222,7 @@ namespace dbaccess void impl_restoreDataColumnsWriteable_throw(); protected: - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue,sal_Int32 nHandle) const override; virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _rDefault ) const override; @@ -245,34 +245,34 @@ namespace dbaccess explicit ORowSet(const css::uno::Reference<css::uno::XComponentContext>&); // 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::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(); // css::uno::XAggregation - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) 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::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; // css::sdbc::XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -281,113 +281,113 @@ namespace dbaccess virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // css::sdbc::XResultSet - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refreshRow( ) override; // XCompletedExecution - virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) override; // XParametersSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters( ) override; // css::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // css::sdbc::XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; // css::sdbc::XRowSet - virtual void SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( ) override; + virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override; + virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override; // css::sdb::XRowSetApproveBroadcaster - virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) override; + virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) override; // css::sdb::XRowsChangeBroadcaster - virtual void SAL_CALL addRowsChangeListener( const css::uno::Reference< css::sdb::XRowsChangeListener >& listener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRowsChangeListener( const css::uno::Reference< css::sdb::XRowsChangeListener >& listener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRowsChangeListener( const css::uno::Reference< css::sdb::XRowsChangeListener >& listener ) override; + virtual void SAL_CALL removeRowsChangeListener( const css::uno::Reference< css::sdb::XRowsChangeListener >& listener ) override; // css::sdb::XResultSetAccess - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet( ) override; // css::util::XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // css::sdbcx::XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // 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; protected: /** implement the <method>execute</method>, without calling the approve listeners and without building a new @@ -400,7 +400,7 @@ namespace dbaccess @throws css::sdb::RowSetVetoException if one of the listeners vetoed @throws css::uno::RuntimeException */ - void approveExecution() throw (css::sdb::RowSetVetoException, css::uno::RuntimeException); + void approveExecution(); /// set m_xActiveConnection, fire a PropertyChangeEvent if necessary, do the event listener handling etc void setActiveConnection( css::uno::Reference< css::sdbc::XConnection >& _rxNewConn, bool _bFireEvent = true ); @@ -466,48 +466,48 @@ namespace dbaccess virtual bool isModified( ) override; virtual bool isNew( ) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override; public: ORowSetClone( const css::uno::Reference<css::uno::XComponentContext>& _rContext, ORowSet& rParent, ::osl::Mutex* _pMutex ); virtual ~ORowSetClone() 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 { return css::uno::Sequence<sal_Int8>(); } // 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; // 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(); // OComponentHelper virtual void SAL_CALL disposing() 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; // 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 { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // css::sdbc::XRowSet - virtual void SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( ) override; + virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override; + virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override; // comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 539557243bb0..0f37b643ff04 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -57,13 +57,13 @@ namespace dbaccess class OEmptyCollection : public sdbcx::OCollection { protected: - virtual void impl_refresh() throw(RuntimeException) override; + virtual void impl_refresh() override; virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override; public: OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent, true, _rMutex, ::std::vector< OUString>()){} }; -void OEmptyCollection::impl_refresh() throw(RuntimeException) +void OEmptyCollection::impl_refresh() { } @@ -115,13 +115,13 @@ ORowSetBase::~ORowSetBase() } // css::lang::XTypeProvider -Sequence< Type > ORowSetBase::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > ORowSetBase::getTypes() { return ::comphelper::concatSequences(ORowSetBase_BASE::getTypes(),OPropertyStateContainer::getTypes()); } // css::uno::XInterface -Any ORowSetBase::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any ORowSetBase::queryInterface( const Type & rType ) { Any aRet = ORowSetBase_BASE::queryInterface(rType); if(!aRet.hasValue()) @@ -182,7 +182,7 @@ void SAL_CALL ORowSetBase::disposing() } // XRow -sal_Bool SAL_CALL ORowSetBase::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::wasNull( ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -247,79 +247,79 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) return m_aEmptyValue; } -OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -sal_Bool SAL_CALL ORowSetBase::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::getBoolean( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return bool(getValue(columnIndex)); } -sal_Int8 SAL_CALL ORowSetBase::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL ORowSetBase::getByte( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -sal_Int16 SAL_CALL ORowSetBase::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL ORowSetBase::getShort( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -sal_Int32 SAL_CALL ORowSetBase::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ORowSetBase::getInt( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -sal_Int64 SAL_CALL ORowSetBase::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL ORowSetBase::getLong( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -float SAL_CALL ORowSetBase::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL ORowSetBase::getFloat( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -double SAL_CALL ORowSetBase::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL ORowSetBase::getDouble( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -css::util::Date SAL_CALL ORowSetBase::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL ORowSetBase::getDate( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -css::util::Time SAL_CALL ORowSetBase::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL ORowSetBase::getTime( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -css::util::DateTime SAL_CALL ORowSetBase::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL ORowSetBase::getTimestamp( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); return getValue(columnIndex); } -Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -353,12 +353,12 @@ Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_In return Reference< css::io::XInputStream >(); } -Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getCharacterStream( sal_Int32 columnIndex ) { return getBinaryStream(columnIndex); } -Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -366,30 +366,30 @@ Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNa return getValue(columnIndex).makeAny(); } -Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *m_pMySelf ); return nullptr; } -Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) { return Reference< XBlob >(getValue(columnIndex).makeAny(),UNO_QUERY); } -Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) { return Reference< XClob >(getValue(columnIndex).makeAny(),UNO_QUERY); } -Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *m_pMySelf ); return nullptr; } // css::sdbcx::XRowLocate -Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ORowSetBase::getBookmark( ) { SAL_INFO("dbaccess", "ORowSetBase::getBookmark() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -406,7 +406,7 @@ Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException, return m_aBookmark; } -sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) { SAL_INFO("dbaccess", "ORowSetBase::moveToBookmark(Any) Clone = " << m_bClone); OSL_ENSURE(bookmark.hasValue(),"ORowSetBase::moveToBookmark bookmark has no value!"); @@ -456,7 +456,7 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx return bRet; } -sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { SAL_INFO("dbaccess", "ORowSetBase::moveRelativeToBookmark(Any," << rows << ") Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -499,21 +499,21 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_ return bRet; } -sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& _second ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); return m_pCache->compareBookmarks(_first,_second); } -sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks( ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); return m_pCache->hasOrderedBookmarks(); } -sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -521,7 +521,7 @@ sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLExc } // XResultSetMetaDataSupplier -Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData( ) { ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -533,7 +533,7 @@ Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData( ) throw(SQLE } // XColumnLocate -sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) { ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -543,7 +543,7 @@ sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(S } // css::sdbcx::XColumnsSupplier -Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns( ) { ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -559,7 +559,7 @@ Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns( ) throw(RuntimeExcep } // XResultSet -sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::next( ) { SAL_INFO("dbaccess", "ORowSetBase::next() Clone = " << m_bClone); ::osl::ResettableMutexGuard aGuard( *m_pMutex ); @@ -619,7 +619,7 @@ sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException, st return bRet; } -sal_Bool SAL_CALL ORowSetBase::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::isBeforeFirst( ) { ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -630,7 +630,7 @@ sal_Bool SAL_CALL ORowSetBase::isBeforeFirst( ) throw(SQLException, RuntimeExce return m_bBeforeFirst; } -sal_Bool SAL_CALL ORowSetBase::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::isAfterLast( ) { ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -645,7 +645,7 @@ bool ORowSetBase::isOnFirst() return isFirst(); } -sal_Bool SAL_CALL ORowSetBase::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::isFirst( ) { SAL_INFO("dbaccess", "ORowSetBase::isFirst() Clone = " << m_bClone); @@ -671,7 +671,7 @@ bool ORowSetBase::isOnLast() return isLast(); } -sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::isLast( ) { SAL_INFO("dbaccess", "ORowSetBase::isLast() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -696,7 +696,7 @@ sal_Bool SAL_CALL ORowSetBase::isLast( ) throw(SQLException, RuntimeException, return bIsLast; } -void SAL_CALL ORowSetBase::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSetBase::beforeFirst( ) { SAL_INFO("dbaccess", "ORowSetBase::beforeFirst() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -737,7 +737,7 @@ void SAL_CALL ORowSetBase::beforeFirst( ) throw(SQLException, RuntimeException, SAL_INFO("dbaccess", "ORowSetBase::beforeFirst() Clone = " << m_bClone); } -void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSetBase::afterLast( ) { SAL_INFO("dbaccess", "ORowSetBase::afterLast() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -823,7 +823,7 @@ bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckF return bRet; } -sal_Bool SAL_CALL ORowSetBase::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::first( ) { SAL_INFO("dbaccess", "ORowSetBase::first() Clone = " << m_bClone); ::std::mem_fun_t<bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst); @@ -831,7 +831,7 @@ sal_Bool SAL_CALL ORowSetBase::first( ) throw(SQLException, RuntimeException, s return move(ioF_tmp,F_tmp); } -sal_Bool SAL_CALL ORowSetBase::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::last( ) { SAL_INFO("dbaccess", "ORowSetBase::last() Clone = " << m_bClone); ::std::mem_fun_t<bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast); @@ -839,7 +839,7 @@ sal_Bool SAL_CALL ORowSetBase::last( ) throw(SQLException, RuntimeException, st return move(ioL_tmp,L_tmp); } -sal_Int32 SAL_CALL ORowSetBase::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ORowSetBase::getRow( ) { SAL_INFO("dbaccess", "ORowSetBase::getRow() Clone = " << m_bClone); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -868,7 +868,7 @@ sal_Int32 ORowSetBase::impl_getRow() return nPos; } -sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) { SAL_INFO("dbaccess", "ORowSetBase::absolute(" << row << ") Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -913,7 +913,7 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run return bRet; } -sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) { SAL_INFO("dbaccess", "ORowSetBase::relative(" << rows << ") Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -968,7 +968,7 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru return bRet; } -sal_Bool SAL_CALL ORowSetBase::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::previous( ) { SAL_INFO("dbaccess", "ORowSetBase::previous() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -1071,18 +1071,18 @@ void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow SAL_INFO("dbaccess", "ORowSetBase::setCurrentRow() Clone = " << m_bClone); } -void ORowSetBase::checkPositioningAllowed() throw( SQLException, RuntimeException ) +void ORowSetBase::checkPositioningAllowed() { if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY) throwFunctionSequenceException(*m_pMySelf); } -Reference< XInterface > ORowSetBase::getStatement() throw( SQLException, RuntimeException, std::exception ) +Reference< XInterface > ORowSetBase::getStatement() { return nullptr; } -void SAL_CALL ORowSetBase::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSetBase::refreshRow( ) { ::connectivity::checkDisposed(m_rBHelper.bDisposed); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -1100,7 +1100,7 @@ void SAL_CALL ORowSetBase::refreshRow( ) throw(SQLException, RuntimeException, } } -sal_Bool SAL_CALL ORowSetBase::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::rowUpdated( ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -1111,7 +1111,7 @@ sal_Bool SAL_CALL ORowSetBase::rowUpdated( ) throw(SQLException, RuntimeExcepti return m_pCache->rowUpdated(); } -sal_Bool SAL_CALL ORowSetBase::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::rowInserted( ) { ::osl::MutexGuard aGuard( *m_pMutex ); @@ -1123,7 +1123,7 @@ sal_Bool SAL_CALL ORowSetBase::rowInserted( ) throw(SQLException, RuntimeExcept return m_pCache->rowInserted(); } -sal_Bool SAL_CALL ORowSetBase::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ORowSetBase::rowDeleted( ) { ::osl::MutexGuard aGuard( *m_pMutex ); checkCache(); @@ -1136,7 +1136,7 @@ bool ORowSetBase::impl_rowDeleted( ) } // XWarningsSupplier -Any SAL_CALL ORowSetBase::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ORowSetBase::getWarnings( ) { ::osl::MutexGuard aGuard( *m_pMutex ); @@ -1150,7 +1150,7 @@ Any SAL_CALL ORowSetBase::getWarnings( ) throw(SQLException, RuntimeException, return Any(); } -void SAL_CALL ORowSetBase::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ORowSetBase::clearWarnings( ) { ::osl::MutexGuard aGuard( *m_pMutex ); diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 9078c9bee44d..ca2a425c4f32 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -185,7 +185,7 @@ namespace dbaccess void setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkPositioningAllowed() throw(css::sdbc::SQLException, css::uno::RuntimeException); + void checkPositioningAllowed(); // checks if the cache is null void checkCache(); // sets the bookmark to Any() @@ -238,7 +238,7 @@ namespace dbaccess virtual void SAL_CALL disposing(); // 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 { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -250,78 +250,78 @@ namespace dbaccess virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() 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< css::uno::Type > SAL_CALL getTypes() 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; // 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::sdbc::XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // css::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // css::sdbcx::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; // css::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // css::sdbcx::XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBookmark( ) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // css::sdbc::XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // css::sdbc::XRowSet - virtual void SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override = 0; - virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override = 0; - virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override = 0; + virtual void SAL_CALL execute( ) override = 0; + virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override = 0; + virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override = 0; // is called when the rowset is going to delete this bookmark _rBookmark void onDeleteRow( const css::uno::Any& _rBookmark ); diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index f10dd6a36dcb..b580068d12b7 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -296,7 +296,6 @@ IMPLEMENT_FORWARD_XINTERFACE3(OSingleSelectQueryComposer,OSubComponent,OSingleSe IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSingleSelectQueryComposer",SERVICE_NAME_SINGLESELECTQUERYCOMPOSER) css::uno::Sequence<sal_Int8> OSingleSelectQueryComposer::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -305,7 +304,7 @@ IMPLEMENT_GETTYPES3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryC IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer) // XSingleSelectQueryAnalyzer -OUString SAL_CALL OSingleSelectQueryComposer::getQuery( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OSingleSelectQueryComposer::getQuery( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -314,7 +313,7 @@ OUString SAL_CALL OSingleSelectQueryComposer::getQuery( ) throw(RuntimeExceptio return getStatementPart(F_tmp,m_aSqlIterator); } -void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -334,7 +333,7 @@ void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) th m_aElementaryParts[ eLoopParts ].clear(); } -void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sal_Int32 _nCommandType ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sal_Int32 _nCommandType ) { OUStringBuffer sSQL; switch(_nCommandType) @@ -414,25 +413,25 @@ void OSingleSelectQueryComposer::setQuery_Impl( const OUString& command ) getTables(); } -Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredHavingClause( ) throw (RuntimeException, std::exception) +Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredHavingClause( ) { TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleHavingTree); return getStructuredCondition(F_tmp); } -Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredFilter( ) throw(RuntimeException, std::exception) +Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredFilter( ) { TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleWhereTree); return getStructuredCondition(F_tmp); } -void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (SQLException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) { ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause); setConditionByColumn(column,andCriteria,F_tmp,filterOperator); } -void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw(SQLException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) { ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetFilter); setConditionByColumn(column,andCriteria,F_tmp,filterOperator); @@ -547,7 +546,7 @@ OUString OSingleSelectQueryComposer::impl_getColumnNameOrderBy_throw(const Refer return impl_getColumnRealName_throw(column, false); } -void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) { ::osl::MutexGuard aGuard( m_aMutex ); OUString sColumnName( impl_getColumnNameOrderBy_throw(column) ); @@ -561,7 +560,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< setOrder(sOrder); } -void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< XPropertySet >& column) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< XPropertySet >& column) { ::osl::MutexGuard aGuard( m_aMutex ); OUString sColumnName( impl_getColumnRealName_throw(column, true) ); @@ -586,12 +585,12 @@ OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vec return aSql.makeStringAndClear(); } -OUString SAL_CALL OSingleSelectQueryComposer::getElementaryQuery() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL OSingleSelectQueryComposer::getElementaryQuery() { return composeStatementFromParts( m_aElementaryParts ); } -void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _rElementary ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _rElementary ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -702,28 +701,28 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const } } -void SAL_CALL OSingleSelectQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setFilter( const OUString& filter ) { setSingleAdditiveClause( Where, filter ); } -void SAL_CALL OSingleSelectQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setOrder( const OUString& order ) { setSingleAdditiveClause( Order, order ); } -void SAL_CALL OSingleSelectQueryComposer::setGroup( const OUString& group ) throw (SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setGroup( const OUString& group ) { setSingleAdditiveClause( Group, group ); } -void SAL_CALL OSingleSelectQueryComposer::setHavingClause( const OUString& filter ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setHavingClause( const OUString& filter ) { setSingleAdditiveClause( Having, filter ); } // XTablesSupplier -Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -743,7 +742,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables( ) thro } // XColumnsSupplier -Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -1228,28 +1227,28 @@ OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNod return aColumnName; } -OUString SAL_CALL OSingleSelectQueryComposer::getFilter( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OSingleSelectQueryComposer::getFilter( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); return getSQLPart(Where,m_aAdditiveIterator,false); } -OUString SAL_CALL OSingleSelectQueryComposer::getOrder( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OSingleSelectQueryComposer::getOrder( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); return getSQLPart(Order,m_aAdditiveIterator,false); } -OUString SAL_CALL OSingleSelectQueryComposer::getGroup( ) throw (RuntimeException, std::exception) +OUString SAL_CALL OSingleSelectQueryComposer::getGroup( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); return getSQLPart(Group,m_aAdditiveIterator,false); } -OUString OSingleSelectQueryComposer::getHavingClause() throw (RuntimeException, std::exception) +OUString OSingleSelectQueryComposer::getHavingClause() { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -1329,7 +1328,7 @@ OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet return sReturn; } -Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( ) throw(RuntimeException, std::exception) +Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( ) { // now set the Parameters if ( !m_aCurrentColumns[ParameterColumns] ) @@ -1397,17 +1396,17 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn return m_aCurrentColumns[_eType]; } -Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getGroupColumns( ) throw(RuntimeException, std::exception) +Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getGroupColumns( ) { return setCurrentColumns( GroupByColumns, m_aAdditiveIterator.getGroupColumns() ); } -Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns( ) throw(RuntimeException, std::exception) +Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns( ) { return setCurrentColumns( OrderColumns, m_aAdditiveIterator.getOrderColumns() ); } -OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution( ) throw (SQLException, RuntimeException, std::exception) +OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution( ) { ::osl::MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -1517,13 +1516,13 @@ namespace } } -void SAL_CALL OSingleSelectQueryComposer::setStructuredFilter( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, css::lang::IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setStructuredFilter( const Sequence< Sequence< PropertyValue > >& filter ) { OPredicateInputController aPredicateInput(m_aContext, m_xConnection, &m_aParseContext); setFilter(lcl_getCondition(filter, aPredicateInput, getColumns(), m_xMetaData->getIdentifierQuoteString())); } -void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, RuntimeException, std::exception) +void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Sequence< Sequence< PropertyValue > >& filter ) { OPredicateInputController aPredicateInput(m_aContext, m_xConnection); setHavingClause(lcl_getCondition(filter, aPredicateInput, getColumns(), m_xMetaData->getIdentifierQuoteString())); diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index e73c2bb6a7f1..5fc3a9276d32 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -44,18 +44,18 @@ void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/) } // css::sdbcx::XRowLocate -Any SAL_CALL OStaticSet::getBookmark() throw(SQLException, RuntimeException) +Any SAL_CALL OStaticSet::getBookmark() { return makeAny(getRow()); } -bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark ) { m_bInserted = m_bUpdated = m_bDeleted = false; return absolute(::comphelper::getINT32(bookmark)); } -sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second ) { sal_Int32 nFirst = 0, nSecond = 0; _first >>= nFirst; @@ -63,12 +63,12 @@ sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _ return (nFirst < nSecond) ? CompareBookmark::LESS : ((nFirst > nSecond) ? CompareBookmark::GREATER : CompareBookmark::EQUAL); } -bool SAL_CALL OStaticSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) +bool SAL_CALL OStaticSet::hasOrderedBookmarks( ) { return true; } -sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark ) { return ::comphelper::getINT32(bookmark); } @@ -108,7 +108,7 @@ void OStaticSet::fillAllRows() } // XResultSet -bool SAL_CALL OStaticSet::next() throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OStaticSet::next() { m_bInserted = m_bUpdated = m_bDeleted = false; @@ -125,30 +125,30 @@ bool SAL_CALL OStaticSet::next() throw(SQLException, RuntimeException, std::exce return !isAfterLast(); } -bool SAL_CALL OStaticSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +bool SAL_CALL OStaticSet::isBeforeFirst( ) { return m_aSetIter == m_aSet.begin(); } -bool SAL_CALL OStaticSet::isAfterLast( ) throw(SQLException, RuntimeException) +bool SAL_CALL OStaticSet::isAfterLast( ) { return m_aSetIter == m_aSet.end() && m_bEnd; } -void SAL_CALL OStaticSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OStaticSet::beforeFirst( ) { m_bInserted = m_bUpdated = m_bDeleted = false; m_aSetIter = m_aSet.begin(); } -void SAL_CALL OStaticSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStaticSet::afterLast( ) { m_bInserted = m_bUpdated = m_bDeleted = false; fillAllRows(); m_aSetIter = m_aSet.end(); } -bool SAL_CALL OStaticSet::first() throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OStaticSet::first() { m_bInserted = m_bUpdated = m_bDeleted = false; m_aSetIter = m_aSet.begin()+1; @@ -158,7 +158,7 @@ bool SAL_CALL OStaticSet::first() throw(SQLException, RuntimeException, std::exc return m_aSetIter != m_aSet.end(); } -bool SAL_CALL OStaticSet::last() throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OStaticSet::last() { m_bInserted = m_bUpdated = m_bDeleted = false; fillAllRows(); @@ -167,7 +167,7 @@ bool SAL_CALL OStaticSet::last() throw(SQLException, RuntimeException, std::exce return !isBeforeFirst() && !isAfterLast(); } -sal_Int32 SAL_CALL OStaticSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStaticSet::getRow( ) { OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!"); OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!"); @@ -177,7 +177,7 @@ sal_Int32 SAL_CALL OStaticSet::getRow( ) throw(SQLException, RuntimeException) return nPos; } -bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) { m_bInserted = m_bUpdated = m_bDeleted = false; OSL_ENSURE(row,"OStaticSet::absolute: INVALID row number!"); @@ -217,7 +217,7 @@ bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeE return m_aSetIter != m_aSet.end() && m_aSetIter != m_aSet.begin(); } -bool SAL_CALL OStaticSet::previous( ) throw(SQLException, RuntimeException) +bool SAL_CALL OStaticSet::previous( ) { m_bInserted = m_bUpdated = m_bDeleted = false; @@ -227,26 +227,26 @@ bool SAL_CALL OStaticSet::previous( ) throw(SQLException, RuntimeException) return m_aSetIter != m_aSet.begin(); } -void SAL_CALL OStaticSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OStaticSet::refreshRow( ) { } -bool SAL_CALL OStaticSet::rowUpdated( ) throw(SQLException, RuntimeException) +bool SAL_CALL OStaticSet::rowUpdated( ) { return m_bUpdated; } -bool SAL_CALL OStaticSet::rowInserted( ) throw(SQLException, RuntimeException) +bool SAL_CALL OStaticSet::rowInserted( ) { return m_bInserted; } -bool SAL_CALL OStaticSet::rowDeleted( ) throw(SQLException, RuntimeException) +bool SAL_CALL OStaticSet::rowDeleted( ) { return m_bDeleted; } -void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) +void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) { OCacheSet::insertRow( _rInsertRow,_xTable); if(m_bInserted) @@ -258,7 +258,7 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect } } -void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) +void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable ) { OCacheSet::deleteRow(_rDeleteRow,_xTable); if(m_bDeleted) diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx index 20744419a731..064d789f3f7d 100644 --- a/dbaccess/source/core/api/StaticSet.hxx +++ b/dbaccess/source/core/api/StaticSet.hxx @@ -45,30 +45,30 @@ namespace dbaccess virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) override; // css::sdbcx::XRowLocate - virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getBookmark() override; + virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override; + virtual bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // css::sdbc::XResultSet - virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual bool SAL_CALL next() override; + virtual bool SAL_CALL isBeforeFirst( ) override; + virtual bool SAL_CALL isAfterLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual bool SAL_CALL first() override; + virtual bool SAL_CALL last() override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual bool SAL_CALL absolute( sal_Int32 row ) override; + virtual bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual bool SAL_CALL rowUpdated( ) override; + virtual bool SAL_CALL rowInserted( ) override; + virtual bool SAL_CALL rowDeleted( ) override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_STATICSET_HXX diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 54c82bc8b542..267ca0527967 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -59,7 +59,7 @@ using namespace ::cppu; // ODBTableDecorator ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnection, const Reference< XColumnsSupplier >& _rxNewTable, - const Reference< XNumberFormatsSupplier >& _rxNumberFormats, const Reference< XNameAccess >& _xColumnDefinitions ) throw(SQLException) + const Reference< XNumberFormatsSupplier >& _rxNumberFormats, const Reference< XNameAccess >& _xColumnDefinitions ) :OTableDescriptor_BASE(m_aMutex) ,ODataSettings(OTableDescriptor_BASE::rBHelper) ,m_xTable(_rxNewTable) @@ -77,7 +77,7 @@ ODBTableDecorator::~ODBTableDecorator() { } -Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -103,7 +103,6 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { bool bRet = true; switch(nHandle) @@ -148,7 +147,7 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue( return bRet; } -void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception, std::exception) +void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) { switch(_nHandle) { @@ -361,7 +360,7 @@ void ODBTableDecorator::construct() // XServiceInfo IMPLEMENT_SERVICE_INFO1(ODBTableDecorator, "com.sun.star.sdb.dbaccess.ODBTableDecorator", SERVICE_SDBCX_TABLE) -Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) { Any aRet; if(m_xTable.is()) @@ -378,7 +377,7 @@ Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(Runti return aRet; } -Sequence< Type > SAL_CALL ODBTableDecorator::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL ODBTableDecorator::getTypes( ) { Reference<XTypeProvider> xTypes(m_xTable,UNO_QUERY); OSL_ENSURE(xTypes.is(),"Table must be a TypePropvider!"); @@ -386,7 +385,7 @@ Sequence< Type > SAL_CALL ODBTableDecorator::getTypes( ) throw(RuntimeException } // XRename, -void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -400,7 +399,7 @@ void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLEx } // XAlterTable, -void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -415,7 +414,7 @@ void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, cons m_pColumns->refresh(); } -void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Reference< XPropertySet >& _rxDescriptor ) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -430,21 +429,21 @@ void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Re throw SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_ALTER_BY_INDEX),*this,SQLSTATE_GENERAL,1000,Any() ); } -Reference< XNameAccess> ODBTableDecorator::getIndexes() throw (RuntimeException, std::exception) +Reference< XNameAccess> ODBTableDecorator::getIndexes() { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); return Reference< XIndexesSupplier>(m_xTable,UNO_QUERY)->getIndexes(); } -Reference< XIndexAccess> ODBTableDecorator::getKeys() throw (RuntimeException, std::exception) +Reference< XIndexAccess> ODBTableDecorator::getKeys() { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); return Reference< XKeysSupplier>(m_xTable,UNO_QUERY)->getKeys(); } -Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException, std::exception) +Reference< XNameAccess> ODBTableDecorator::getColumns() { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -455,7 +454,7 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException, return m_pColumns.get(); } -OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ODBTableDecorator::getName() { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -464,7 +463,7 @@ OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException, std::exce return xName->getName(); } -sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& rId ) { if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast<sal_Int64>(this); @@ -521,7 +520,7 @@ void ODBTableDecorator::fillPrivileges() const } } -Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor( ) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -540,7 +539,7 @@ Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor( ) t ); } -Reference< css::beans::XPropertySetInfo > SAL_CALL ODBTableDecorator::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL ODBTableDecorator::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -638,7 +637,7 @@ void SAL_CALL ODBTableDecorator::release() throw() OTableDescriptor_BASE::release(); } -void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) { throwFunctionNotSupportedRuntimeException( "XNamed::setName", *this ); } diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 41e4800c69c9..024ea15608e4 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -71,7 +71,7 @@ namespace dbaccess IMPLEMENT_FORWARD_REFCOUNT( View, View_Base ) IMPLEMENT_GET_IMPLEMENTATION_ID( View ) - Any SAL_CALL View::queryInterface( const Type & _rType ) throw(RuntimeException, std::exception) + Any SAL_CALL View::queryInterface( const Type & _rType ) { if(_rType == cppu::UnoType<XAlterView>::get()&& !m_xViewAccess.is() ) return Any(); @@ -81,7 +81,7 @@ namespace dbaccess return aReturn; } - Sequence< Type > SAL_CALL View::getTypes( ) throw(RuntimeException, std::exception) + Sequence< Type > SAL_CALL View::getTypes( ) { Type aAlterType = cppu::UnoType<XAlterView>::get(); @@ -100,7 +100,7 @@ namespace dbaccess return Sequence< Type >(aOwnTypes.data(), aOwnTypes.size()); } - void SAL_CALL View::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException, std::exception) + void SAL_CALL View::alterCommand( const OUString& _rNewCommand ) { OSL_ENSURE(m_xViewAccess.is(),"Illegal call to AlterView!"); m_xViewAccess->alterCommand(this,_rNewCommand); diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index 09fd80116228..77836d7746e2 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -49,7 +49,7 @@ void WrappedResultSet::reset(const Reference< XResultSet>& _xDriverSet) construct(_xDriverSet, m_sRowSetFilter); } -Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeException) +Any SAL_CALL WrappedResultSet::getBookmark() { if ( m_xRowLocate.is() ) { @@ -58,27 +58,27 @@ Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeExceptio return makeAny(m_xDriverSet->getRow()); } -bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark ) { return m_xRowLocate->moveToBookmark( bookmark ); } -sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second ) { return m_xRowLocate->compareBookmarks( _first,_second ); } -bool SAL_CALL WrappedResultSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) +bool SAL_CALL WrappedResultSet::hasOrderedBookmarks( ) { return m_xRowLocate->hasOrderedBookmarks(); } -sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark ) { return m_xRowLocate->hashBookmark(bookmark); } -void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) { m_xUpd->moveToInsertRow(); sal_Int32 i = 1; @@ -92,7 +92,7 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c (*_rInsertRow->get().begin()) = getBookmark(); } -void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) { sal_Int32 i = 1; connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1; @@ -105,7 +105,7 @@ void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const O m_xUpd->updateRow(); } -void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) +void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ ) { m_xUpd->deleteRow(); } diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index c6ca18aa00bb..7d5608637c49 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -45,15 +45,15 @@ namespace dbaccess virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override; virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override; // css::sdbcx::XRowLocate - virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getBookmark() override; + virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override; + virtual bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) override; + virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_WRAPPEDRESULTSET_HXX diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index 9d92f275c5d5..050931dc76a6 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -34,7 +34,7 @@ using namespace ::cppu; using namespace ::osl; // css::lang::XTypeProvider -Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > OCallableStatement::getTypes() { OTypeCollection aTypes(cppu::UnoType<XRow>::get(), cppu::UnoType<XOutParameters>::get(), @@ -43,13 +43,13 @@ Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException, std::ex return aTypes.getTypes(); } -Sequence< sal_Int8 > OCallableStatement::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > OCallableStatement::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // css::uno::XInterface -Any OCallableStatement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any OCallableStatement::queryInterface( const Type & rType ) { Any aIface = OPreparedStatement::queryInterface( rType ); if (!aIface.hasValue()) @@ -71,12 +71,12 @@ void OCallableStatement::release() throw () } // XServiceInfo -OUString OCallableStatement::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OCallableStatement::getImplementationName( ) { return OUString("com.sun.star.sdb.OCallableStatement"); } -Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT; @@ -85,7 +85,7 @@ Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) throw (Run } // XOutParameters -void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) { MutexGuard aGuard(m_aMutex); @@ -94,7 +94,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex Reference< XOutParameters >(m_xAggregateAsSet, UNO_QUERY)->registerOutParameter( parameterIndex, sqlType, typeName ); } -void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -103,7 +103,7 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet } // XRow -sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCallableStatement::wasNull( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -111,7 +111,7 @@ sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeExc return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->wasNull(); } -OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -119,7 +119,7 @@ OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(S return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getString( columnIndex ); } -sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -127,7 +127,7 @@ sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw( return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBoolean( columnIndex ); } -sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -135,63 +135,63 @@ sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQL return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getByte( columnIndex ); } -sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getShort( columnIndex ); } -sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getInt( columnIndex ); } -sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getLong( columnIndex ); } -float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getFloat( columnIndex ); } -double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDouble( columnIndex ); } -Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBytes( columnIndex ); } -css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDate( columnIndex ); } -css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getTime( columnIndex ); } -css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -199,7 +199,7 @@ css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnI return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getTimestamp( columnIndex ); } -Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -207,7 +207,7 @@ Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBinaryStream( columnIndex ); } -Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -215,7 +215,7 @@ Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStre return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getCharacterStream( columnIndex ); } -Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -223,28 +223,28 @@ Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Referen return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getObject( columnIndex, typeMap ); } -Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getRef( columnIndex ); } -Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBlob( columnIndex ); } -Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getClob( columnIndex ); } -Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 columnIndex ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 2bc0b5d66c87..cab05f9f9f63 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -76,7 +76,7 @@ OColumn::~OColumn() } // css::lang::XTypeProvider -Sequence< Type > OColumn::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > OColumn::getTypes() { return ::comphelper::concatSequences( OColumnBase::getTypes(), @@ -88,17 +88,17 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException, std::exception) IMPLEMENT_FORWARD_XINTERFACE2( OColumn, OColumnBase, ::comphelper::OPropertyContainer ) // css::lang::XServiceInfo -OUString OColumn::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OColumn::getImplementationName( ) { return OUString("com.sun.star.sdb.OColumn"); } -sal_Bool OColumn::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool OColumn::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > OColumn::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OColumn::getSupportedServiceNames( ) { Sequence<OUString> aSNS { SERVICE_SDBCX_COLUMN }; return aSNS; @@ -111,17 +111,17 @@ void OColumn::disposing() } // css::beans::XPropertySet -Reference< XPropertySetInfo > OColumn::getPropertySetInfo() throw (RuntimeException, std::exception) +Reference< XPropertySetInfo > OColumn::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ) ; } -OUString SAL_CALL OColumn::getName( ) throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL OColumn::getName( ) { return m_sName; } -void SAL_CALL OColumn::setName( const OUString& _rName ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL OColumn::setName( const OUString& _rName ) { m_sName = _rName; } @@ -186,17 +186,17 @@ OColumns::~OColumns() } // XServiceInfo -OUString OColumns::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OColumns::getImplementationName( ) { return OUString("com.sun.star.sdb.OColumns"); } -sal_Bool OColumns::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool OColumns::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OColumns::getSupportedServiceNames( ) { Sequence<OUString> aSNS { SERVICE_SDBCX_CONTAINER }; return aSNS; @@ -230,7 +230,7 @@ void SAL_CALL OColumns::disposing() OColumns_BASE::disposing(); } -void OColumns::impl_refresh() throw(css::uno::RuntimeException) +void OColumns::impl_refresh() { if (m_pRefreshColumns) m_pRefreshColumns->refreshColumns(); @@ -270,7 +270,7 @@ Reference< XPropertySet > OColumns::createDescriptor() return Reference< XPropertySet >(); } -Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OColumns::queryInterface( const Type & rType ) { Any aRet; if(m_xDrvColumns.is()) @@ -296,7 +296,7 @@ Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeExcepti return aRet; } -Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OColumns::getTypes( ) { bool bAppendFound = false,bDropFound = false; @@ -410,13 +410,13 @@ void OColumns::dropObject(sal_Int32 _nPos, const OUString& _sElementName) ::dbaccess::notifyDataSourceModified(m_xParent,true); } -Reference< XInterface > SAL_CALL OColumns::getParent( ) throw (RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OColumns::getParent( ) { ::osl::MutexGuard aGuard(m_rMutex); return m_xParent; } -void SAL_CALL OColumns::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL OColumns::setParent( const Reference< XInterface >& _xParent ) { ::osl::MutexGuard aGuard(m_rMutex); m_xParent = _xParent; diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index d83ea5c46791..4d131e74d319 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -57,7 +57,7 @@ ODataColumn::~ODataColumn() } // css::lang::XTypeProvider -Sequence< Type > ODataColumn::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > ODataColumn::getTypes() { OTypeCollection aTypes(cppu::UnoType<XColumn>::get(), cppu::UnoType<XColumnUpdate>::get(), @@ -65,12 +65,12 @@ Sequence< Type > ODataColumn::getTypes() throw (RuntimeException, std::exception return aTypes.getTypes(); } -Sequence< sal_Int8 > ODataColumn::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > ODataColumn::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) { Any aReturn = OResultColumn::queryInterface(_rType); if (!aReturn.hasValue()) @@ -82,12 +82,12 @@ Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeEx } // XServiceInfo -OUString ODataColumn::getImplementationName( ) throw(RuntimeException, std::exception) +OUString ODataColumn::getImplementationName( ) { return OUString("com.sun.star.sdb.ODataColumn"); } -Sequence< OUString > ODataColumn::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > ODataColumn::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 3 ); aSNS[0] = SERVICE_SDBCX_COLUMN; @@ -106,7 +106,7 @@ void ODataColumn::disposing() } // css::sdb::XColumn -sal_Bool ODataColumn::wasNull() throw( SQLException, RuntimeException, std::exception ) +sal_Bool ODataColumn::wasNull() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -114,7 +114,7 @@ sal_Bool ODataColumn::wasNull() throw( SQLException, RuntimeException, std::exce return m_xRow->wasNull(); } -OUString ODataColumn::getString() throw( SQLException, RuntimeException, std::exception ) +OUString ODataColumn::getString() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -122,7 +122,7 @@ OUString ODataColumn::getString() throw( SQLException, RuntimeException, std::ex return m_xRow->getString(m_nPos); } -sal_Bool ODataColumn::getBoolean() throw( SQLException, RuntimeException, std::exception ) +sal_Bool ODataColumn::getBoolean() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -130,7 +130,7 @@ sal_Bool ODataColumn::getBoolean() throw( SQLException, RuntimeException, std::e return m_xRow->getBoolean(m_nPos); } -sal_Int8 ODataColumn::getByte() throw( SQLException, RuntimeException, std::exception ) +sal_Int8 ODataColumn::getByte() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -138,7 +138,7 @@ sal_Int8 ODataColumn::getByte() throw( SQLException, RuntimeException, std::exce return m_xRow->getByte(m_nPos); } -sal_Int16 ODataColumn::getShort() throw( SQLException, RuntimeException, std::exception ) +sal_Int16 ODataColumn::getShort() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -146,7 +146,7 @@ sal_Int16 ODataColumn::getShort() throw( SQLException, RuntimeException, std::ex return m_xRow->getShort(m_nPos); } -sal_Int32 ODataColumn::getInt() throw( SQLException, RuntimeException, std::exception ) +sal_Int32 ODataColumn::getInt() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -154,7 +154,7 @@ sal_Int32 ODataColumn::getInt() throw( SQLException, RuntimeException, std::exce return m_xRow->getInt(m_nPos); } -sal_Int64 ODataColumn::getLong() throw( SQLException, RuntimeException, std::exception ) +sal_Int64 ODataColumn::getLong() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -162,7 +162,7 @@ sal_Int64 ODataColumn::getLong() throw( SQLException, RuntimeException, std::exc return m_xRow->getLong(m_nPos); } -float ODataColumn::getFloat() throw( SQLException, RuntimeException, std::exception ) +float ODataColumn::getFloat() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -170,7 +170,7 @@ float ODataColumn::getFloat() throw( SQLException, RuntimeException, std::except return m_xRow->getFloat(m_nPos); } -double ODataColumn::getDouble() throw( SQLException, RuntimeException, std::exception ) +double ODataColumn::getDouble() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -178,7 +178,7 @@ double ODataColumn::getDouble() throw( SQLException, RuntimeException, std::exce return m_xRow->getDouble(m_nPos); } -Sequence< sal_Int8 > ODataColumn::getBytes() throw( SQLException, RuntimeException, std::exception ) +Sequence< sal_Int8 > ODataColumn::getBytes() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -186,7 +186,7 @@ Sequence< sal_Int8 > ODataColumn::getBytes() throw( SQLException, RuntimeExcepti return m_xRow->getBytes(m_nPos); } -css::util::Date ODataColumn::getDate() throw( SQLException, RuntimeException, std::exception ) +css::util::Date ODataColumn::getDate() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -194,7 +194,7 @@ css::util::Date ODataColumn::getDate() throw( SQLException, RuntimeException, st return m_xRow->getDate(m_nPos); } -css::util::Time ODataColumn::getTime() throw( SQLException, RuntimeException, std::exception ) +css::util::Time ODataColumn::getTime() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -202,7 +202,7 @@ css::util::Time ODataColumn::getTime() throw( SQLException, RuntimeException, st return m_xRow->getTime(m_nPos); } -css::util::DateTime ODataColumn::getTimestamp() throw( SQLException, RuntimeException, std::exception ) +css::util::DateTime ODataColumn::getTimestamp() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -210,7 +210,7 @@ css::util::DateTime ODataColumn::getTimestamp() throw( SQLException, RuntimeExce return m_xRow->getTimestamp(m_nPos); } -Reference< css::io::XInputStream > ODataColumn::getBinaryStream() throw( SQLException, RuntimeException, std::exception ) +Reference< css::io::XInputStream > ODataColumn::getBinaryStream() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -218,7 +218,7 @@ Reference< css::io::XInputStream > ODataColumn::getBinaryStream() throw( SQLExc return m_xRow->getBinaryStream(m_nPos); } -Reference< css::io::XInputStream > ODataColumn::getCharacterStream() throw( SQLException, RuntimeException, std::exception ) +Reference< css::io::XInputStream > ODataColumn::getCharacterStream() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -226,7 +226,7 @@ Reference< css::io::XInputStream > ODataColumn::getCharacterStream() throw( SQL return m_xRow->getCharacterStream(m_nPos); } -Any ODataColumn::getObject(const Reference< css::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException, std::exception ) +Any ODataColumn::getObject(const Reference< css::container::XNameAccess > & typeMap) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -234,7 +234,7 @@ Any ODataColumn::getObject(const Reference< css::container::XNameAccess > & type return m_xRow->getObject(m_nPos, typeMap); } -Reference< XRef > ODataColumn::getRef() throw( SQLException, RuntimeException, std::exception ) +Reference< XRef > ODataColumn::getRef() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -242,7 +242,7 @@ Reference< XRef > ODataColumn::getRef() throw( SQLException, RuntimeException, return m_xRow->getRef(m_nPos); } -Reference< XBlob > ODataColumn::getBlob() throw( SQLException, RuntimeException, std::exception ) +Reference< XBlob > ODataColumn::getBlob() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -250,7 +250,7 @@ Reference< XBlob > ODataColumn::getBlob() throw( SQLException, RuntimeException return m_xRow->getBlob(m_nPos); } -Reference< XClob > ODataColumn::getClob() throw( SQLException, RuntimeException, std::exception ) +Reference< XClob > ODataColumn::getClob() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -258,7 +258,7 @@ Reference< XClob > ODataColumn::getClob() throw( SQLException, RuntimeException return m_xRow->getClob(m_nPos); } -Reference< XArray > ODataColumn::getArray() throw( SQLException, RuntimeException, std::exception ) +Reference< XArray > ODataColumn::getArray() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -267,7 +267,7 @@ Reference< XArray > ODataColumn::getArray() throw( SQLException, RuntimeExcepti } // css::sdb::XColumnUpdate -void ODataColumn::updateNull() throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateNull() { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -275,7 +275,7 @@ void ODataColumn::updateNull() throw( SQLException, RuntimeException, std::excep m_xRowUpdate->updateNull(m_nPos); } -void ODataColumn::updateBoolean(sal_Bool x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateBoolean(sal_Bool x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -283,7 +283,7 @@ void ODataColumn::updateBoolean(sal_Bool x) throw( SQLException, RuntimeExceptio m_xRowUpdate->updateBoolean(m_nPos, x); } -void ODataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateByte(sal_Int8 x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -291,7 +291,7 @@ void ODataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException, m_xRowUpdate->updateByte(m_nPos, x); } -void ODataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateShort(sal_Int16 x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -299,7 +299,7 @@ void ODataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException m_xRowUpdate->updateShort(m_nPos, x); } -void ODataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateInt(sal_Int32 x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -307,7 +307,7 @@ void ODataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException, m_xRowUpdate->updateInt(m_nPos, x); } -void ODataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateLong(sal_Int64 x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -315,7 +315,7 @@ void ODataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException, m_xRowUpdate->updateLong(m_nPos, x); } -void ODataColumn::updateFloat(float x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateFloat(float x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -323,7 +323,7 @@ void ODataColumn::updateFloat(float x) throw( SQLException, RuntimeException, st m_xRowUpdate->updateFloat(m_nPos, x); } -void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateDouble(double x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -331,7 +331,7 @@ void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException, m_xRowUpdate->updateDouble(m_nPos, x); } -void ODataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateString(const OUString& x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -339,7 +339,7 @@ void ODataColumn::updateString(const OUString& x) throw( SQLException, RuntimeEx m_xRowUpdate->updateString(m_nPos, x); } -void ODataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateBytes(const Sequence< sal_Int8 >& x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -347,7 +347,7 @@ void ODataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException m_xRowUpdate->updateBytes(m_nPos, x); } -void ODataColumn::updateDate(const css::util::Date& x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateDate(const css::util::Date& x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -355,7 +355,7 @@ void ODataColumn::updateDate(const css::util::Date& x) throw( SQLException, Runt m_xRowUpdate->updateDate(m_nPos, x); } -void ODataColumn::updateTime(const css::util::Time& x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateTime(const css::util::Time& x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -363,7 +363,7 @@ void ODataColumn::updateTime(const css::util::Time& x) throw( SQLException, Runt m_xRowUpdate->updateTime(m_nPos, x); } -void ODataColumn::updateTimestamp(const css::util::DateTime& x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateTimestamp(const css::util::DateTime& x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -371,7 +371,7 @@ void ODataColumn::updateTimestamp(const css::util::DateTime& x) throw( SQLExcept m_xRowUpdate->updateTimestamp(m_nPos, x); } -void ODataColumn::updateCharacterStream(const Reference< css::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateCharacterStream(const Reference< css::io::XInputStream > & x, sal_Int32 length) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -379,7 +379,7 @@ void ODataColumn::updateCharacterStream(const Reference< css::io::XInputStream > m_xRowUpdate->updateCharacterStream(m_nPos, x, length); } -void ODataColumn::updateBinaryStream(const Reference< css::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateBinaryStream(const Reference< css::io::XInputStream > & x, sal_Int32 length) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -387,7 +387,7 @@ void ODataColumn::updateBinaryStream(const Reference< css::io::XInputStream > & m_xRowUpdate->updateBinaryStream(m_nPos, x, length); } -void ODataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateNumericObject(const Any& x, sal_Int32 scale) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); @@ -395,7 +395,7 @@ void ODataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLE m_xRowUpdate->updateNumericObject(m_nPos, x, scale); } -void ODataColumn::updateObject(const Any& x) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateObject(const Any& x) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index f4d32ebc5957..71063c834814 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -48,61 +48,61 @@ namespace dbaccess const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxDBMeta); // 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 { OResultColumn::acquire(); } virtual void SAL_CALL release() throw() override { OResultColumn::release(); } // 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; // cppu::OComponentHelper virtual void SAL_CALL disposing() override; // css::sdb::XColumn - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( ) override; + virtual sal_Bool SAL_CALL getBoolean( ) override; + virtual sal_Int8 SAL_CALL getByte( ) override; + virtual sal_Int16 SAL_CALL getShort( ) override; + virtual sal_Int32 SAL_CALL getInt( ) override; + virtual sal_Int64 SAL_CALL getLong( ) override; + virtual float SAL_CALL getFloat( ) override; + virtual double SAL_CALL getDouble( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( ) override; + virtual css::util::Date SAL_CALL getDate( ) override; + virtual css::util::Time SAL_CALL getTime( ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( ) override; + virtual css::uno::Any SAL_CALL getObject( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( ) override; // css::sdb::XColumnUpdate - virtual void SAL_CALL updateNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( ) override; + virtual void SAL_CALL updateBoolean( sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( float x ) override; + virtual void SAL_CALL updateDouble( double x ) override; + virtual void SAL_CALL updateString( const OUString& x ) override; + virtual void SAL_CALL updateBytes( const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( const css::uno::Any& x, sal_Int32 scale ) override; }; } diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index c8d7e9dc6e2f..477cd1cde9e6 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -84,12 +84,12 @@ void OTableColumnDescriptor::impl_registerProperties() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor ) // css::lang::XServiceInfo -OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeException, std::exception) +OUString OTableColumnDescriptor::getImplementationName( ) { return OUString("com.sun.star.sdb.OTableColumnDescriptor"); } -Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = m_bActAsDescriptor ? OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : OUString(SERVICE_SDBCX_COLUMN); @@ -111,19 +111,19 @@ Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw return *static_cast< ::comphelper::OPropertyArrayUsageHelper< OTableColumnDescriptor >* >(this)->getArrayHelper(); } -void OTableColumnDescriptor::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) +void OTableColumnDescriptor::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { OColumn::setFastPropertyValue_NoBroadcast( nHandle, rValue ); ::dbaccess::notifyDataSourceModified( m_xParent, true ); } -Reference< XInterface > SAL_CALL OTableColumnDescriptor::getParent( ) throw (RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OTableColumnDescriptor::getParent( ) { ::osl::MutexGuard aGuard(m_aMutex); return m_xParent; } -void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& _xParent ) { ::osl::MutexGuard aGuard(m_aMutex); m_xParent = _xParent; @@ -143,7 +143,7 @@ OTableColumn::~OTableColumn() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn ) -OUString OTableColumn::getImplementationName( ) throw (RuntimeException, std::exception) +OUString OTableColumn::getImplementationName( ) { return OUString("com.sun.star.sdb.OTableColumn"); } @@ -264,7 +264,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn ) -OUString SAL_CALL OQueryColumn::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OQueryColumn::getImplementationName( ) { return OUString( "org.openoffice.comp.dbaccess.OQueryColumn" ); } @@ -365,7 +365,7 @@ void OColumnWrapper::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons } sal_Bool OColumnWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, - const Any& rValue ) throw (IllegalArgumentException) + const Any& rValue ) { bool bModified( false ); if ( OColumn::isRegisteredProperty( nHandle ) ) @@ -384,7 +384,7 @@ sal_Bool OColumnWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & return bModified; } -void OColumnWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) +void OColumnWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { if ( OColumn::isRegisteredProperty( nHandle ) ) { @@ -410,12 +410,12 @@ OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< X IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper ) // css::lang::XServiceInfo -OUString OTableColumnDescriptorWrapper::getImplementationName( ) throw (RuntimeException, std::exception) +OUString OTableColumnDescriptorWrapper::getImplementationName( ) { return OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper"); } -Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMNDESCRIPTOR; @@ -509,7 +509,7 @@ void OTableColumnDescriptorWrapper::getFastPropertyValue( Any& rValue, sal_Int32 } } -sal_Bool OTableColumnDescriptorWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException) +sal_Bool OTableColumnDescriptorWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) { bool bModified(false); if ( m_bPureWrap ) @@ -537,7 +537,6 @@ void OTableColumnDescriptorWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw (Exception, std::exception) { if ( m_bPureWrap ) { @@ -575,12 +574,12 @@ OTableColumnWrapper::~OTableColumnWrapper() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnWrapper ) -OUString OTableColumnWrapper::getImplementationName( ) throw (RuntimeException, std::exception) +OUString OTableColumnWrapper::getImplementationName( ) { return OUString("com.sun.star.sdb.OTableColumnWrapper" ); } -Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMN; diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index bf8ec3472f35..5874a33ea7eb 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -64,7 +64,7 @@ OPreparedStatement::~OPreparedStatement() } // css::lang::XTypeProvider -Sequence< Type > OPreparedStatement::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > OPreparedStatement::getTypes() { OTypeCollection aTypes(cppu::UnoType<XServiceInfo>::get(), cppu::UnoType<XPreparedStatement>::get(), @@ -76,13 +76,13 @@ Sequence< Type > OPreparedStatement::getTypes() throw (RuntimeException, std::ex return aTypes.getTypes(); } -Sequence< sal_Int8 > OPreparedStatement::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > OPreparedStatement::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // css::uno::XInterface -Any OPreparedStatement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any OPreparedStatement::queryInterface( const Type & rType ) { Any aIface = OStatementBase::queryInterface( rType ); if (!aIface.hasValue()) @@ -109,17 +109,17 @@ void OPreparedStatement::release() throw () } // XServiceInfo -OUString OPreparedStatement::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OPreparedStatement::getImplementationName( ) { return OUString("com.sun.star.sdb.OPreparedStatement"); } -sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > OPreparedStatement::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OPreparedStatement::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_PREPAREDSTATEMENT; @@ -139,7 +139,7 @@ void OPreparedStatement::disposing() } // css::sdbcx::XColumnsSupplier -Reference< css::container::XNameAccess > OPreparedStatement::getColumns() throw( RuntimeException, std::exception ) +Reference< css::container::XNameAccess > OPreparedStatement::getColumns() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -173,7 +173,7 @@ Reference< css::container::XNameAccess > OPreparedStatement::getColumns() throw( } // XResultSetMetaDataSupplier -Reference< XResultSetMetaData > OPreparedStatement::getMetaData() throw( SQLException, RuntimeException, std::exception ) +Reference< XResultSetMetaData > OPreparedStatement::getMetaData() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -181,7 +181,7 @@ Reference< XResultSetMetaData > OPreparedStatement::getMetaData() throw( SQLExce } // XPreparedStatement -Reference< XResultSet > OPreparedStatement::executeQuery() throw( SQLException, RuntimeException, std::exception ) +Reference< XResultSet > OPreparedStatement::executeQuery() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -200,7 +200,7 @@ Reference< XResultSet > OPreparedStatement::executeQuery() throw( SQLException, return xResultSet; } -sal_Int32 OPreparedStatement::executeUpdate() throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OPreparedStatement::executeUpdate() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -210,7 +210,7 @@ sal_Int32 OPreparedStatement::executeUpdate() throw( SQLException, RuntimeExcept return Reference< XPreparedStatement >( m_xAggregateAsSet, UNO_QUERY_THROW )->executeUpdate(); } -sal_Bool OPreparedStatement::execute() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OPreparedStatement::execute() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -220,13 +220,13 @@ sal_Bool OPreparedStatement::execute() throw( SQLException, RuntimeException, st return Reference< XPreparedStatement >( m_xAggregateAsSet, UNO_QUERY_THROW )->execute(); } -Reference< XConnection > OPreparedStatement::getConnection() throw( SQLException, RuntimeException, std::exception ) +Reference< XConnection > OPreparedStatement::getConnection() { return Reference< XConnection > (m_xParent, UNO_QUERY); } // XParameters -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -234,7 +234,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s m_xAggregateAsParameters->setNull(parameterIndex, sqlType); } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -242,7 +242,7 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I m_xAggregateAsParameters->setObjectNull(parameterIndex, sqlType, typeName); } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -250,7 +250,7 @@ void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool m_xAggregateAsParameters->setBoolean(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -258,7 +258,7 @@ void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x m_xAggregateAsParameters->setByte(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -266,7 +266,7 @@ void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 m_xAggregateAsParameters->setShort(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -274,7 +274,7 @@ void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x m_xAggregateAsParameters->setInt(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -282,7 +282,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x m_xAggregateAsParameters->setLong(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -290,7 +290,7 @@ void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) m_xAggregateAsParameters->setFloat(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -298,7 +298,7 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x m_xAggregateAsParameters->setDouble(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -306,7 +306,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS m_xAggregateAsParameters->setString(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -314,7 +314,7 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ m_xAggregateAsParameters->setBytes(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -322,7 +322,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const css:: m_xAggregateAsParameters->setDate(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -330,7 +330,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css:: m_xAggregateAsParameters->setTime(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -338,7 +338,7 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const m_xAggregateAsParameters->setTimestamp(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -346,7 +346,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con m_xAggregateAsParameters->setBinaryStream(parameterIndex, x, length); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -354,7 +354,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, m_xAggregateAsParameters->setCharacterStream(parameterIndex, x, length); } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -362,7 +362,7 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any m_xAggregateAsParameters->setObject(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -370,7 +370,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c m_xAggregateAsParameters->setObjectWithInfo(parameterIndex, x, targetSqlType, scale); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -378,7 +378,7 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere m_xAggregateAsParameters->setRef(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -386,7 +386,7 @@ void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Refer m_xAggregateAsParameters->setBlob(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -394,7 +394,7 @@ void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Refer m_xAggregateAsParameters->setClob(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -402,7 +402,7 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe m_xAggregateAsParameters->setArray(parameterIndex, x); } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 468c08f6ab6e..c9853f0fe967 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -108,7 +108,6 @@ OQuery::~OQuery() } css::uno::Sequence<sal_Int8> OQuery::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -218,7 +217,7 @@ void OQuery::rebuildColumns() IMPLEMENT_SERVICE_INFO3(OQuery, "com.sun.star.sdb.dbaccess.OQuery", SERVICE_SDB_DATASETTINGS, SERVICE_SDB_QUERY, "com.sun.star.sdb.QueryDefinition") // css::beans::XPropertyChangeListener -void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) throw(RuntimeException, std::exception) +void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) { sal_Int32 nOwnHandle = -1; { @@ -250,7 +249,7 @@ void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) thro fire(&nOwnHandle, &_rSource.NewValue, &_rSource.OldValue, 1, false); } -void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) +void SAL_CALL OQuery::disposing( const EventObject& _rSource ) { MutexGuard aGuard(m_aMutex); @@ -263,7 +262,7 @@ void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeExc } // XDataDescriptorFactory -Reference< XPropertySet > SAL_CALL OQuery::createDataDescriptor( ) throw(RuntimeException, std::exception) +Reference< XPropertySet > SAL_CALL OQuery::createDataDescriptor( ) { return new OQueryDescriptor(*this); } @@ -282,7 +281,7 @@ void SAL_CALL OQuery::disposing() m_pWarnings = nullptr; } -void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) +void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { ODataSettings::setFastPropertyValue_NoBroadcast(_nHandle, _rValue); OUString sAggPropName; @@ -302,7 +301,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r } } -Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) { return createPropertySetInfo( getInfoHelper() ) ; } @@ -325,7 +324,7 @@ OColumn* OQuery::createColumn(const OUString& /*_rName*/) const return nullptr; } -void SAL_CALL OQuery::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL OQuery::rename( const OUString& newName ) { MutexGuard aGuard(m_aMutex); Reference<XRename> xRename(m_xCommandDefinition,UNO_QUERY); diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index 16ce7a25463b..d30bd602e7ac 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -96,16 +96,14 @@ public: const css::uno::Reference< css::uno::XComponentContext >& _xORB ); - 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 ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -114,26 +112,25 @@ public: DECLARE_SERVICE_INFO(); // css::sdbcx::XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; // css::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // css::lang::XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override; // OPropertySetHelper 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; public: // the caller is responsible for the lifetime! void setWarningsContainer( ::dbtools::WarningsContainer* _pWarnings ) { m_pWarnings = _pWarnings; } // 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; protected: virtual void SAL_CALL disposing() override; diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 193f659b8a19..03f1b47901a9 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -83,17 +83,17 @@ void SAL_CALL OQueryComposer::disposing() } // css::lang::XTypeProvider -Sequence< Type > SAL_CALL OQueryComposer::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > SAL_CALL OQueryComposer::getTypes() { return ::comphelper::concatSequences(OSubComponent::getTypes(),OQueryComposer_BASE::getTypes()); } -Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) { Any aRet = OSubComponent::queryInterface(rType); if(!aRet.hasValue()) @@ -102,24 +102,24 @@ Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeE } // XServiceInfo -OUString OQueryComposer::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OQueryComposer::getImplementationName( ) { return OUString("com.sun.star.sdb.dbaccess.OQueryComposer"); } -sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > OQueryComposer::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OQueryComposer::getSupportedServiceNames( ) { Sequence<OUString> aSNS { SERVICE_SDB_SQLQUERYCOMPOSER }; return aSNS; } // XSQLQueryComposer -OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OQueryComposer::getQuery( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -131,7 +131,7 @@ OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException, std::exce return sQuery; } -void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OQueryComposer::setQuery( const OUString& command ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -142,7 +142,7 @@ void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLExcep m_sOrgOrder = m_xComposer->getOrder(); } -OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OQueryComposer::getComposedQuery( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -151,7 +151,7 @@ OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException, s return m_xComposer->getQuery(); } -OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OQueryComposer::getFilter( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); @@ -160,7 +160,7 @@ OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException, std::exc return aFilterCreator.getComposedAndClear(); } -Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilter( ) throw(RuntimeException, std::exception) +Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilter( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -168,7 +168,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt return m_xComposer->getStructuredFilter(); } -OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OQueryComposer::getOrder( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -178,7 +178,7 @@ OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException, std::exce return aOrderCreator.getComposedAndClear(); } -void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -194,7 +194,7 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe setFilter( aFilterCreator.getComposedAndClear() ); } -void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -210,7 +210,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet setOrder(aOrderCreator.getComposedAndClear()); } -void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -226,7 +226,7 @@ void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLExcep m_xComposer->setFilter( aFilterCreator.getComposedAndClear() ); } -void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OQueryComposer::setOrder( const OUString& order ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -244,7 +244,7 @@ void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLExcepti } // XTablesSupplier -Reference< XNameAccess > SAL_CALL OQueryComposer::getTables( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OQueryComposer::getTables( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -253,7 +253,7 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getTables( ) throw(RuntimeExc } // XColumnsSupplier -Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -261,7 +261,7 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns( ) throw(RuntimeEx return Reference<XColumnsSupplier>(m_xComposer,UNO_QUERY)->getColumns(); } -Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters( ) throw(RuntimeException, std::exception) +Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters( ) { ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index eec3aceb9b42..0c7ce3a7da9a 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -139,13 +139,13 @@ void OQueryContainer::disposing() IMPLEMENT_SERVICE_INFO2(OQueryContainer, "com.sun.star.sdb.dbaccess.OQueryContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDB_QUERIES) // XDataDescriptorFactory -Reference< XPropertySet > SAL_CALL OQueryContainer::createDataDescriptor( ) throw(RuntimeException, std::exception) +Reference< XPropertySet > SAL_CALL OQueryContainer::createDataDescriptor( ) { return new OQueryDescriptor(); } // XAppend -void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet >& _rxDesc ) throw(SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet >& _rxDesc ) { ResettableMutexGuard aGuard(m_aMutex); if ( !m_xCommandDefinitions.is() ) @@ -199,7 +199,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet } // XDrop -void SAL_CALL OQueryContainer::dropByName( const OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL OQueryContainer::dropByName( const OUString& _rName ) { MutexGuard aGuard(m_aMutex); if ( !checkExistence(_rName) ) @@ -213,7 +213,7 @@ void SAL_CALL OQueryContainer::dropByName( const OUString& _rName ) throw(SQLExc m_xCommandDefinitions->removeByName(_rName); } -void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLException, IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) { MutexGuard aGuard(m_aMutex); if ((_nIndex<0) || (_nIndex>getCount())) @@ -230,7 +230,7 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti dropByName(sName); } -void SAL_CALL OQueryContainer::elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL OQueryContainer::elementInserted( const css::container::ContainerEvent& _rEvent ) { Reference< XContent > xNewElement; OUString sElementName; @@ -252,7 +252,7 @@ void SAL_CALL OQueryContainer::elementInserted( const css::container::ContainerE insertByName(sElementName,makeAny(xNewElement)); } -void SAL_CALL OQueryContainer::elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL OQueryContainer::elementRemoved( const css::container::ContainerEvent& _rEvent ) { OUString sAccessor; _rEvent.Accessor >>= sAccessor; @@ -265,7 +265,7 @@ void SAL_CALL OQueryContainer::elementRemoved( const css::container::ContainerEv removeByName(sAccessor); } -void SAL_CALL OQueryContainer::elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL OQueryContainer::elementReplaced( const css::container::ContainerEvent& _rEvent ) { Reference< XPropertySet > xReplacedElement; Reference< XContent > xNewElement; @@ -285,7 +285,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const css::container::ContainerE replaceByName(sAccessor,makeAny(xNewElement)); } -Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const ContainerEvent& Event ) throw (WrappedTargetException, RuntimeException, std::exception) +Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const ContainerEvent& Event ) { OUString sName; OSL_VERIFY( Event.Accessor >>= sName ); @@ -303,17 +303,17 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain return xReturn; } -Reference< XVeto > SAL_CALL OQueryContainer::approveReplaceElement( const ContainerEvent& /*Event*/ ) throw (WrappedTargetException, RuntimeException, std::exception) +Reference< XVeto > SAL_CALL OQueryContainer::approveReplaceElement( const ContainerEvent& /*Event*/ ) { return nullptr; } -Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const ContainerEvent& /*Event*/ ) throw (WrappedTargetException, RuntimeException, std::exception) +Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const ContainerEvent& /*Event*/ ) { return nullptr; } -void SAL_CALL OQueryContainer::disposing( const css::lang::EventObject& _rSource ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL OQueryContainer::disposing( const css::lang::EventObject& _rSource ) { if (_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinitions, UNO_QUERY).get()) { // our "master container" (with the command definitions) is being disposed @@ -397,19 +397,19 @@ bool OQueryContainer::checkExistence(const OUString& _rName) return bRet; } -sal_Bool SAL_CALL OQueryContainer::hasElements( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL OQueryContainer::hasElements( ) { MutexGuard aGuard(m_aMutex); return m_xCommandDefinitions->hasElements(); } -sal_Int32 SAL_CALL OQueryContainer::getCount( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OQueryContainer::getCount( ) { MutexGuard aGuard(m_aMutex); return Reference<XIndexAccess>(m_xCommandDefinitions,UNO_QUERY)->getCount(); } -Sequence< OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OQueryContainer::getElementNames( ) { MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index ef49745ed791..1f9c3a5ff25c 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -66,7 +66,6 @@ OQueryDescriptor::~OQueryDescriptor() } css::uno::Sequence<sal_Int8> OQueryDescriptor::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -100,7 +99,7 @@ void OQueryDescriptor::registerProperties() &m_aLayoutInformation, cppu::UnoType<decltype(m_aLayoutInformation)>::get()); } -Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo( ) { return createPropertySetInfo( getInfoHelper() ) ; } @@ -147,7 +146,7 @@ OQueryDescriptor_Base::~OQueryDescriptor_Base() } -sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) { if (_rIdentifier.getLength() != 16) return 0; @@ -179,7 +178,7 @@ void OQueryDescriptor_Base::clearColumns( ) setColumnsOutOfDate(); } -Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) { MutexGuard aGuard(m_rMutex); @@ -209,17 +208,17 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (Ru return m_pColumns; } -OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) { return OUString("com.sun.star.sdb.OQueryDescriptor"); } -sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported.getArray()[0] = SERVICE_SDB_DATASETTINGS; diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index da985b5d9368..4c175acb303b 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -74,18 +74,18 @@ public: OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf); // css::sdbcx::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; // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // 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; protected: @@ -129,16 +129,14 @@ public: OQueryDescriptor(); explicit OQueryDescriptor(const OQueryDescriptor_Base& _rSource); - 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; }; } // namespace dbaccess diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index cc5381a4f846..1de8449095fa 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -101,18 +101,18 @@ OResultColumn::~OResultColumn() } // css::lang::XTypeProvider -Sequence< sal_Int8 > OResultColumn::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > OResultColumn::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -OUString OResultColumn::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OResultColumn::getImplementationName( ) { return OUString("com.sun.star.sdb.OResultColumn"); } -Sequence< OUString > OResultColumn::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OResultColumn::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMN; diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 3bd87d841020..400838008388 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -59,11 +59,11 @@ namespace dbaccess const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxDBMeta ); // css::lang::XTypeProvider - 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; // 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; // cppu::OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index eeab01fc6c5d..330aa38fadcc 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -101,7 +101,7 @@ OResultSet::~OResultSet() } // css::lang::XTypeProvider -Sequence< Type > OResultSet::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > OResultSet::getTypes() { OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(), OResultSetBase::getTypes()); @@ -109,13 +109,13 @@ Sequence< Type > OResultSet::getTypes() throw (RuntimeException, std::exception) return aTypes.getTypes(); } -Sequence< sal_Int8 > OResultSet::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > OResultSet::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // css::uno::XInterface -Any OResultSet::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any OResultSet::queryInterface( const Type & rType ) { Any aIface = OResultSetBase::queryInterface( rType ); if (!aIface.hasValue()) @@ -158,7 +158,7 @@ void OResultSet::disposing() } // XCloseable -void OResultSet::close() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::close() { { MutexGuard aGuard( m_aMutex ); @@ -168,17 +168,17 @@ void OResultSet::close() throw( SQLException, RuntimeException, std::exception ) } // XServiceInfo -OUString OResultSet::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OResultSet::getImplementationName( ) { return OUString("com.sun.star.sdb.OResultSet"); } -sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBC_RESULTSET; @@ -187,7 +187,7 @@ Sequence< OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeExce } // css::beans::XPropertySet -Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeException, std::exception) +Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ) ; } @@ -211,7 +211,7 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc return *getArrayHelper(); } -sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException ) +sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) { // be lazy ... rConvertedValue = rValue; @@ -219,7 +219,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldV return true; } -void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) +void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { // set it for the driver result set Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY); @@ -260,14 +260,14 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } // XWarningsSupplier -Any OResultSet::getWarnings() throw( SQLException, RuntimeException, std::exception ) +Any OResultSet::getWarnings() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); return m_aWarnings.getWarnings(); } -void OResultSet::clearWarnings() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::clearWarnings() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -275,7 +275,7 @@ void OResultSet::clearWarnings() throw( SQLException, RuntimeException, std::exc } // css::sdbc::XResultSetMetaDataSupplier -Reference< XResultSetMetaData > OResultSet::getMetaData() throw( SQLException, RuntimeException, std::exception ) +Reference< XResultSetMetaData > OResultSet::getMetaData() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -284,7 +284,7 @@ Reference< XResultSetMetaData > OResultSet::getMetaData() throw( SQLException, R } // css::sdbc::XColumnLocate -sal_Int32 OResultSet::findColumn(const OUString& columnName) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OResultSet::findColumn(const OUString& columnName) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -318,7 +318,7 @@ namespace } // css::sdbcx::XColumnsSupplier -Reference< css::container::XNameAccess > OResultSet::getColumns() throw( RuntimeException, std::exception ) +Reference< css::container::XNameAccess > OResultSet::getColumns() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -388,7 +388,7 @@ Reference< css::container::XNameAccess > OResultSet::getColumns() throw( Runtime } // css::sdbc::XRow -sal_Bool OResultSet::wasNull() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::wasNull() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -396,7 +396,7 @@ sal_Bool OResultSet::wasNull() throw( SQLException, RuntimeException, std::excep return m_xDelegatorRow->wasNull(); } -OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +OUString OResultSet::getString(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -404,7 +404,7 @@ OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, Runti return m_xDelegatorRow->getString(columnIndex); } -sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -412,7 +412,7 @@ sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, Runt return m_xDelegatorRow->getBoolean(columnIndex); } -sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -420,7 +420,7 @@ sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, Runtime return m_xDelegatorRow->getByte(columnIndex); } -sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -428,7 +428,7 @@ sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, Runti return m_xDelegatorRow->getShort(columnIndex); } -sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -436,7 +436,7 @@ sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, Runtime return m_xDelegatorRow->getInt(columnIndex); } -sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -444,7 +444,7 @@ sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, Runtim return m_xDelegatorRow->getLong(columnIndex); } -float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +float OResultSet::getFloat(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -452,7 +452,7 @@ float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeEx return m_xDelegatorRow->getFloat(columnIndex); } -double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +double OResultSet::getDouble(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -460,7 +460,7 @@ double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, Runtime return m_xDelegatorRow->getDouble(columnIndex); } -Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -468,7 +468,7 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep return m_xDelegatorRow->getBytes(columnIndex); } -css::util::Date OResultSet::getDate(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +css::util::Date OResultSet::getDate(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -476,7 +476,7 @@ css::util::Date OResultSet::getDate(sal_Int32 columnIndex) throw( SQLException, return m_xDelegatorRow->getDate(columnIndex); } -css::util::Time OResultSet::getTime(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +css::util::Time OResultSet::getTime(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -484,7 +484,7 @@ css::util::Time OResultSet::getTime(sal_Int32 columnIndex) throw( SQLException, return m_xDelegatorRow->getTime(columnIndex); } -css::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +css::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -492,7 +492,7 @@ css::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) throw( SQLEx return m_xDelegatorRow->getTimestamp(columnIndex); } -Reference< css::io::XInputStream > OResultSet::getBinaryStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +Reference< css::io::XInputStream > OResultSet::getBinaryStream(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -500,7 +500,7 @@ Reference< css::io::XInputStream > OResultSet::getBinaryStream(sal_Int32 column return m_xDelegatorRow->getBinaryStream(columnIndex); } -Reference< css::io::XInputStream > OResultSet::getCharacterStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +Reference< css::io::XInputStream > OResultSet::getCharacterStream(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -508,7 +508,7 @@ Reference< css::io::XInputStream > OResultSet::getCharacterStream(sal_Int32 col return m_xDelegatorRow->getCharacterStream(columnIndex); } -Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< css::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException, std::exception ) +Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< css::container::XNameAccess > & typeMap) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -516,7 +516,7 @@ Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< css::container return m_xDelegatorRow->getObject(columnIndex, typeMap); } -Reference< XRef > OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +Reference< XRef > OResultSet::getRef(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -524,7 +524,7 @@ Reference< XRef > OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException return m_xDelegatorRow->getRef(columnIndex); } -Reference< XBlob > OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +Reference< XBlob > OResultSet::getBlob(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -532,7 +532,7 @@ Reference< XBlob > OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLExcepti return m_xDelegatorRow->getBlob(columnIndex); } -Reference< XClob > OResultSet::getClob(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +Reference< XClob > OResultSet::getClob(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -540,7 +540,7 @@ Reference< XClob > OResultSet::getClob(sal_Int32 columnIndex) throw( SQLExcepti return m_xDelegatorRow->getClob(columnIndex); } -Reference< XArray > OResultSet::getArray(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +Reference< XArray > OResultSet::getArray(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -549,7 +549,7 @@ Reference< XArray > OResultSet::getArray(sal_Int32 columnIndex) throw( SQLExcep } // css::sdbc::XRowUpdate -void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateNull(sal_Int32 columnIndex) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -559,7 +559,7 @@ void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeE m_xDelegatorRowUpdate->updateNull(columnIndex); } -void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -569,7 +569,7 @@ void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLExce m_xDelegatorRowUpdate->updateBoolean(columnIndex, x); } -void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -579,7 +579,7 @@ void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLExcepti m_xDelegatorRowUpdate->updateByte(columnIndex, x); } -void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -589,7 +589,7 @@ void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLExcep m_xDelegatorRowUpdate->updateShort(columnIndex, x); } -void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -599,7 +599,7 @@ void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLExcepti m_xDelegatorRowUpdate->updateInt(columnIndex, x); } -void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -609,7 +609,7 @@ void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLExcept m_xDelegatorRowUpdate->updateLong(columnIndex, x); } -void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateFloat(sal_Int32 columnIndex, float x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -619,7 +619,7 @@ void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException m_xDelegatorRowUpdate->updateFloat(columnIndex, x); } -void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateDouble(sal_Int32 columnIndex, double x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -629,7 +629,7 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti m_xDelegatorRowUpdate->updateDouble(columnIndex, x); } -void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -639,7 +639,7 @@ void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( S m_xDelegatorRowUpdate->updateString(columnIndex, x); } -void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -649,7 +649,7 @@ void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& m_xDelegatorRowUpdate->updateBytes(columnIndex, x); } -void OResultSet::updateDate(sal_Int32 columnIndex, const css::util::Date& x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateDate(sal_Int32 columnIndex, const css::util::Date& x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -659,7 +659,7 @@ void OResultSet::updateDate(sal_Int32 columnIndex, const css::util::Date& x) thr m_xDelegatorRowUpdate->updateDate(columnIndex, x); } -void OResultSet::updateTime(sal_Int32 columnIndex, const css::util::Time& x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateTime(sal_Int32 columnIndex, const css::util::Time& x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -669,7 +669,7 @@ void OResultSet::updateTime(sal_Int32 columnIndex, const css::util::Time& x) thr m_xDelegatorRowUpdate->updateTime(columnIndex, x); } -void OResultSet::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -679,7 +679,7 @@ void OResultSet::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTim m_xDelegatorRowUpdate->updateTimestamp(columnIndex, x); } -void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream > & x, sal_Int32 length) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -689,7 +689,7 @@ void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< css: m_xDelegatorRowUpdate->updateBinaryStream(columnIndex, x, length); } -void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream > & x, sal_Int32 length) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -699,7 +699,7 @@ void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< c m_xDelegatorRowUpdate->updateCharacterStream(columnIndex, x, length); } -void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -709,7 +709,7 @@ void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_In m_xDelegatorRowUpdate->updateNumericObject(columnIndex, x, scale); } -void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -720,7 +720,7 @@ void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLExc } // css::sdbc::XResultSet -sal_Bool OResultSet::next() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::next() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -728,7 +728,7 @@ sal_Bool OResultSet::next() throw( SQLException, RuntimeException, std::exceptio return m_xDelegatorResultSet->next(); } -sal_Bool OResultSet::isBeforeFirst() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::isBeforeFirst() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -736,7 +736,7 @@ sal_Bool OResultSet::isBeforeFirst() throw( SQLException, RuntimeException, std: return m_xDelegatorResultSet->isBeforeFirst(); } -sal_Bool OResultSet::isAfterLast() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::isAfterLast() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -744,7 +744,7 @@ sal_Bool OResultSet::isAfterLast() throw( SQLException, RuntimeException, std::e return m_xDelegatorResultSet->isAfterLast(); } -sal_Bool OResultSet::isFirst() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::isFirst() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -752,7 +752,7 @@ sal_Bool OResultSet::isFirst() throw( SQLException, RuntimeException, std::excep return m_xDelegatorResultSet->isFirst(); } -sal_Bool OResultSet::isLast() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::isLast() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -760,7 +760,7 @@ sal_Bool OResultSet::isLast() throw( SQLException, RuntimeException, std::except return m_xDelegatorResultSet->isLast(); } -void OResultSet::beforeFirst() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::beforeFirst() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -768,7 +768,7 @@ void OResultSet::beforeFirst() throw( SQLException, RuntimeException, std::excep m_xDelegatorResultSet->beforeFirst(); } -void OResultSet::afterLast() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::afterLast() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -776,7 +776,7 @@ void OResultSet::afterLast() throw( SQLException, RuntimeException, std::excepti m_xDelegatorResultSet->afterLast(); } -sal_Bool OResultSet::first() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::first() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -784,7 +784,7 @@ sal_Bool OResultSet::first() throw( SQLException, RuntimeException, std::excepti return m_xDelegatorResultSet->first(); } -sal_Bool OResultSet::last() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::last() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -792,7 +792,7 @@ sal_Bool OResultSet::last() throw( SQLException, RuntimeException, std::exceptio return m_xDelegatorResultSet->last(); } -sal_Int32 OResultSet::getRow() throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OResultSet::getRow() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -800,7 +800,7 @@ sal_Int32 OResultSet::getRow() throw( SQLException, RuntimeException, std::excep return m_xDelegatorResultSet->getRow(); } -sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::absolute(sal_Int32 row) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -808,7 +808,7 @@ sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeExcepti return m_xDelegatorResultSet->absolute(row); } -sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::relative(sal_Int32 rows) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -816,7 +816,7 @@ sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeExcept return m_xDelegatorResultSet->relative(rows); } -sal_Bool OResultSet::previous() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::previous() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -824,7 +824,7 @@ sal_Bool OResultSet::previous() throw( SQLException, RuntimeException, std::exce return m_xDelegatorResultSet->previous(); } -void OResultSet::refreshRow() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::refreshRow() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -832,7 +832,7 @@ void OResultSet::refreshRow() throw( SQLException, RuntimeException, std::except m_xDelegatorResultSet->refreshRow(); } -sal_Bool OResultSet::rowUpdated() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::rowUpdated() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -840,7 +840,7 @@ sal_Bool OResultSet::rowUpdated() throw( SQLException, RuntimeException, std::ex return m_xDelegatorResultSet->rowUpdated(); } -sal_Bool OResultSet::rowInserted() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::rowInserted() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -848,7 +848,7 @@ sal_Bool OResultSet::rowInserted() throw( SQLException, RuntimeException, std::e return m_xDelegatorResultSet->rowInserted(); } -sal_Bool OResultSet::rowDeleted() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::rowDeleted() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -856,7 +856,7 @@ sal_Bool OResultSet::rowDeleted() throw( SQLException, RuntimeException, std::ex return m_xDelegatorResultSet->rowDeleted(); } -Reference< XInterface > OResultSet::getStatement() throw( SQLException, RuntimeException, std::exception ) +Reference< XInterface > OResultSet::getStatement() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -865,7 +865,7 @@ Reference< XInterface > OResultSet::getStatement() throw( SQLException, RuntimeE } // css::sdbcx::XRowLocate -Any OResultSet::getBookmark() throw( SQLException, RuntimeException, std::exception ) +Any OResultSet::getBookmark() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -875,7 +875,7 @@ Any OResultSet::getBookmark() throw( SQLException, RuntimeException, std::except return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->getBookmark(); } -sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::moveToBookmark(const Any& bookmark) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -885,7 +885,7 @@ sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, Ru return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveToBookmark(bookmark); } -sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -895,7 +895,7 @@ sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveRelativeToBookmark(bookmark, rows); } -sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -905,7 +905,7 @@ sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) th return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->compareBookmarks(_first, _second); } -sal_Bool OResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::hasOrderedBookmarks() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -915,7 +915,7 @@ sal_Bool OResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->hasOrderedBookmarks(); } -sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OResultSet::hashBookmark(const Any& bookmark) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -926,7 +926,7 @@ sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, Run } // css::sdbc::XResultSetUpdate -void OResultSet::insertRow() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::insertRow() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -936,7 +936,7 @@ void OResultSet::insertRow() throw( SQLException, RuntimeException, std::excepti m_xDelegatorResultSetUpdate->insertRow(); } -void OResultSet::updateRow() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateRow() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -946,7 +946,7 @@ void OResultSet::updateRow() throw( SQLException, RuntimeException, std::excepti m_xDelegatorResultSetUpdate->updateRow(); } -void OResultSet::deleteRow() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::deleteRow() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -956,7 +956,7 @@ void OResultSet::deleteRow() throw( SQLException, RuntimeException, std::excepti m_xDelegatorResultSetUpdate->deleteRow(); } -void OResultSet::cancelRowUpdates() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::cancelRowUpdates() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -966,7 +966,7 @@ void OResultSet::cancelRowUpdates() throw( SQLException, RuntimeException, std:: m_xDelegatorResultSetUpdate->cancelRowUpdates(); } -void OResultSet::moveToInsertRow() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::moveToInsertRow() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -976,7 +976,7 @@ void OResultSet::moveToInsertRow() throw( SQLException, RuntimeException, std::e m_xDelegatorResultSetUpdate->moveToInsertRow(); } -void OResultSet::moveToCurrentRow() throw( SQLException, RuntimeException, std::exception ) +void OResultSet::moveToCurrentRow() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index ecb3c4a4878b..1d9d6e32be6a 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -84,27 +84,27 @@ namespace dbaccess virtual ~OResultSet() 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; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() 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; // 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; // comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -116,104 +116,102 @@ namespace dbaccess css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) 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::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::sdbc::XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // css::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // css::sdbcx::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; // css::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // css::sdbc::XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // css::sdbcx::XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBookmark( ) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; // css::sdbc::XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; protected: void checkReadOnly() const; diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index beb04efa4449..813fa8a450f1 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -61,7 +61,7 @@ OStatementBase::~OStatementBase() } // css::lang::XTypeProvider -Sequence< Type > OStatementBase::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > OStatementBase::getTypes() { OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(), cppu::UnoType<XWarningsSupplier>::get(), @@ -80,7 +80,7 @@ Sequence< Type > OStatementBase::getTypes() throw (RuntimeException, std::except } // css::uno::XInterface -Any OStatementBase::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any OStatementBase::queryInterface( const Type & rType ) { Any aIface = OSubComponent::queryInterface( rType ); if (!aIface.hasValue()) @@ -160,7 +160,7 @@ void OStatementBase::disposing() } // XCloseable -void OStatementBase::close() throw( SQLException, RuntimeException, std::exception ) +void OStatementBase::close() { { MutexGuard aGuard( m_aMutex ); @@ -170,7 +170,7 @@ void OStatementBase::close() throw( SQLException, RuntimeException, std::excepti } // OPropertySetHelper -Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (RuntimeException, std::exception) +Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ) ; } @@ -198,7 +198,7 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim return *getArrayHelper(); } -sal_Bool OStatementBase::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException, RuntimeException, std::exception) +sal_Bool OStatementBase::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) { bool bModified(false); switch (nHandle) @@ -232,7 +232,7 @@ sal_Bool OStatementBase::convertFastPropertyValue(Any & rConvertedValue, Any & r return bModified; } -void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) +void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { switch ( nHandle ) { @@ -287,7 +287,7 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons } // XWarningsSupplier -Any OStatementBase::getWarnings() throw( SQLException, RuntimeException, std::exception ) +Any OStatementBase::getWarnings() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -295,7 +295,7 @@ Any OStatementBase::getWarnings() throw( SQLException, RuntimeException, std::ex return Reference< XWarningsSupplier >(m_xAggregateAsSet, UNO_QUERY)->getWarnings(); } -void OStatementBase::clearWarnings() throw( SQLException, RuntimeException, std::exception ) +void OStatementBase::clearWarnings() { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -304,7 +304,7 @@ void OStatementBase::clearWarnings() throw( SQLException, RuntimeException, std: } // css::util::XCancellable -void OStatementBase::cancel() throw( RuntimeException, std::exception ) +void OStatementBase::cancel() { // no blocking as cancel is typically called from a different thread ClearableMutexGuard aCancelGuard(m_aCancelMutex); @@ -314,7 +314,7 @@ void OStatementBase::cancel() throw( RuntimeException, std::exception ) } // XMultipleResults -Reference< XResultSet > SAL_CALL OStatementBase::getResultSet( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatementBase::getResultSet( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -327,7 +327,7 @@ Reference< XResultSet > SAL_CALL OStatementBase::getResultSet( ) throw(SQLExcep return Reference< XMultipleResults >(m_xAggregateAsSet, UNO_QUERY)->getResultSet(); } -sal_Int32 SAL_CALL OStatementBase::getUpdateCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatementBase::getUpdateCount( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -340,7 +340,7 @@ sal_Int32 SAL_CALL OStatementBase::getUpdateCount( ) throw(SQLException, Runtim return Reference< XMultipleResults >(m_xAggregateAsSet, UNO_QUERY)->getUpdateCount(); } -sal_Bool SAL_CALL OStatementBase::getMoreResults( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatementBase::getMoreResults( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -357,7 +357,7 @@ sal_Bool SAL_CALL OStatementBase::getMoreResults( ) throw(SQLException, Runtime } // XPreparedBatchExecution -void SAL_CALL OStatementBase::addBatch( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatementBase::addBatch( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -370,7 +370,7 @@ void SAL_CALL OStatementBase::addBatch( ) throw(SQLException, RuntimeException, Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch(); } -void SAL_CALL OStatementBase::clearBatch( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatementBase::clearBatch( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -383,7 +383,7 @@ void SAL_CALL OStatementBase::clearBatch( ) throw(SQLException, RuntimeExceptio Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->clearBatch(); } -Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch( ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -399,7 +399,7 @@ Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch( ) throw(SQLExcepti return Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->executeBatch(); } -Reference< XResultSet > SAL_CALL OStatementBase::getGeneratedValues( ) throw (SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatementBase::getGeneratedValues( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -424,24 +424,24 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OStatementBase, OStatement_IFACE ); IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE ); // XServiceInfo -OUString OStatement::getImplementationName( ) throw(RuntimeException, std::exception) +OUString OStatement::getImplementationName( ) { return OUString("com.sun.star.sdb.OStatement"); } -sal_Bool OStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool OStatement::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > OStatement::getSupportedServiceNames( ) { Sequence<OUString> aSNS { SERVICE_SDBC_STATEMENT }; return aSNS; } // XStatement -Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception ) +Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -467,7 +467,7 @@ Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( return xResultSet; } -sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -478,7 +478,7 @@ sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException return m_xAggregateStatement->executeUpdate( sSQL ); } -sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OStatement::execute( const OUString& _rSQL ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -489,7 +489,7 @@ sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, Runti return m_xAggregateStatement->execute( sSQL ); } -void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception ) +void OStatement::addBatch( const OUString& _rSQL ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -503,7 +503,7 @@ void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeE Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch( sSQL ); } -void OStatement::clearBatch( ) throw( SQLException, RuntimeException, std::exception ) +void OStatement::clearBatch( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -515,7 +515,7 @@ void OStatement::clearBatch( ) throw( SQLException, RuntimeException, std::excep Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->clearBatch(); } -Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeException, std::exception ) +Sequence< sal_Int32 > OStatement::executeBatch( ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -527,7 +527,7 @@ Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeEx } -Reference< XConnection > OStatement::getConnection() throw( SQLException, RuntimeException, std::exception ) +Reference< XConnection > OStatement::getConnection() { return Reference< XConnection >( m_xParent, UNO_QUERY ); } diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 85aeaea4ae20..a02c2f9b60b8 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -69,7 +69,7 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ,const OUString& _rName ,const OUString& _rType ,const OUString& _rDesc - ,const Reference< XNameAccess >& _xColumnDefinitions) throw(SQLException) + ,const Reference< XNameAccess >& _xColumnDefinitions) :OTable_Base(_pTables,_rxConn,_rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers(), _rName, _rType, _rDesc, _rSchema, _rCatalog ) ,m_xColumnDefinitions(_xColumnDefinitions) ,m_nPrivileges(0) @@ -84,7 +84,6 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ,const Reference< XConnection >& _rxConn) - throw(SQLException) :OTable_Base(_pTables,_rxConn, _rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers()) ,m_nPrivileges(-1) { @@ -131,7 +130,7 @@ void ODBTable::columnDropped(const OUString& _sName) } } -Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > ODBTable::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -248,7 +247,7 @@ void ODBTable::construct() // XServiceInfo IMPLEMENT_SERVICE_INFO1(ODBTable, "com.sun.star.sdb.dbaccess.ODBTable", SERVICE_SDBCX_TABLE) -Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODBTable::queryInterface( const Type & rType ) { if(rType == cppu::UnoType<XRename>::get()&& !getRenameService().is() ) return Any(); @@ -257,7 +256,7 @@ Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeExcepti return OTable_Base::queryInterface( rType); } -Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL ODBTable::getTypes( ) { Type aRenameType = cppu::UnoType<XRename>::get(); Type aAlterType = cppu::UnoType<XAlterTable>::get(); @@ -278,7 +277,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException, std::ex } // XRename, -void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL ODBTable::rename( const OUString& _rNewName ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed); @@ -291,7 +290,7 @@ void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, } // XAlterTable, -void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed); @@ -306,7 +305,7 @@ void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Referen m_pColumns->refresh(); } -sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) { sal_Int64 nRet(0); if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 4ad8bb8727cd..6d6a5ab9c8de 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -406,7 +406,7 @@ void OTableContainer::dropObject(sal_Int32 _nPos, const OUString& _sElementName) m_bInDrop = false; } -void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) +void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) { ::osl::MutexGuard aGuard(m_rMutex); OUString sName; @@ -424,11 +424,11 @@ void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) th } } -void SAL_CALL OTableContainer::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OTableContainer::elementRemoved( const ContainerEvent& /*Event*/ ) { } -void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) +void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) { // create a new config entry { @@ -448,7 +448,7 @@ void SAL_CALL OTableContainer::disposing() m_pTableMediator = nullptr; } -void SAL_CALL OTableContainer::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL OTableContainer::disposing( const css::lang::EventObject& /*Source*/ ) { } diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 0832b2b9f395..85d72828f28e 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -202,7 +202,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos, const OUString& _sElementName) } } -void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) +void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) { ::osl::MutexGuard aGuard(m_rMutex); OUString sName; @@ -219,7 +219,7 @@ void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) thr } } -void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) +void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) { ::osl::MutexGuard aGuard(m_rMutex); OUString sName; @@ -239,11 +239,11 @@ void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) thro } } -void SAL_CALL OViewContainer::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OViewContainer::disposing( const css::lang::EventObject& /*Source*/ ) { } -void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ ) { } 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; }; } diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 30124d96cfe8..27bb127b4dad 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -54,10 +54,10 @@ namespace dbaccess const css::uno::Reference< css::container::XNameAccess >& _xSettings ); - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& _rEvent ) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& _rEvent ) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& _rEvent ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; void notifyElementCreated(const OUString& _sElementName ,const css::uno::Reference< css::beans::XPropertySet>& _xElement); diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 287e13bc332f..0ffd47de5cbc 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -134,45 +134,45 @@ namespace dbaccess ); // css::lang::XTypeProvider - 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; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // css::lang::XServiceInfo - 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( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; + virtual OUString SAL_CALL getImplementationName( ) override; // XContent - virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL getIdentifier( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getContentType( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL addContentEventListener( const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL removeContentEventListener( const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL getIdentifier( ) override ; + virtual OUString SAL_CALL getContentType( ) override ; + virtual void SAL_CALL addContentEventListener( const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override ; + virtual void SAL_CALL removeContentEventListener( const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override ; // XCommandProcessor - virtual sal_Int32 SAL_CALL createCommandIdentifier( ) throw (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 ) throw (css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL abort( sal_Int32 CommandId ) throw (css::uno::RuntimeException, std::exception) override ; + virtual sal_Int32 SAL_CALL createCommandIdentifier( ) 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 ; + virtual void SAL_CALL abort( sal_Int32 CommandId ) override ; // XPropertiesChangeNotifier - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override ; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override ; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override ; - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override ; + virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override ; + virtual void SAL_CALL removeProperty( const OUString& Name ) override ; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) 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 OContentHelper* getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxComponent ); // 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; // 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; inline const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; } css::uno::Reference< css::sdbc::XRow > diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 5f7f0150bb30..5f405d9e7cb3 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -58,156 +58,155 @@ public: // css::lang::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(css::uno::Reference< css::uno::XComponentContext > const & context); private: // css::uno::XInterface: - virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) override; virtual void SAL_CALL acquire() throw () override { TDatabaseDataProvider::acquire(); } virtual void SAL_CALL release() throw () override { TDatabaseDataProvider::release(); } // 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::chart2::data::XDataProvider: - virtual sal_Bool SAL_CALL createDataSourcePossible(const css::uno::Sequence< css::beans::PropertyValue > & aArguments) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource(const css::uno::Sequence< css::beans::PropertyValue > & aArguments) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments(const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const OUString & aRangeRepresentation) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const OUString & aRangeRepresentation) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual sal_Bool SAL_CALL createDataSourcePossible(const css::uno::Sequence< css::beans::PropertyValue > & aArguments) override; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource(const css::uno::Sequence< css::beans::PropertyValue > & aArguments) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments(const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource) override; + virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const OUString & aRangeRepresentation) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const OUString & aRangeRepresentation) override; virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL createDataSequenceByValueArray( - const OUString& aRole, const OUString & aRangeRepresentation) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + const OUString& aRole, const OUString & aRangeRepresentation) override; - virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() override; // css::chart2::data::XRangeXMLConversion: - virtual OUString SAL_CALL convertRangeToXML(const OUString & aRangeRepresentation) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual OUString SAL_CALL convertRangeFromXML(const OUString & aXMLRange) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + virtual OUString SAL_CALL convertRangeToXML(const OUString & aRangeRepresentation) override; + virtual OUString SAL_CALL convertRangeFromXML(const OUString & aXMLRange) override; // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; // css::beans::XPropertySet: - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const css::uno::Any & aValue) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & xListener) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const css::uno::Any & aValue) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) override; + virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & xListener) override; + virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) override; + virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) override; + virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) override; // css::chart2::data::XDatabaseDataProvider: - virtual css::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMasterFields(const css::uno::Sequence< OUString > & the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDetailFields(const css::uno::Sequence< OUString > & the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCommand() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCommand(const OUString & the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCommandType() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCommandType(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFilter(const OUString & the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getApplyFilter() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setApplyFilter( sal_Bool _applyfilter ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getHavingClause() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHavingClause( const OUString& _havingclause ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getGroupBy() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupBy( const OUString& _groupby ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getOrder() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrder( const OUString& _order ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getEscapeProcessing() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEscapeProcessing(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getRowLimit() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowLimit( ::sal_Int32 _rowlimit ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveConnection(const css::uno::Reference< css::sdbc::XConnection > & the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual OUString SAL_CALL getDataSourceName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getMasterFields() override; + virtual void SAL_CALL setMasterFields(const css::uno::Sequence< OUString > & the_value) override; + virtual css::uno::Sequence< OUString > SAL_CALL getDetailFields() override; + virtual void SAL_CALL setDetailFields(const css::uno::Sequence< OUString > & the_value) override; + virtual OUString SAL_CALL getCommand() override; + virtual void SAL_CALL setCommand(const OUString & the_value) override; + virtual ::sal_Int32 SAL_CALL getCommandType() override; + virtual void SAL_CALL setCommandType(::sal_Int32 the_value) override; + virtual OUString SAL_CALL getFilter() override; + virtual void SAL_CALL setFilter(const OUString & the_value) override; + virtual sal_Bool SAL_CALL getApplyFilter() override; + virtual void SAL_CALL setApplyFilter( sal_Bool _applyfilter ) override; + virtual OUString SAL_CALL getHavingClause() override; + virtual void SAL_CALL setHavingClause( const OUString& _havingclause ) override; + virtual OUString SAL_CALL getGroupBy() override; + virtual void SAL_CALL setGroupBy( const OUString& _groupby ) override; + virtual OUString SAL_CALL getOrder() override; + virtual void SAL_CALL setOrder( const OUString& _order ) override; + virtual sal_Bool SAL_CALL getEscapeProcessing() override; + virtual void SAL_CALL setEscapeProcessing(sal_Bool the_value) override; + virtual ::sal_Int32 SAL_CALL getRowLimit() override; + virtual void SAL_CALL setRowLimit( ::sal_Int32 _rowlimit ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() override; + virtual void SAL_CALL setActiveConnection(const css::uno::Reference< css::sdbc::XConnection > & the_value) override; + virtual OUString SAL_CALL getDataSourceName() override; + virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) override; // css::sdbc::XParameters - virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) override; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) override; + virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) override; + virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) override; + virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) override; + virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) override; + virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) override; + virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) override; + virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) override; + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) override; + virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) override; + virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) override; + virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) override; + virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) override; + virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) override; + virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) override; + virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) override; + virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) override; + virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) override; + virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) override; + virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) override; + virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) override; + virtual void SAL_CALL clearParameters() override; // css::sdbc::XRowSet - virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute() override; + virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) override; + virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) override; // css::sdbc::XResultSet - virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next() override; + virtual sal_Bool SAL_CALL isBeforeFirst() override; + virtual sal_Bool SAL_CALL isAfterLast() override; + virtual sal_Bool SAL_CALL isFirst() override; + virtual sal_Bool SAL_CALL isLast() override; + virtual void SAL_CALL beforeFirst() override; + virtual void SAL_CALL afterLast() override; + virtual sal_Bool SAL_CALL first() override; + virtual sal_Bool SAL_CALL last() override; + virtual sal_Int32 SAL_CALL getRow() override; + virtual sal_Bool SAL_CALL absolute(sal_Int32 row) override; + virtual sal_Bool SAL_CALL relative(sal_Int32 rows) override; + virtual sal_Bool SAL_CALL previous() override; + virtual void SAL_CALL refreshRow() override; + virtual sal_Bool SAL_CALL rowUpdated() override; + virtual sal_Bool SAL_CALL rowInserted() override; + virtual sal_Bool SAL_CALL rowDeleted() override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() override; // 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; // ____ XComplexDescriptionAccess ____ - virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setComplexRowDescriptions( const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setComplexColumnDescriptions( const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() override; + virtual void SAL_CALL setComplexRowDescriptions( const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override; + virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() override; + virtual void SAL_CALL setComplexColumnDescriptions( const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ - virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override; + virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override; + virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override; // ____ XChartData (base of XChartDataArray) ____ - virtual void SAL_CALL addChartDataChangeEventListener(const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChartDataChangeEventListener(const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber()throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNotANumber(double nNumber )throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChartDataChangeEventListener(const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual void SAL_CALL removeChartDataChangeEventListener(const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual double SAL_CALL getNotANumber() override; + virtual sal_Bool SAL_CALL isNotANumber(double nNumber ) override; private: DatabaseDataProvider(DatabaseDataProvider &) = delete; void operator =(DatabaseDataProvider &) = delete; diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index 5089c53aa5aa..132f12f0c6b5 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -57,7 +57,7 @@ namespace dbaccess inline virtual void removeMasterContainerListener(){} // ::connectivity::sdbcx::OCollection - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; virtual OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject) override; diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 8d9c070a9e14..9bb283e30819 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -56,10 +56,10 @@ namespace dbaccess ); // css::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // css::lang::XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override; inline void setName( const OUString& _sName ) { m_sName = _sName; } void setDefinition( const css::uno::Reference< css::beans::XPropertySet >& _xDest); diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 69943a81f363..4d7bd244247b 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -206,10 +206,8 @@ namespace dbaccess void SAL_CALL disposing() override; - 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( ) @@ -220,39 +218,39 @@ namespace dbaccess DECLARE_PROPERTYCONTAINER_DEFAULTS(); // css::sdb::XSingleSelectQueryComposer - virtual OUString SAL_CALL getElementaryQuery() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setElementaryQuery( const OUString& _rElementary ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFilter( const OUString& filter ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStructuredFilter( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& filter ) throw (css::sdbc::SQLException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendFilterByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (css::sdbc::SQLException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendGroupByColumn( const css::uno::Reference< css::beans::XPropertySet >& column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroup( const OUString& group ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHavingClause( const OUString& filter ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStructuredHavingClause( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& filter ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendHavingClauseByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (css::sdbc::SQLException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendOrderByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool ascending ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrder( const OUString& order ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getElementaryQuery() override; + virtual void SAL_CALL setElementaryQuery( const OUString& _rElementary ) override; + virtual void SAL_CALL setFilter( const OUString& filter ) override; + virtual void SAL_CALL setStructuredFilter( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& filter ) override; + virtual void SAL_CALL appendFilterByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) override; + virtual void SAL_CALL appendGroupByColumn( const css::uno::Reference< css::beans::XPropertySet >& column ) override; + virtual void SAL_CALL setGroup( const OUString& group ) override; + virtual void SAL_CALL setHavingClause( const OUString& filter ) override; + virtual void SAL_CALL setStructuredHavingClause( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& filter ) override; + virtual void SAL_CALL appendHavingClauseByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) override; + virtual void SAL_CALL appendOrderByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool ascending ) override; + virtual void SAL_CALL setOrder( const OUString& order ) override; // XSingleSelectQueryAnalyzer - virtual OUString SAL_CALL getQuery( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setQuery( const OUString& command ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCommand( const OUString& command,sal_Int32 CommandType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFilter( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getGroup( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getGroupColumns( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getHavingClause( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredHavingClause( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getOrder( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getOrderColumns( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getQueryWithSubstitution( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getQuery( ) override; + virtual void SAL_CALL setQuery( const OUString& command ) override; + virtual void SAL_CALL setCommand( const OUString& command,sal_Int32 CommandType ) override; + virtual OUString SAL_CALL getFilter( ) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) override; + virtual OUString SAL_CALL getGroup( ) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getGroupColumns( ) override; + virtual OUString SAL_CALL getHavingClause( ) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredHavingClause( ) override; + virtual OUString SAL_CALL getOrder( ) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getOrderColumns( ) override; + virtual OUString SAL_CALL getQueryWithSubstitution( ) 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; // 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; // XParametersSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters( ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_SINGLESELECTQUERYCOMPOSER_HXX diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 1603f7ae8cb8..994d46d49ec3 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -91,15 +91,12 @@ namespace dbaccess css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue - ) - - throw (css::uno::Exception, std::exception) override; + ) override; virtual ~ODBTableDecorator() override; public: @@ -116,18 +113,18 @@ namespace dbaccess const css::uno::Reference< css::sdbcx::XColumnsSupplier >& _rxTable, const css::uno::Reference< css::util::XNumberFormatsSupplier >& _rxNumberFormats, const css::uno::Reference< css::container::XNameAccess >& _rxColumnDefinitions - ) throw(css::sdbc::SQLException); + ); // ODescriptor void construct(); //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; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -135,29 +132,29 @@ namespace dbaccess // css::lang::XServiceInfo DECLARE_SERVICE_INFO(); // 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; // css::sdbcx::XRename, - virtual void SAL_CALL rename( const OUString& _rNewName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& _rNewName ) override; // css::sdbcx::XAlterTable, - virtual void SAL_CALL alterColumnByName( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL alterColumnByName( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) override; + virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) 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(); // 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; // XKeysSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getKeys( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getKeys( ) override; // XIndexesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getIndexes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getIndexes( ) override; // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; protected: using ODataSettings::getFastPropertyValue; diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx index bc9739d4b202..104ffec65004 100644 --- a/dbaccess/source/core/inc/View.hxx +++ b/dbaccess/source/core/inc/View.hxx @@ -51,7 +51,7 @@ namespace dbaccess DECLARE_XTYPEPROVIDER() // XAlterView - virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL alterCommand( const OUString& NewCommand ) override; protected: virtual ~View() override; diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx index 47bc6c57c862..2f862cf0a005 100644 --- a/dbaccess/source/core/inc/callablestatement.hxx +++ b/dbaccess/source/core/inc/callablestatement.hxx @@ -38,43 +38,43 @@ namespace dbaccess :OPreparedStatement(_xConn, _xStatement){} // 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 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; // css::sdbc::XOutParameters - virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) override; // css::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CALLABLESTATEMENT_HXX diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index 775c2bd14bde..37856c0e32ce 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -80,28 +80,28 @@ namespace dbaccess virtual ~OColumn() 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 = 0; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override = 0; // 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::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; // cppu::OComponentHelper virtual void SAL_CALL disposing() 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; // XNamed - virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& _rName ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& _rName ) override; virtual void fireValueChange( const ::connectivity::ORowSetValue& _rOldValue ); @@ -159,7 +159,7 @@ namespace dbaccess bool m_bAddColumn : 1; bool m_bDropColumn : 1; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override; virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; @@ -209,20 +209,20 @@ namespace dbaccess virtual ~OColumns() 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 { OColumns_BASE::acquire(); } virtual void SAL_CALL release() throw() override { OColumns_BASE::release(); } //XTypeProvider - 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; // 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::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; void append(const OUString& rName, OColumn*); void clearColumns(); diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index e9ff214a1140..06cf36a1aa54 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -80,22 +80,22 @@ namespace dbaccess DECLARE_XINTERFACE( ) // css::lang::XTypeProvider - 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; // 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; // 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; // ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // ::cppu::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; private: void impl_registerProperties(); @@ -116,10 +116,10 @@ namespace dbaccess OTableColumn(const OUString& _rName); // XTypeProvider - 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -155,10 +155,10 @@ namespace dbaccess ); // XTypeProvider - 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; // *Property* virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -201,13 +201,11 @@ namespace dbaccess css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) 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; protected: OUString impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const; @@ -232,11 +230,11 @@ namespace dbaccess const bool _bPureWrap, const bool _bIsDescriptor ); // css::lang::XTypeProvider - 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; // 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; // OIdPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const override; @@ -251,13 +249,11 @@ namespace dbaccess css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) 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; protected: using OColumnWrapper::getFastPropertyValue; @@ -280,11 +276,11 @@ namespace dbaccess const bool _bPureWrap ); // css::lang::XTypeProvider - 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; // 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; // OIdPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 4d32d2055720..614a8023de65 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -164,53 +164,51 @@ 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 - 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; // 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; // XContainerApproveBroadcaster - virtual void SAL_CALL addContainerApproveListener( const css::uno::Reference< css::container::XContainerApproveListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerApproveListener( const css::uno::Reference< css::container::XContainerApproveListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerApproveListener( const css::uno::Reference< css::container::XContainerApproveListener >& Listener ) override; + virtual void SAL_CALL removeContainerApproveListener( const css::uno::Reference< css::container::XContainerApproveListener >& Listener ) 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; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XVetoableChangeListener - virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) override; protected: // helper @@ -232,7 +230,7 @@ protected: @see createObject */ css::uno::Reference< css::ucb::XContent > - implGetByName(const OUString& _rName, bool _bCreateIfNecessary) throw (css::container::NoSuchElementException); + implGetByName(const OUString& _rName, bool _bCreateIfNecessary); /** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e. if there is such an object which is not already loaded, it won't be loaded now. diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index fe5397ffcbb7..2501a1bf5fdb 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -49,58 +49,58 @@ namespace dbaccess virtual ~OPreparedStatement() 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::sdbc::XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // css::sdbcx::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; // css::sdbc::XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // css::sdbc::XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_PREPAREDSTATEMENT_HXX diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 659f2c951e2c..2271cb408e34 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -61,35 +61,34 @@ namespace dbaccess OQueryComposer( const css::uno::Reference< css::sdbc::XConnection>& _xConnection ); // 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; // 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; // XSQLQueryComposer - virtual OUString SAL_CALL getQuery( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setQuery( const OUString& command ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getComposedQuery( ) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFilter( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getOrder( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendFilterByColumn( const css::uno::Reference< css::beans::XPropertySet >& column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendOrderByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool ascending ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFilter( const OUString& filter ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrder( const OUString& order ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getQuery( ) override; + virtual void SAL_CALL setQuery( const OUString& command ) override; + virtual OUString SAL_CALL getComposedQuery( ) override; + virtual OUString SAL_CALL getFilter( ) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) override; + virtual OUString SAL_CALL getOrder( ) override; + virtual void SAL_CALL appendFilterByColumn( const css::uno::Reference< css::beans::XPropertySet >& column ) override; + virtual void SAL_CALL appendOrderByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool ascending ) override; + virtual void SAL_CALL setFilter( const OUString& filter ) override; + virtual void SAL_CALL setOrder( const OUString& order ) override; // 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; // 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; // XParametersSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters( ) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCOMPOSER_HXX diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index ff60984f0d79..50def772615a 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -125,34 +125,34 @@ namespace dbaccess DECLARE_SERVICE_INFO(); // css::container::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; // XContainerApproveListener - virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveInsertElement( const css::container::ContainerEvent& Event ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveReplaceElement( const css::container::ContainerEvent& Event ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveRemoveElement( const css::container::ContainerEvent& Event ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveInsertElement( const css::container::ContainerEvent& Event ) override; + virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveReplaceElement( const css::container::ContainerEvent& Event ) override; + virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveRemoveElement( const css::container::ContainerEvent& 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; // css::sdbcx::XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; // css::sdbcx::XAppend - virtual void SAL_CALL appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; // css::sdbcx::XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; // css::container::XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // css::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; // css::container::XNameAccess - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; private: // OContentHelper overridables diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index 7d7b7f09ed68..0c5d0e4d243f 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -67,10 +67,10 @@ public: // css::lang::XTypeProvider - 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; // 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; @@ -78,7 +78,7 @@ public: 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; // comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -90,38 +90,34 @@ 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::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::util::XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) 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; // css::sdbc::XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; // css::sdbc::XPreparedBatchExecution - virtual void SAL_CALL addBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addBatch( ) override; + virtual void SAL_CALL clearBatch( ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) override; // css::sdbc::XGeneratedResultSet - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues( ) override; // Helper void disposeResultSet(); @@ -153,23 +149,23 @@ public: DECLARE_XTYPEPROVIDER() // 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::sdbc::XStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XBatchExecution - virtual void SAL_CALL addBatch( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addBatch( const OUString& sql ) override; + virtual void SAL_CALL clearBatch( ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) override; using OStatementBase::addBatch; diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 092202d36e4a..ff8279e9bd41 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -110,23 +110,21 @@ namespace dbaccess , const OUString& _rName ,const OUString& _rType , const OUString& _rDesc - ,const css::uno::Reference< css::container::XNameAccess >& _rxColumnDefinitions) - throw(css::sdbc::SQLException); + ,const css::uno::Reference< css::container::XNameAccess >& _rxColumnDefinitions); /// @throws css::sdbc::SQLException ODBTable(connectivity::sdbcx::OCollection* _pTables - ,const css::uno::Reference< css::sdbc::XConnection >& _rxConn) - throw(css::sdbc::SQLException); + ,const css::uno::Reference< css::sdbc::XConnection >& _rxConn); virtual ~ODBTable() override; // ODescriptor virtual void construct() override; //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) 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; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // css::lang::XServiceInfo @@ -136,13 +134,13 @@ namespace dbaccess virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; // css::sdbcx::XRename, - virtual void SAL_CALL rename( const OUString& _rNewName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& _rNewName ) override; // css::sdbcx::XAlterTable, - virtual void SAL_CALL alterColumnByName( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL alterColumnByName( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) 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; private: using OTable_Base::createArrayHelper; diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index f413ca467066..3f70afe41bc6 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -68,11 +68,11 @@ namespace dbaccess DECLARE_SERVICE_INFO(); // 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; // 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; public: /** ctor of the container. The parent has to support the <type scope="css::sdbc">XConnection</type> diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx index ce6277d24eb6..5d3f3bf5c8ca 100644 --- a/dbaccess/source/core/inc/veto.hxx +++ b/dbaccess/source/core/inc/veto.hxx @@ -41,8 +41,8 @@ namespace dbaccess public: Veto( const OUString& _rReason, const css::uno::Any& _rDetails ); - virtual OUString SAL_CALL getReason() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getDetails() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getReason() override; + virtual css::uno::Any SAL_CALL getDetails() override; protected: virtual ~Veto() override; diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index b8fd46b884c4..c6b212771222 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -79,11 +79,11 @@ namespace dbaccess DECLARE_SERVICE_INFO(); // 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; // 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; // ::connectivity::sdbcx::OCollection virtual ::connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override; diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index 802b802fc575..8490f3d288a6 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -95,7 +95,7 @@ void OContainerMediator::impl_cleanup_nothrow() } } -void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) +void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ) { ::osl::MutexGuard aGuard(m_aMutex); if ( _rEvent.Source == m_xSettings && m_xSettings.is() ) @@ -111,7 +111,7 @@ void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent } } -void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) +void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent ) { ::osl::MutexGuard aGuard(m_aMutex); Reference< XContainer > xContainer = m_xContainer; @@ -133,7 +133,7 @@ void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent } } -void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) +void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent ) { Reference< XContainer > xContainer = m_xContainer; if ( _rEvent.Source == xContainer && xContainer.is() ) @@ -165,7 +165,7 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent } } -void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) throw(RuntimeException, std::exception) +void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index b7921916e576..21bbac3bd3f5 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -100,34 +100,34 @@ void SAL_CALL DatabaseDataProvider::disposing() m_xActiveConnection.clear(); } -uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type) throw (uno::RuntimeException, std::exception) +uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type) { return TDatabaseDataProvider::queryInterface(type); } -OUString DatabaseDataProvider::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString DatabaseDataProvider::getImplementationName_Static( ) { return OUString("com.sun.star.comp.dbaccess.DatabaseDataProvider"); } // XServiceInfo -OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) throw(uno::RuntimeException, std::exception) +OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static( ) throw (uno::RuntimeException) +uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static( ) { uno::Sequence<OUString> aSNS { "com.sun.star.chart2.data.DatabaseDataProvider" }; return aSNS; } -uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } @@ -138,7 +138,7 @@ uno::Reference< uno::XInterface > DatabaseDataProvider::Create(uno::Reference< u } // lang::XInitialization: -void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) +void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > & aArguments) { osl::MutexGuard g(m_aMutex); const uno::Any* pIter = aArguments.getConstArray(); @@ -154,7 +154,7 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > & } // chart2::data::XDataProvider: -sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequence< beans::PropertyValue > & _aArguments) { const beans::PropertyValue* pArgIter = _aArguments.getConstArray(); const beans::PropertyValue* pArgEnd = pArgIter + _aArguments.getLength(); @@ -185,7 +185,7 @@ sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequ return true; } -uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::createDataSource(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) +uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::createDataSource(const uno::Sequence< beans::PropertyValue > & _aArguments) { osl::ResettableMutexGuard aClearForNotifies(m_aMutex); if ( createDataSourcePossible(_aArguments) ) @@ -239,7 +239,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat return m_xInternal->createDataSource(_aArguments); } -uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArguments(const uno::Reference< chart2::data::XDataSource > & _xDataSource) throw (uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArguments(const uno::Reference< chart2::data::XDataSource > & _xDataSource) { ::comphelper::NamedValueCollection aArguments; aArguments.put( "CellRangeRepresentation", uno::Any( OUString( "all" ) ) ); @@ -273,7 +273,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum return aArguments.getPropertyValues(); } -sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/) { return true; } @@ -286,7 +286,7 @@ uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString & return uno::makeAny(sal_Int32(0)); } -uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) +uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString & _sRangeRepresentation) { osl::MutexGuard g(m_aMutex); uno::Reference< chart2::data::XDataSequence > xData = m_xInternal->createDataSequenceByRangeRepresentation(_sRangeRepresentation); @@ -302,84 +302,83 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::cre uno::Reference<chart2::data::XDataSequence> SAL_CALL DatabaseDataProvider::createDataSequenceByValueArray( const OUString& /*aRole*/, const OUString& /*aRangeRepresentation*/ ) - throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { return uno::Reference<chart2::data::XDataSequence>(); } -uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() { return m_xComplexDescriptionAccess->getComplexRowDescriptions(); } -void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aRowDescriptions ) { m_xComplexDescriptionAccess->setComplexRowDescriptions(aRowDescriptions); } -uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() { return m_xComplexDescriptionAccess->getComplexColumnDescriptions(); } -void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aColumnDescriptions ) { m_xComplexDescriptionAccess->setComplexColumnDescriptions(aColumnDescriptions); } // ____ XChartDataArray ____ -uno::Sequence< uno::Sequence< double > > SAL_CALL DatabaseDataProvider::getData() throw (uno::RuntimeException, std::exception) +uno::Sequence< uno::Sequence< double > > SAL_CALL DatabaseDataProvider::getData() { return m_xComplexDescriptionAccess->getData(); } -void SAL_CALL DatabaseDataProvider::setData( const uno::Sequence< uno::Sequence< double > >& rDataInRows ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setData( const uno::Sequence< uno::Sequence< double > >& rDataInRows ) { m_xComplexDescriptionAccess->setData(rDataInRows); } -void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< OUString >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< OUString >& aRowDescriptions ) { m_xComplexDescriptionAccess->setRowDescriptions(aRowDescriptions); } -void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< OUString >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< OUString >& aColumnDescriptions ) { m_xComplexDescriptionAccess->setColumnDescriptions(aColumnDescriptions); } -uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() { return m_xComplexDescriptionAccess->getRowDescriptions(); } -uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() { return m_xComplexDescriptionAccess->getColumnDescriptions(); } // ____ XChartData (base of XChartDataArray) ____ -void SAL_CALL DatabaseDataProvider::addChartDataChangeEventListener(const uno::Reference< css::chart::XChartDataChangeEventListener >& x) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::addChartDataChangeEventListener(const uno::Reference< css::chart::XChartDataChangeEventListener >& x) { m_xComplexDescriptionAccess->addChartDataChangeEventListener(x); } -void SAL_CALL DatabaseDataProvider::removeChartDataChangeEventListener(const uno::Reference< css::chart::XChartDataChangeEventListener >& x) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::removeChartDataChangeEventListener(const uno::Reference< css::chart::XChartDataChangeEventListener >& x) { m_xComplexDescriptionAccess->removeChartDataChangeEventListener(x); } -double SAL_CALL DatabaseDataProvider::getNotANumber() throw (uno::RuntimeException, std::exception) +double SAL_CALL DatabaseDataProvider::getNotANumber() { return m_xComplexDescriptionAccess->getNotANumber(); } -sal_Bool SAL_CALL DatabaseDataProvider::isNotANumber( double nNumber ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DatabaseDataProvider::isNotANumber( double nNumber ) { return m_xComplexDescriptionAccess->isNotANumber(nNumber); } -uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRangeSelection() throw (uno::RuntimeException, std::exception) +uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRangeSelection() { // TODO: Exchange the default return implementation for "getRangeSelection" !!! // Exchange the default return implementation. @@ -390,85 +389,85 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRange } // chart2::data::XRangeXMLConversion: -OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) +OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const OUString & _sRangeRepresentation) { osl::MutexGuard g(m_aMutex); return m_xRangeConversion->convertRangeToXML(_sRangeRepresentation); } -OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) +OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const OUString & _sXMLRange) { osl::MutexGuard g(m_aMutex); return m_xRangeConversion->convertRangeFromXML(_sXMLRange); } // com.sun.star.beans.XPropertySet: -uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getPropertySetInfo() { return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertySetInfo(); } -void SAL_CALL DatabaseDataProvider::setPropertyValue(const OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, std::exception) +void SAL_CALL DatabaseDataProvider::setPropertyValue(const OUString & aPropertyName, const uno::Any & aValue) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::setPropertyValue(aPropertyName, aValue); } -uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) +uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const OUString & aPropertyName) { return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertyValue(aPropertyName); } -void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) +void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addPropertyChangeListener(aPropertyName, xListener); } -void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) +void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removePropertyChangeListener(aPropertyName, xListener); } -void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) +void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addVetoableChangeListener(aPropertyName, xListener); } -void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) +void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removeVetoableChangeListener(aPropertyName, xListener); } // chart2::data::XDatabaseDataProvider: -uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getMasterFields() { osl::MutexGuard g(m_aMutex); return m_MasterFields; } -void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< OUString > & the_value) { impl_invalidateParameter_nothrow(); set("MasterFields",the_value,m_MasterFields); } -uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getDetailFields() { osl::MutexGuard g(m_aMutex); return m_DetailFields; } -void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< OUString > & the_value) { set("DetailFields",the_value,m_DetailFields); } -OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL DatabaseDataProvider::getCommand() { osl::MutexGuard g(m_aMutex); return m_Command; } -void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) { { osl::MutexGuard g(m_aMutex); @@ -478,13 +477,13 @@ void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw set(PROPERTY_COMMAND,the_value,m_Command); } -::sal_Int32 SAL_CALL DatabaseDataProvider::getCommandType() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL DatabaseDataProvider::getCommandType() { osl::MutexGuard g(m_aMutex); return m_CommandType; } -void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) { { osl::MutexGuard g(m_aMutex); @@ -493,13 +492,13 @@ void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw set(PROPERTY_COMMAND_TYPE,the_value,m_CommandType); } -OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL DatabaseDataProvider::getFilter() { osl::MutexGuard g(m_aMutex); return m_aFilterManager.getFilterComponent( dbtools::FilterManager::FilterComponent::PublicFilter ); } -void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) { { osl::MutexGuard g(m_aMutex); @@ -508,13 +507,13 @@ void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw set(PROPERTY_FILTER,the_value,m_Filter); } -sal_Bool SAL_CALL DatabaseDataProvider::getApplyFilter() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL DatabaseDataProvider::getApplyFilter() { osl::MutexGuard g(m_aMutex); return m_ApplyFilter; } -void SAL_CALL DatabaseDataProvider::setApplyFilter( sal_Bool the_value ) throw (RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setApplyFilter( sal_Bool the_value ) { { osl::MutexGuard g(m_aMutex); @@ -523,13 +522,13 @@ void SAL_CALL DatabaseDataProvider::setApplyFilter( sal_Bool the_value ) throw ( set(PROPERTY_APPLYFILTER,(bool)the_value,m_ApplyFilter); } -OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL DatabaseDataProvider::getHavingClause() { osl::MutexGuard g(m_aMutex); return m_HavingClause; } -void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value ) { { osl::MutexGuard g(m_aMutex); @@ -538,13 +537,13 @@ void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value ) set(PROPERTY_HAVING_CLAUSE,the_value,m_HavingClause); } -OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL DatabaseDataProvider::getGroupBy() { osl::MutexGuard g(m_aMutex); return m_GroupBy; } -void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) { { osl::MutexGuard g(m_aMutex); @@ -553,13 +552,13 @@ void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) thro set(PROPERTY_GROUP_BY,the_value,m_GroupBy); } -OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL DatabaseDataProvider::getOrder() { osl::MutexGuard g(m_aMutex); return m_Order; } -void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) { { osl::MutexGuard g(m_aMutex); @@ -568,48 +567,48 @@ void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) throw set(PROPERTY_ORDER,the_value,m_Order); } -sal_Bool SAL_CALL DatabaseDataProvider::getEscapeProcessing() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DatabaseDataProvider::getEscapeProcessing() { osl::MutexGuard g(m_aMutex); return m_EscapeProcessing; } -void SAL_CALL DatabaseDataProvider::setEscapeProcessing(sal_Bool the_value) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setEscapeProcessing(sal_Bool the_value) { set(PROPERTY_ESCAPE_PROCESSING,(bool)the_value,m_EscapeProcessing); } -::sal_Int32 SAL_CALL DatabaseDataProvider::getRowLimit() throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL DatabaseDataProvider::getRowLimit() { osl::MutexGuard g(m_aMutex); return m_RowLimit; } -void SAL_CALL DatabaseDataProvider::setRowLimit(::sal_Int32 the_value) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setRowLimit(::sal_Int32 the_value) { set("RowLimit",the_value,m_RowLimit); } -uno::Reference< sdbc::XConnection > SAL_CALL DatabaseDataProvider::getActiveConnection() throw (uno::RuntimeException, std::exception) +uno::Reference< sdbc::XConnection > SAL_CALL DatabaseDataProvider::getActiveConnection() { osl::MutexGuard g(m_aMutex); return m_xActiveConnection; } -void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sdbc::XConnection > & the_value) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) +void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sdbc::XConnection > & the_value) { if ( !the_value.is() ) throw lang::IllegalArgumentException(); set(PROPERTY_ACTIVE_CONNECTION,the_value,m_xActiveConnection); } -OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL DatabaseDataProvider::getDataSourceName() { osl::MutexGuard g(m_aMutex); return m_DataSourceName; } -void SAL_CALL DatabaseDataProvider::setDataSourceName(const OUString& the_value) throw (uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setDataSourceName(const OUString& the_value) { set(PROPERTY_DATASOURCENAME,the_value,m_DataSourceName); } @@ -845,237 +844,237 @@ bool DatabaseDataProvider::impl_fillParameters_nothrow( ::osl::ResettableMutexGu } // css::sdbc::XParameters -void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) { m_aParameterManager.setNull(parameterIndex, sqlType); } -void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) { m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName); } -void SAL_CALL DatabaseDataProvider::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setBoolean(sal_Int32 parameterIndex, sal_Bool x) { m_aParameterManager.setBoolean(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setByte(sal_Int32 parameterIndex, sal_Int8 x) { m_aParameterManager.setByte(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setShort(sal_Int32 parameterIndex, sal_Int16 x) { m_aParameterManager.setShort(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setInt(sal_Int32 parameterIndex, sal_Int32 x) { m_aParameterManager.setInt(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setLong(sal_Int32 parameterIndex, sal_Int64 x) { m_aParameterManager.setLong(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setFloat(sal_Int32 parameterIndex, float x) { m_aParameterManager.setFloat(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x) { m_aParameterManager.setDouble(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const OUString& x) { m_aParameterManager.setString(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setBytes(sal_Int32 parameterIndex, const uno::Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setBytes(sal_Int32 parameterIndex, const uno::Sequence< sal_Int8 >& x) { m_aParameterManager.setBytes(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setDate(sal_Int32 parameterIndex, const util::Date& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setDate(sal_Int32 parameterIndex, const util::Date& x) { m_aParameterManager.setDate(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setTime(sal_Int32 parameterIndex, const util::Time& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setTime(sal_Int32 parameterIndex, const util::Time& x) { m_aParameterManager.setTime(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setTimestamp(sal_Int32 parameterIndex, const util::DateTime& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setTimestamp(sal_Int32 parameterIndex, const util::DateTime& x) { m_aParameterManager.setTimestamp(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setBinaryStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setBinaryStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) { m_aParameterManager.setBinaryStream(parameterIndex, x, length); } -void SAL_CALL DatabaseDataProvider::setCharacterStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setCharacterStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) { m_aParameterManager.setCharacterStream(parameterIndex, x, length); } -void SAL_CALL DatabaseDataProvider::setObjectWithInfo(sal_Int32 parameterIndex, const uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setObjectWithInfo(sal_Int32 parameterIndex, const uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) { m_aParameterManager.setObjectWithInfo(parameterIndex, x, targetSqlType, scale); } -void SAL_CALL DatabaseDataProvider::setObject(sal_Int32 parameterIndex, const uno::Any& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setObject(sal_Int32 parameterIndex, const uno::Any& x) { m_aParameterManager.setObject(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setRef(sal_Int32 parameterIndex, const uno::Reference<sdbc::XRef>& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setRef(sal_Int32 parameterIndex, const uno::Reference<sdbc::XRef>& x) { m_aParameterManager.setRef(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setBlob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XBlob>& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setBlob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XBlob>& x) { m_aParameterManager.setBlob(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setClob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XClob>& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setClob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XClob>& x) { m_aParameterManager.setClob(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::setArray(sal_Int32 parameterIndex, const Reference<sdbc::XArray>& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::setArray(sal_Int32 parameterIndex, const Reference<sdbc::XArray>& x) { m_aParameterManager.setArray(parameterIndex, x); } -void SAL_CALL DatabaseDataProvider::clearParameters() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::clearParameters() { m_aParameterManager.clearParameters(); } // css::sdbc::XRowSet -void SAL_CALL DatabaseDataProvider::execute() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::execute() { uno::Sequence< beans::PropertyValue > aEmpty; createDataSource(aEmpty); } -void SAL_CALL DatabaseDataProvider::addRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::addRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) { if (m_xRowSet.is()) m_xRowSet->addRowSetListener(_rListener); } -void SAL_CALL DatabaseDataProvider::removeRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::removeRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) { if (m_xRowSet.is()) m_xRowSet->removeRowSetListener(_rListener); } // css::sdbc::XResultSet -sal_Bool SAL_CALL DatabaseDataProvider::next() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::next() { return m_xRowSet->next(); } -sal_Bool SAL_CALL DatabaseDataProvider::isBeforeFirst() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::isBeforeFirst() { return m_xRowSet->isBeforeFirst(); } -sal_Bool SAL_CALL DatabaseDataProvider::isAfterLast() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::isAfterLast() { return m_xRowSet->isAfterLast(); } -sal_Bool SAL_CALL DatabaseDataProvider::isFirst() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::isFirst() { return m_xRowSet->isFirst(); } -sal_Bool SAL_CALL DatabaseDataProvider::isLast() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::isLast() { return m_xRowSet->isLast(); } -void SAL_CALL DatabaseDataProvider::beforeFirst() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::beforeFirst() { m_xRowSet->beforeFirst(); } -void SAL_CALL DatabaseDataProvider::afterLast() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::afterLast() { m_xRowSet->afterLast(); } -sal_Bool SAL_CALL DatabaseDataProvider::first() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::first() { return m_xRowSet->first(); } -sal_Bool SAL_CALL DatabaseDataProvider::last() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::last() { return m_xRowSet->last(); } -sal_Int32 SAL_CALL DatabaseDataProvider::getRow() throw( SQLException, RuntimeException, std::exception ) +sal_Int32 SAL_CALL DatabaseDataProvider::getRow() { return m_xRowSet->getRow(); } -sal_Bool SAL_CALL DatabaseDataProvider::absolute(sal_Int32 row) throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::absolute(sal_Int32 row) { return m_xRowSet->absolute(row); } -sal_Bool SAL_CALL DatabaseDataProvider::relative(sal_Int32 rows) throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::relative(sal_Int32 rows) { return m_xRowSet->relative(rows); } -sal_Bool SAL_CALL DatabaseDataProvider::previous() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::previous() { return m_xRowSet->previous(); } -void SAL_CALL DatabaseDataProvider::refreshRow() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL DatabaseDataProvider::refreshRow() { m_xRowSet->refreshRow(); } -sal_Bool SAL_CALL DatabaseDataProvider::rowUpdated() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::rowUpdated() { return m_xRowSet->rowUpdated(); } -sal_Bool SAL_CALL DatabaseDataProvider::rowInserted() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::rowInserted() { return m_xRowSet->rowInserted(); } -sal_Bool SAL_CALL DatabaseDataProvider::rowDeleted() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL DatabaseDataProvider::rowDeleted() { return m_xRowSet->rowDeleted(); } -uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getStatement() throw( SQLException, RuntimeException, std::exception ) +uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getStatement() { return m_xRowSet->getStatement(); } -uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getParent( ) throw (uno::RuntimeException, std::exception) +uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getParent( ) { return m_xParent; } -void SAL_CALL DatabaseDataProvider::setParent( const uno::Reference< uno::XInterface >& _xParent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception) +void SAL_CALL DatabaseDataProvider::setParent( const uno::Reference< uno::XInterface >& _xParent ) { osl::MutexGuard g(m_aMutex); m_xParent = _xParent; diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 94585ee04a6f..c128c2e1f6b6 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -70,7 +70,7 @@ namespace dbaccess { } - void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) + void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -112,7 +112,7 @@ namespace dbaccess } } - void SAL_CALL OPropertyForward::disposing( const css::lang::EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) + void SAL_CALL OPropertyForward::disposing( const css::lang::EventObject& /*_rSource*/ ) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index d23a5d0b7cb1..879f86516e6a 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -43,7 +43,7 @@ OSubComponent::~OSubComponent() } // css::lang::XTypeProvider -Sequence< Type > OSubComponent::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > OSubComponent::getTypes() { OTypeCollection aTypes(cppu::UnoType<XComponent>::get(), cppu::UnoType<XTypeProvider>::get(), @@ -103,7 +103,7 @@ void OSubComponent::release() throw ( ) OWeakAggObject::release(); } -Any OSubComponent::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any OSubComponent::queryInterface( const Type & rType ) { Any aReturn; if (!rType.equals(cppu::UnoType<XAggregation>::get())) diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx index 89a359ce2f91..81331252cfbc 100644 --- a/dbaccess/source/core/misc/veto.cxx +++ b/dbaccess/source/core/misc/veto.cxx @@ -36,12 +36,12 @@ namespace dbaccess { } - OUString SAL_CALL Veto::getReason() throw (RuntimeException, std::exception) + OUString SAL_CALL Veto::getReason() { return m_sReason; } - Any SAL_CALL Veto::getDetails() throw (RuntimeException, std::exception) + Any SAL_CALL Veto::getDetails() { return m_aDetails; } diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx index fbb9d0b5f0f2..78c2ee85d2be 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.cxx +++ b/dbaccess/source/core/recovery/subcomponentloader.cxx @@ -129,19 +129,19 @@ namespace dbaccess m_pData = nullptr; } - void SAL_CALL SubComponentLoader::windowResized( const WindowEvent& i_rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL SubComponentLoader::windowResized( const WindowEvent& i_rEvent ) { // not interested in (void)i_rEvent; } - void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent ) { // not interested in (void)i_rEvent; } - void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent ) { (void)i_rEvent; @@ -149,13 +149,13 @@ namespace dbaccess m_pData->xAppComponentWindow->removeWindowListener( this ); } - void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent ) { // not interested in (void)i_rEvent; } - void SAL_CALL SubComponentLoader::disposing( const EventObject& i_rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL SubComponentLoader::disposing( const EventObject& i_rEvent ) { // not interested in (void)i_rEvent; diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx index 0ec0297847b1..c839d2384b43 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.hxx +++ b/dbaccess/source/core/recovery/subcomponentloader.hxx @@ -53,13 +53,13 @@ namespace dbaccess ); // XWindowListener - virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override; + virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) 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; protected: virtual ~SubComponentLoader() override; diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index 220964ab0d40..7e43408bc6f1 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -252,14 +252,14 @@ namespace dbaccess public: // XDocumentHandler - virtual void SAL_CALL startDocument( ) throw (SAXException, RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument( ) throw (SAXException, RuntimeException, std::exception) override; - virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException, std::exception) override; - virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException, std::exception) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument( ) override; + virtual void SAL_CALL endDocument( ) override; + virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override; + virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) override; const ::comphelper::NamedValueCollection& getSettings() const { return m_aSettings; } @@ -268,15 +268,15 @@ namespace dbaccess ::comphelper::NamedValueCollection m_aSettings; }; - void SAL_CALL SettingsDocumentHandler::startDocument( ) throw (SAXException, RuntimeException, std::exception) + void SAL_CALL SettingsDocumentHandler::startDocument( ) { } - void SAL_CALL SettingsDocumentHandler::endDocument( ) throw (SAXException, RuntimeException, std::exception) + void SAL_CALL SettingsDocumentHandler::endDocument( ) { } - void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException, std::exception) + void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) { ::rtl::Reference< SettingsImport > pNewState; @@ -307,7 +307,7 @@ namespace dbaccess m_aStates.push( pNewState ); } - void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException, std::exception) + void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); (void)i_Name; @@ -317,7 +317,7 @@ namespace dbaccess m_aStates.pop(); } - void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException, std::exception) + void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); @@ -325,20 +325,20 @@ namespace dbaccess pCurrentState->characters( i_Chars ); } - void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException, std::exception) + void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) { // ignore them - that's why they're called "ignorable" (void)aWhitespaces; } - void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException, std::exception) + void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) { OSL_FAIL( "SettingsDocumentHandler::processingInstruction: unexpected ..." ); (void)i_Target; (void)i_Data; } - void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException, std::exception) + void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) { (void)i_Locator; } |