diff options
Diffstat (limited to 'ucbhelper/source/provider/resultset.cxx')
-rw-r--r-- | ucbhelper/source/provider/resultset.cxx | 93 |
1 files changed, 6 insertions, 87 deletions
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 2bf8c54dc45c..b4ba14f7e3f6 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -95,27 +95,21 @@ public: sal_Int32 nProps ); // 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< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) 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() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XPropertySetInfo - virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw( uno::RuntimeException, std::exception ) override; + virtual uno::Sequence< beans::Property > SAL_CALL getProperties() override; virtual beans::Property SAL_CALL getPropertyByName( - const OUString& aName ) - throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) override; + const OUString& aName ) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override; }; typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString> @@ -236,7 +230,6 @@ void SAL_CALL ResultSet::release() } css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -270,19 +263,16 @@ XTYPEPROVIDER_IMPL_9( ResultSet, // XServiceInfo methods. OUString SAL_CALL ResultSet::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "ResultSet" ); } sal_Bool SAL_CALL ResultSet::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL ResultSet::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { RESULTSET_SERVICE_NAME }; } @@ -293,7 +283,6 @@ css::uno::Sequence< OUString > SAL_CALL ResultSet::getSupportedServiceNames() // virtual void SAL_CALL ResultSet::dispose() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -319,7 +308,6 @@ void SAL_CALL ResultSet::dispose() // virtual void SAL_CALL ResultSet::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -334,7 +322,6 @@ void SAL_CALL ResultSet::addEventListener( // virtual void SAL_CALL ResultSet::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -348,7 +335,6 @@ void SAL_CALL ResultSet::removeEventListener( // virtual uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -365,7 +351,6 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() // virtual sal_Bool SAL_CALL ResultSet::next() - 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. @@ -394,7 +379,6 @@ sal_Bool SAL_CALL ResultSet::next() // virtual sal_Bool SAL_CALL ResultSet::isBeforeFirst() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -416,7 +400,6 @@ sal_Bool SAL_CALL ResultSet::isBeforeFirst() // virtual sal_Bool SAL_CALL ResultSet::isAfterLast() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return m_pImpl->m_bAfterLast; @@ -425,7 +408,6 @@ sal_Bool SAL_CALL ResultSet::isAfterLast() // virtual sal_Bool SAL_CALL ResultSet::isFirst() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -440,7 +422,6 @@ sal_Bool SAL_CALL ResultSet::isFirst() // virtual sal_Bool SAL_CALL ResultSet::isLast() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -462,7 +443,6 @@ sal_Bool SAL_CALL ResultSet::isLast() // virtual void SAL_CALL ResultSet::beforeFirst() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); m_pImpl->m_bAfterLast = false; @@ -473,7 +453,6 @@ void SAL_CALL ResultSet::beforeFirst() // virtual void SAL_CALL ResultSet::afterLast() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); m_pImpl->m_bAfterLast = true; @@ -483,7 +462,6 @@ void SAL_CALL ResultSet::afterLast() // virtual sal_Bool SAL_CALL ResultSet::first() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { // getResult works zero-based! if ( m_pImpl->m_xDataSupplier->getResult( 0 ) ) @@ -502,7 +480,6 @@ sal_Bool SAL_CALL ResultSet::first() // virtual sal_Bool SAL_CALL ResultSet::last() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { sal_Int32 nCount = m_pImpl->m_xDataSupplier->totalCount(); if ( nCount ) @@ -521,7 +498,6 @@ sal_Bool SAL_CALL ResultSet::last() // virtual sal_Int32 SAL_CALL ResultSet::getRow() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_bAfterLast ) { @@ -536,7 +512,6 @@ sal_Int32 SAL_CALL ResultSet::getRow() // virtual sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* If the row number is positive, the cursor moves to the given row number @@ -609,7 +584,6 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row ) // virtual sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* Attempting to move beyond the first/last row in the result set @@ -679,7 +653,6 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows ) // virtual sal_Bool SAL_CALL ResultSet::previous() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* previous() is not the same as relative( -1 ) because it makes sense @@ -709,7 +682,6 @@ sal_Bool SAL_CALL ResultSet::previous() // virtual void SAL_CALL ResultSet::refreshRow() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); if ( m_pImpl->m_bAfterLast || ( m_pImpl->m_nPos == 0 ) ) @@ -722,7 +694,6 @@ void SAL_CALL ResultSet::refreshRow() // virtual sal_Bool SAL_CALL ResultSet::rowUpdated() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return false; @@ -731,7 +702,6 @@ sal_Bool SAL_CALL ResultSet::rowUpdated() // virtual sal_Bool SAL_CALL ResultSet::rowInserted() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return false; @@ -740,7 +710,6 @@ sal_Bool SAL_CALL ResultSet::rowInserted() // virtual sal_Bool SAL_CALL ResultSet::rowDeleted() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->validate(); return false; @@ -749,7 +718,6 @@ sal_Bool SAL_CALL ResultSet::rowDeleted() // virtual uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { /* returns the Statement that produced this ResultSet object. If the @@ -765,7 +733,6 @@ uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement() // virtual sal_Bool SAL_CALL ResultSet::wasNull() - 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 @@ -790,7 +757,6 @@ sal_Bool SAL_CALL ResultSet::wasNull() // virtual OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -813,7 +779,6 @@ OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex ) // virtual sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -836,7 +801,6 @@ sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex ) // virtual sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -859,7 +823,6 @@ sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex ) // virtual sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -882,7 +845,6 @@ sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex ) // virtual sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -905,7 +867,6 @@ sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex ) // virtual sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -928,7 +889,6 @@ sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex ) // virtual float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -951,7 +911,6 @@ float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex ) // virtual double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -975,7 +934,6 @@ 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, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -998,7 +956,6 @@ ResultSet::getBytes( sal_Int32 columnIndex ) // virtual util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1021,7 +978,6 @@ util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex ) // virtual util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1045,7 +1001,6 @@ util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex ) // virtual util::DateTime SAL_CALL ResultSet::getTimestamp( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1069,7 +1024,6 @@ ResultSet::getTimestamp( sal_Int32 columnIndex ) // virtual uno::Reference< io::XInputStream > SAL_CALL ResultSet::getBinaryStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1093,7 +1047,6 @@ ResultSet::getBinaryStream( sal_Int32 columnIndex ) // virtual uno::Reference< io::XInputStream > SAL_CALL ResultSet::getCharacterStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1118,7 +1071,6 @@ 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, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1142,7 +1094,6 @@ uno::Any SAL_CALL ResultSet::getObject( // virtual uno::Reference< sdbc::XRef > SAL_CALL ResultSet::getRef( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1166,7 +1117,6 @@ ResultSet::getRef( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XBlob > SAL_CALL ResultSet::getBlob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1190,7 +1140,6 @@ ResultSet::getBlob( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XClob > SAL_CALL ResultSet::getClob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1214,7 +1163,6 @@ ResultSet::getClob( sal_Int32 columnIndex ) // virtual uno::Reference< sdbc::XArray > SAL_CALL ResultSet::getArray( sal_Int32 columnIndex ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) { @@ -1240,7 +1188,6 @@ ResultSet::getArray( sal_Int32 columnIndex ) // virtual void SAL_CALL ResultSet::close() - throw( sdbc::SQLException, uno::RuntimeException, std::exception ) { m_pImpl->m_xDataSupplier->close(); m_pImpl->m_xDataSupplier->validate(); @@ -1252,7 +1199,6 @@ void SAL_CALL ResultSet::close() // virtual OUString SAL_CALL ResultSet::queryContentIdentifierString() - throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContentIdentifierString( @@ -1265,7 +1211,6 @@ OUString SAL_CALL ResultSet::queryContentIdentifierString() // virtual uno::Reference< css::ucb::XContentIdentifier > SAL_CALL ResultSet::queryContentIdentifier() - throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast ) return m_pImpl->m_xDataSupplier->queryContentIdentifier( @@ -1278,7 +1223,6 @@ ResultSet::queryContentIdentifier() // virtual uno::Reference< css::ucb::XContent > SAL_CALL ResultSet::queryContent() - 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 ); @@ -1293,7 +1237,6 @@ ResultSet::queryContent() // virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSet::getPropertySetInfo() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -1308,11 +1251,6 @@ ResultSet::getPropertySetInfo() // virtual void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { if ( aPropertyName.isEmpty() ) throw beans::UnknownPropertyException(); @@ -1337,9 +1275,6 @@ void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName, // virtual uno::Any SAL_CALL ResultSet::getPropertyValue( const OUString& PropertyName ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { if ( PropertyName.isEmpty() ) throw beans::UnknownPropertyException(); @@ -1367,9 +1302,6 @@ uno::Any SAL_CALL ResultSet::getPropertyValue( void SAL_CALL ResultSet::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // Note: An empty property name means a listener for "all" properties. @@ -1393,9 +1325,6 @@ void SAL_CALL ResultSet::addPropertyChangeListener( void SAL_CALL ResultSet::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -1415,9 +1344,6 @@ void SAL_CALL ResultSet::removePropertyChangeListener( void SAL_CALL ResultSet::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // No constrained props, at the moment. } @@ -1427,9 +1353,6 @@ void SAL_CALL ResultSet::addVetoableChangeListener( void SAL_CALL ResultSet::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // No constrained props, at the moment. } @@ -1565,7 +1488,6 @@ void SAL_CALL PropertySetInfo::release() css::uno::Any SAL_CALL PropertySetInfo::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -1587,7 +1509,6 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo, // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() - throw( uno::RuntimeException, std::exception ) { return uno::Sequence< beans::Property >( *m_pProps ); } @@ -1596,7 +1517,6 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() // virtual beans::Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) - throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) { beans::Property aProp; if ( queryProperty( aName, aProp ) ) @@ -1609,7 +1529,6 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName( // virtual sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) { beans::Property aProp; return queryProperty( Name, aProp ); |