diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /ucbhelper/source/provider/resultset.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'ucbhelper/source/provider/resultset.cxx')
-rw-r--r-- | ucbhelper/source/provider/resultset.cxx | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 799910351e93..3b8c9073de13 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -106,12 +106,12 @@ public: // XPropertySetInfo virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); virtual beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( beans::UnknownPropertyException, uno::RuntimeException ); + throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); }; @@ -291,7 +291,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet, // virtual void SAL_CALL ResultSet::dispose() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -317,7 +317,7 @@ void SAL_CALL ResultSet::dispose() // virtual void SAL_CALL ResultSet::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -332,7 +332,7 @@ void SAL_CALL ResultSet::addEventListener( // virtual void SAL_CALL ResultSet::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -348,7 +348,7 @@ void SAL_CALL ResultSet::removeEventListener( // virtual uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -367,7 +367,7 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() // virtual sal_Bool SAL_CALL ResultSet::next() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { // Note: Cursor is initially positioned before the first row. // First call to 'next()' moves it to first row. @@ -396,7 +396,7 @@ sal_Bool SAL_CALL ResultSet::next() // virtual sal_Bool SAL_CALL ResultSet::isBeforeFirst() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -418,7 +418,7 @@ sal_Bool SAL_CALL ResultSet::isBeforeFirst() // virtual sal_Bool SAL_CALL ResultSet::isAfterLast() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return m_pImpl->m_bAfterLast; @@ -427,7 +427,7 @@ sal_Bool SAL_CALL ResultSet::isAfterLast() // virtual sal_Bool SAL_CALL ResultSet::isFirst() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -442,7 +442,7 @@ sal_Bool SAL_CALL ResultSet::isFirst() // virtual sal_Bool SAL_CALL ResultSet::isLast() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -464,7 +464,7 @@ sal_Bool SAL_CALL ResultSet::isLast() // virtual void SAL_CALL ResultSet::beforeFirst() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); m_pImpl->m_bAfterLast = false; @@ -475,7 +475,7 @@ void SAL_CALL ResultSet::beforeFirst() // virtual void SAL_CALL ResultSet::afterLast() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); m_pImpl->m_bAfterLast = true; @@ -485,7 +485,7 @@ void SAL_CALL ResultSet::afterLast() // virtual sal_Bool SAL_CALL ResultSet::first() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { // getResult works zero-based! if ( m_pImpl->m_xDataSupplier->getResult( 0 ) ) @@ -504,7 +504,7 @@ sal_Bool SAL_CALL ResultSet::first() // virtual sal_Bool SAL_CALL ResultSet::last() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { sal_Int32 nCount = m_pImpl->m_xDataSupplier->totalCount(); if ( nCount ) @@ -523,7 +523,7 @@ sal_Bool SAL_CALL ResultSet::last() // virtual sal_Int32 SAL_CALL ResultSet::getRow() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -538,7 +538,7 @@ sal_Int32 SAL_CALL ResultSet::getRow() // virtual sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* If the row number is positive, the cursor moves to the given row number @@ -611,7 +611,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row ) // virtual sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* Attempting to move beyond the first/last row in the result set @@ -681,7 +681,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows ) // virtual sal_Bool SAL_CALL ResultSet::previous() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* previous() is not the same as relative( -1 ) because it makes sense @@ -711,7 +711,7 @@ sal_Bool SAL_CALL ResultSet::previous() // virtual void SAL_CALL ResultSet::refreshRow() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); if ( m_pImpl->m_bAfterLast || ( m_pImpl->m_nPos == 0 ) ) @@ -724,7 +724,7 @@ void SAL_CALL ResultSet::refreshRow() // virtual sal_Bool SAL_CALL ResultSet::rowUpdated() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return sal_False; @@ -733,7 +733,7 @@ sal_Bool SAL_CALL ResultSet::rowUpdated() // virtual sal_Bool SAL_CALL ResultSet::rowInserted() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return sal_False; @@ -742,7 +742,7 @@ sal_Bool SAL_CALL ResultSet::rowInserted() // virtual sal_Bool SAL_CALL ResultSet::rowDeleted() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return sal_False; @@ -751,7 +751,7 @@ sal_Bool SAL_CALL ResultSet::rowDeleted() // virtual uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* returns the Statement that produced this ResultSet object. If the @@ -769,7 +769,7 @@ uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement() // virtual sal_Bool SAL_CALL ResultSet::wasNull() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { // This method can not be implemented correctly!!! Imagine different // threads doing a getXYZ - wasNull calling sequence on the same @@ -794,7 +794,7 @@ sal_Bool SAL_CALL ResultSet::wasNull() // virtual OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -817,7 +817,7 @@ OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) // virtual sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -840,7 +840,7 @@ sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex ) // virtual sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -863,7 +863,7 @@ sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex ) // virtual sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -886,7 +886,7 @@ sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex ) // virtual sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -909,7 +909,7 @@ sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex ) // virtual sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -932,7 +932,7 @@ sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex ) // virtual float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -955,7 +955,7 @@ float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex ) // virtual double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -979,7 +979,7 @@ double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex ) // virtual uno::Sequence< sal_Int8 > SAL_CALL ResultSet::getBytes( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1002,7 +1002,7 @@ ResultSet::getBytes( sal_Int32 columnIndex ) // virtual util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1025,7 +1025,7 @@ util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex ) // virtual util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1049,7 +1049,7 @@ util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex ) // virtual util::DateTime SAL_CALL ResultSet::getTimestamp( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1073,7 +1073,7 @@ ResultSet::getTimestamp( sal_Int32 columnIndex ) // virtual uno::Reference< io::XInputStream > SAL_CALL ResultSet::getBinaryStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1097,7 +1097,7 @@ ResultSet::getBinaryStream( sal_Int32 columnIndex ) // virtual uno::Reference< io::XInputStream > SAL_CALL ResultSet::getCharacterStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1122,7 +1122,7 @@ ResultSet::getCharacterStream( sal_Int32 columnIndex ) uno::Any SAL_CALL ResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< container::XNameAccess >& typeMap ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1146,7 +1146,7 @@ uno::Any SAL_CALL ResultSet::getObject( // virtual uno::Reference< sdbc::XRef > SAL_CALL ResultSet::getRef( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1170,7 +1170,7 @@ ResultSet::getRef( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XBlob > SAL_CALL ResultSet::getBlob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1194,7 +1194,7 @@ ResultSet::getBlob( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XClob > SAL_CALL ResultSet::getClob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1218,7 +1218,7 @@ ResultSet::getClob( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XArray > SAL_CALL ResultSet::getArray( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1246,7 +1246,7 @@ ResultSet::getArray( sal_Int32 columnIndex ) // virtual void SAL_CALL ResultSet::close() - throw( sdbc::SQLException, uno::RuntimeException ) + throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->close(); m_pImpl->m_xDataSupplier->validate(); @@ -1260,7 +1260,7 @@ void SAL_CALL ResultSet::close() // virtual OUString SAL_CALL ResultSet::queryContentIdentifierString() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContentIdentifierString( @@ -1273,7 +1273,7 @@ OUString SAL_CALL ResultSet::queryContentIdentifierString() // virtual uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL ResultSet::queryContentIdentifier() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContentIdentifier( @@ -1286,7 +1286,7 @@ ResultSet::queryContentIdentifier() // virtual uno::Reference< com::sun::star::ucb::XContent > SAL_CALL ResultSet::queryContent() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContent( m_pImpl->m_nPos - 1 ); @@ -1303,7 +1303,7 @@ ResultSet::queryContent() // virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSet::getPropertySetInfo() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -1322,7 +1322,7 @@ void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( aPropertyName.isEmpty() ) throw beans::UnknownPropertyException(); @@ -1351,7 +1351,7 @@ uno::Any SAL_CALL ResultSet::getPropertyValue( const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( PropertyName.isEmpty() ) throw beans::UnknownPropertyException(); @@ -1383,7 +1383,7 @@ void SAL_CALL ResultSet::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // Note: An empty property name means a listener for "all" properties. @@ -1411,7 +1411,7 @@ void SAL_CALL ResultSet::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -1435,7 +1435,7 @@ void SAL_CALL ResultSet::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // No constrained props, at the moment. } @@ -1447,7 +1447,7 @@ void SAL_CALL ResultSet::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // No constrained props, at the moment. } @@ -1614,7 +1614,7 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo, // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return uno::Sequence< beans::Property >( *m_pProps ); } @@ -1623,7 +1623,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() // virtual beans::Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) - throw( beans::UnknownPropertyException, uno::RuntimeException ) + throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) { beans::Property aProp; if ( queryProperty( aName, aProp ) ) @@ -1636,7 +1636,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName( // virtual sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { beans::Property aProp; return queryProperty( Name, aProp ); |