diff options
Diffstat (limited to 'connectivity/source/drivers/odbc/OResultSet.cxx')
| -rw-r--r-- | connectivity/source/drivers/odbc/OResultSet.cxx | 162 |
1 files changed, 81 insertions, 81 deletions
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 13040a0cf95c..c2394d0d1ff3 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -66,12 +66,12 @@ namespace // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) { return OUString("com.sun.star.sdbcx.odbc.ResultSet"); } - Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -79,7 +79,7 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException return aSupported; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -358,13 +358,13 @@ void OResultSet::releaseBuffer() m_aLengthVector.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) + Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) { OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), @@ -374,7 +374,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::findColumn" ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -427,7 +427,7 @@ void OResultSet::invalidateCache() } } -Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -437,7 +437,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*colu return NULL; } -Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -470,18 +470,18 @@ template < typename T > T OResultSet::getValue( sal_Int32 columnIndex ) m_bWasNull = m_aRow[columnIndex].isNull(); return m_aRow[columnIndex]; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<sal_Bool>( columnIndex ); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<sal_Int8>( columnIndex ); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -534,34 +534,34 @@ Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, Runti return Date(aDate.day, aDate.month, aDate.year); } -Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<Date>( columnIndex ); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<double>( columnIndex ); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<float>( columnIndex ); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<sal_Int16>( columnIndex ); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<sal_Int32>( columnIndex ); } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<sal_Int64>( columnIndex ); } @@ -577,7 +577,7 @@ sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException, } } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -585,7 +585,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) return m_pSkipDeletedSet ? m_pSkipDeletedSet->getMappedPosition(getDriverPos()) : getDriverPos(); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::getMetaData" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -597,7 +597,7 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getArray", *this ); return NULL; @@ -605,27 +605,27 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getClob", *this ); return NULL; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getBlob", *this ); return NULL; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getRef", *this ); return NULL; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { return getValue<ORowSetValue>( columnIndex ).makeAny(); } @@ -636,7 +636,7 @@ OUString OResultSet::impl_getString( sal_Int32 columnIndex ) throw(SQLException, const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex); return OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nColumnType,m_bWasNull,**this,m_nTextEncoding); } -OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<OUString>( columnIndex ); } @@ -648,7 +648,7 @@ Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException, Runti return Time(0, aTime.second,aTime.minute,aTime.hour, false); } -Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<Time>( columnIndex ); } @@ -667,19 +667,19 @@ DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) throw(SQLExcepti aTime.year, false); } -DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue<DateTime>( columnIndex ); } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_nRowPos == 0; } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -687,7 +687,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return m_nRowPos != 0 && m_nCurrentFetchState == SQL_NO_DATA; } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -695,7 +695,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) return m_nRowPos == 1; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -704,7 +704,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) return m_bEOF && m_nCurrentFetchState != SQL_NO_DATA; } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::beforeFirst" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -716,7 +716,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) m_nCurrentFetchState = SQL_SUCCESS; } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::afterLast" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -728,7 +728,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -739,38 +739,38 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::first" ); return moveImpl(IResultSetHelper::FIRST,0,sal_True); } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::last" ); return moveImpl(IResultSetHelper::LAST,0,sal_True); } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::absolute" ); return moveImpl(IResultSetHelper::ABSOLUTE,row,sal_True); } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::relative" ); return moveImpl(IResultSetHelper::RELATIVE,row,sal_True); } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::previous" ); return moveImpl(IResultSetHelper::PRIOR,0,sal_True); } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -778,7 +778,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException } -sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::rowDeleted" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -790,7 +790,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException) return bRet; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::rowInserted" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -802,7 +802,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti return bInserted; } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::rowUpdated" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -813,14 +813,14 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::next" ); return moveImpl(IResultSetHelper::NEXT,1,sal_True); } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::wasNull" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -830,7 +830,7 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -839,16 +839,16 @@ void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) OTools::ThrowException(m_pStatement->getOwnConnection(),N3SQLCancel(m_aStatementHandle),m_aStatementHandle,SQL_HANDLE_STMT,*this); } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { return Any(); } -void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::insertRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -925,7 +925,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::updateRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -976,7 +976,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) } } -void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::deleteRow" ); SQLRETURN nRet = SQL_SUCCESS; @@ -1003,12 +1003,12 @@ void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException, std::exception) { } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::moveToInsertRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -1023,7 +1023,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException, std::exception) { invalidateCache(); } @@ -1050,7 +1050,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pVa m_pStatement->getOwnConnection()->useOldDateFormat()); } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1061,44 +1061,44 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException } -void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,SQL_BIT,&x); } -void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,SQL_CHAR,&x); } -void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,SQL_TINYINT,&x); } -void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,SQL_INTEGER,&x); } -void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRowUpdate::updateLong", *this ); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,SQL_REAL,&x); } -void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,SQL_DOUBLE,&x); } -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nType = m_aRow[columnIndex].getTypeKind(); SQLSMALLINT nOdbcType = OTools::jdbcTypeToOdbc(nType); @@ -1108,7 +1108,7 @@ void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x updateValue(columnIndex,nOdbcType,(void*)&x); } -void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nType = m_aRow[columnIndex].getTypeKind(); SQLSMALLINT nOdbcType = OTools::jdbcTypeToOdbc(nType); @@ -1118,28 +1118,28 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa updateValue(columnIndex,nOdbcType,(void*)&x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) throw(SQLException, RuntimeException, std::exception) { DATE_STRUCT aVal = OTools::DateToOdbcDate(x); updateValue(columnIndex,SQL_DATE,&aVal); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) throw(SQLException, RuntimeException, std::exception) { TIME_STRUCT aVal = OTools::TimeToOdbcTime(x); updateValue(columnIndex,SQL_TIME,&aVal); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x ) throw(SQLException, RuntimeException, std::exception) { TIMESTAMP_STRUCT aVal = OTools::DateTimeToTimestamp(x); updateValue(columnIndex,SQL_TIMESTAMP,&aVal); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -1149,12 +1149,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateBytes(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { updateBinaryStream(columnIndex,x,length); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::refreshRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -1166,21 +1166,21 @@ void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this); } -void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } -void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } // XRowLocate -Any SAL_CALL OResultSet::getBookmark( ) throw( SQLException, RuntimeException) +Any SAL_CALL OResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) { fillColumn(0); if(m_aRow[0].isNull()) @@ -1215,7 +1215,7 @@ Sequence<sal_Int8> OResultSet::impl_getBookmark( ) throw( SQLException, Runtim } } -sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::moveToBookmark" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -1244,7 +1244,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLE return sal_False; } -sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::moveRelativeToBookmark" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -1262,7 +1262,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_ return m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO; } -sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::compareBookmarks" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -1271,19 +1271,19 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const Any& rhs return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL; } -sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& /*bookmark*/ ) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& /*bookmark*/ ) throw( SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRowLocate::hashBookmark", *this ); return 0; } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw( SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw( SQLException, RuntimeException, std::exception) { Sequence< sal_Int32 > aRet(rows.getLength()); sal_Int32 *pRet = aRet.getArray(); @@ -1488,7 +1488,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw (Exception) + throw (Exception, std::exception) { switch(nHandle) { @@ -1666,7 +1666,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } |