summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/jdbc/Array.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/CallableStatement.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx54
-rw-r--r--connectivity/source/drivers/jdbc/InputStream.cxx6
-rw-r--r--connectivity/source/drivers/jdbc/JConnection.cxx16
-rw-r--r--connectivity/source/drivers/jdbc/JStatement.cxx28
-rw-r--r--connectivity/source/drivers/jdbc/Object.cxx28
-rw-r--r--connectivity/source/drivers/jdbc/PreparedStatement.cxx32
-rw-r--r--connectivity/source/drivers/jdbc/Reader.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/ResultSet.cxx62
-rw-r--r--connectivity/source/drivers/jdbc/ResultSetMetaData.cxx12
-rw-r--r--connectivity/source/drivers/jdbc/SQLException.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/Throwable.cxx2
-rw-r--r--connectivity/source/inc/java/lang/Object.hxx22
-rw-r--r--connectivity/source/inc/java/sql/DatabaseMetaData.hxx4
15 files changed, 137 insertions, 139 deletions
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index a1b3c3b7e83a..6a75a0bb9c7e 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -49,7 +49,7 @@ OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(::com::sun::star::sd
sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethod_Throw("getBaseType", mID);
+ return callIntMethod_ThrowSQL("getBaseType", mID);
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_Array::getArray( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 6debd575cab2..d7ee0291221d 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -140,7 +140,7 @@ sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) t
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- return callIntMethodWithIntArg_Throw("getInt",mID,columnIndex);
+ return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex);
}
sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 979d06735ff8..8155e69a05d1 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -241,73 +241,73 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getVersionColumns(
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxBinaryLiteralLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxBinaryLiteralLength", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxRowSize", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxRowSize", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxCatalogNameLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxCatalogNameLength", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxCharLiteralLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxCharLiteralLength", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxColumnNameLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxColumnNameLength", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxColumnsInIndex", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxColumnsInIndex", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxCursorNameLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxCursorNameLength", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxConnections", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxConnections", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxColumnsInTable", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxColumnsInTable", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxStatementLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxStatementLength", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxTableNameLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxTableNameLength", mID);
}
sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw( )
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxTablesInSelect", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxTablesInSelect", mID);
}
Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getExportedKeys(
@@ -563,18 +563,18 @@ OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodN
return sReturn;
}
-sal_Int32 java_sql_DatabaseMetaData::impl_callIntMethod_Throw(const char* _pMethodName, jmethodID& _inout_MethodID)
+sal_Int32 java_sql_DatabaseMetaData::impl_callIntMethod_ThrowSQL(const char* _pMethodName, jmethodID& _inout_MethodID)
{
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName );
- sal_Int32 out( (sal_Int32)callIntMethod_Throw(_pMethodName,_inout_MethodID) );
+ sal_Int32 out( (sal_Int32)callIntMethod_ThrowSQL(_pMethodName,_inout_MethodID) );
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, (sal_Int32)out );
return out;
}
-sal_Int32 java_sql_DatabaseMetaData::impl_callIntMethod_Nothrow(const char* _pMethodName, jmethodID& _inout_MethodID)
+sal_Int32 java_sql_DatabaseMetaData::impl_callIntMethod_ThrowRuntime(const char* _pMethodName, jmethodID& _inout_MethodID)
{
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName );
- sal_Int32 out( (sal_Int32)callIntMethod_Nothrow(_pMethodName,_inout_MethodID) );
+ sal_Int32 out( (sal_Int32)callIntMethod_ThrowRuntime(_pMethodName,_inout_MethodID) );
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, (sal_Int32)out );
return out;
}
@@ -728,7 +728,7 @@ bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( )
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxIndexLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxIndexLength", mID);
}
sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception)
@@ -902,19 +902,19 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes( ) th
sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw( )
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxStatements", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxStatements", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxProcedureNameLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxProcedureNameLength", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxSchemaNameLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxSchemaNameLength", mID);
}
sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception)
@@ -1221,19 +1221,19 @@ OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLExceptio
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Nothrow("getDriverMajorVersion", mID);
+ return impl_callIntMethod_ThrowRuntime("getDriverMajorVersion", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getDefaultTransactionIsolation", mID);
+ return impl_callIntMethod_ThrowSQL("getDefaultTransactionIsolation", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Nothrow("getDriverMinorVersion", mID);
+ return impl_callIntMethod_ThrowRuntime("getDriverMinorVersion", mID);
}
OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception)
@@ -1305,25 +1305,25 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins( ) throw
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxColumnsInGroupBy", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxColumnsInGroupBy", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxColumnsInOrderBy", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxColumnsInOrderBy", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxColumnsInSelect", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxColumnsInSelect", mID);
}
sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return impl_callIntMethod_Throw("getMaxUserNameLength", mID);
+ return impl_callIntMethod_ThrowSQL("getMaxUserNameLength", mID);
}
sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index f6697d7121ea..91dec5cd431d 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -62,19 +62,19 @@ sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( ::com::sun::star::uno::Se
void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callIntMethodWithIntArg_Nothrow("skip",mID,nBytesToSkip);
+ callIntMethodWithIntArg_ThrowRuntime("skip",mID,nBytesToSkip);
}
sal_Int32 SAL_CALL java_io_InputStream::available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethod_Nothrow("available", mID);
+ return callIntMethod_ThrowRuntime("available", mID);
}
void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Nothrow("close",mID);
+ callVoidMethod_ThrowRuntime("close",mID);
}
sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index fb3cf800fd20..7baccaa0ce2d 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -309,7 +309,7 @@ void java_sql_Connection::disposing()
if ( object )
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("close", mID);
+ callVoidMethod_ThrowSQL("close", mID);
}
}
@@ -361,7 +361,7 @@ void SAL_CALL java_sql_Connection::close( ) throw(SQLException, RuntimeExceptio
void SAL_CALL java_sql_Connection::commit( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("commit", mID);
+ callVoidMethod_ThrowSQL("commit", mID);
}
sal_Bool SAL_CALL java_sql_Connection::isClosed( ) throw(SQLException, RuntimeException, std::exception)
@@ -389,7 +389,7 @@ void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(S
void SAL_CALL java_sql_Connection::rollback( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("rollback", mID);
+ callVoidMethod_ThrowSQL("rollback", mID);
}
sal_Bool SAL_CALL java_sql_Connection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception)
@@ -401,13 +401,13 @@ sal_Bool SAL_CALL java_sql_Connection::getAutoCommit( ) throw(SQLException, Run
void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethodWithBoolArg_Throw("setReadOnly", mID, readOnly);
+ callVoidMethodWithBoolArg_ThrowSQL("setReadOnly", mID, readOnly);
}
void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethodWithBoolArg_Throw("setAutoCommit", mID, autoCommit);
+ callVoidMethodWithBoolArg_ThrowSQL("setAutoCommit", mID, autoCommit);
}
Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception)
@@ -437,7 +437,7 @@ sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) throw(SQLExc
checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
static jmethodID mID(NULL);
- return callIntMethod_Throw("getTransactionIsolation", mID);
+ return callIntMethod_ThrowSQL("getTransactionIsolation", mID);
}
void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception)
@@ -446,7 +446,7 @@ void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) th
checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Throw("setTransactionIsolation", mID, level);
+ callVoidMethodWithIntArg_ThrowSQL("setTransactionIsolation", mID, level);
}
Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw(SQLException, RuntimeException, std::exception)
@@ -557,7 +557,7 @@ OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQ
void SAL_CALL java_sql_Connection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("clearWarnings", mID);
+ callVoidMethod_ThrowSQL("clearWarnings", mID);
}
Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 4640bcd4ac7d..bf3cb564afab 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -85,7 +85,7 @@ void SAL_CALL OStatement_BASE2::disposing()
if ( object )
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("close", mID);
+ callVoidMethod_ThrowSQL("close", mID);
}
::comphelper::disposeComponent(m_xGeneratedStatement);
@@ -192,7 +192,7 @@ void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::e
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Nothrow("cancel",mID);
+ callVoidMethod_ThrowRuntime("cancel",mID);
}
@@ -214,7 +214,7 @@ void SAL_CALL java_sql_Statement::clearBatch( ) throw(::com::sun::star::sdbc::S
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("clearBatch", mID);
+ callVoidMethod_ThrowSQL("clearBatch", mID);
} //t.pEnv
}
@@ -368,7 +368,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(::com::sun:
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- sal_Int32 out = callIntMethod_Throw("getUpdateCount", mID);
+ sal_Int32 out = callIntMethod_ThrowSQL("getUpdateCount", mID);
m_aLogger.log( LogLevel::FINER, STR_LOG_UPDATE_COUNT, (sal_Int32)out );
return out;
}
@@ -409,7 +409,7 @@ void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(::com::sun::star:
{
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("clearWarnings", mID);
+ callVoidMethod_ThrowSQL("clearWarnings", mID);
}
}
@@ -442,7 +442,7 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm
{
sal_Int32 out = _nDefault;
if ( object )
- out = callIntMethod_Nothrow(_pMethodName, _inout_MethodID);
+ out = callIntMethod_ThrowRuntime(_pMethodName, _inout_MethodID);
return out;
}
@@ -450,10 +450,9 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
- return callIntMethod_Nothrow(_pMethodName, _inout_MethodID);
+ return callIntMethod_ThrowRuntime(_pMethodName, _inout_MethodID);
}
-
sal_Int32 java_sql_Statement_Base::getFetchDirection() throw(SQLException, RuntimeException)
{
static jmethodID mID(NULL);
@@ -496,7 +495,7 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLExceptio
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Nothrow("setQueryTimeOut", mID, _par0);
+ callVoidMethodWithIntArg_ThrowRuntime("setQueryTimeOut", mID, _par0);
}
@@ -510,10 +509,9 @@ void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException
m_bEscapeProcessing = _par0;
createStatement( t.pEnv );
static jmethodID mID(NULL);
- callVoidMethodWithBoolArg_Nothrow("setEscapeProcessing", mID, _par0);
+ callVoidMethodWithBoolArg_ThrowRuntime("setEscapeProcessing", mID, _par0);
}
-
void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -521,7 +519,7 @@ void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, Ru
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Nothrow("setMaxRows", mID, _par0);
+ callVoidMethodWithIntArg_ThrowRuntime("setMaxRows", mID, _par0);
}
void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException)
@@ -552,7 +550,7 @@ void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLExcept
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Nothrow("setFetchDirection", mID, _par0);
+ callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0);
}
void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException)
@@ -564,7 +562,7 @@ void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException,
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Nothrow("setFetchSize", mID, _par0);
+ callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0);
}
void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLException, RuntimeException)
@@ -574,7 +572,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLExceptio
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Nothrow("setMaxFieldSize", mID, _par0);
+ callVoidMethodWithIntArg_ThrowRuntime("setMaxFieldSize", mID, _par0);
}
void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index cd6a5c07e022..9401eb66d6c7 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -274,7 +274,7 @@ jobject java_lang_Object::callResultSetMethod( JNIEnv& _rEnv,const char* _pMetho
return out;
}
-sal_Int32 java_lang_Object::callIntMethod_Throw(const char* _pMethodName, jmethodID& _inout_MethodID) const
+sal_Int32 java_lang_Object::callIntMethod_ThrowSQL(const char* _pMethodName, jmethodID& _inout_MethodID) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
@@ -285,7 +285,7 @@ sal_Int32 java_lang_Object::callIntMethod_Throw(const char* _pMethodName, jmetho
return (sal_Int32)out;
}
-sal_Int32 java_lang_Object::callIntMethod_Nothrow(const char* _pMethodName, jmethodID& _inout_MethodID) const
+sal_Int32 java_lang_Object::callIntMethod_ThrowRuntime(const char* _pMethodName, jmethodID& _inout_MethodID) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
@@ -296,7 +296,7 @@ sal_Int32 java_lang_Object::callIntMethod_Nothrow(const char* _pMethodName, jmet
return (sal_Int32)out;
}
-sal_Int32 java_lang_Object::callIntMethodWithIntArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nArgument ) const
+sal_Int32 java_lang_Object::callIntMethodWithIntArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nArgument ) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
@@ -307,18 +307,18 @@ sal_Int32 java_lang_Object::callIntMethodWithIntArg_Throw( const char* _pMethodN
return (sal_Int32)out;
}
-sal_Int32 java_lang_Object::callIntMethodWithIntArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nArgument ) const
+sal_Int32 java_lang_Object::callIntMethodWithIntArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nArgument ) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
- obtainMethodId_throwSQL(t.pEnv, _pMethodName,"(I)I", _inout_MethodID);
+ obtainMethodId_throwRuntime(t.pEnv, _pMethodName,"(I)I", _inout_MethodID);
// call method
jint out( t.pEnv->CallIntMethod( object, _inout_MethodID , _nArgument) );
isExceptionOccurred(t.pEnv,true);
return (sal_Int32)out;
}
-void java_lang_Object::callVoidMethod_Throw( const char* _pMethodName, jmethodID& _inout_MethodID) const
+void java_lang_Object::callVoidMethod_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
@@ -329,18 +329,18 @@ void java_lang_Object::callVoidMethod_Throw( const char* _pMethodName, jmethodID
ThrowSQLException( t.pEnv, NULL );
}
-void java_lang_Object::callVoidMethod_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID) const
+void java_lang_Object::callVoidMethod_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
- obtainMethodId_throwSQL(t.pEnv, _pMethodName,"()V", _inout_MethodID);
+ obtainMethodId_throwRuntime(t.pEnv, _pMethodName,"()V", _inout_MethodID);
// call method
t.pEnv->CallVoidMethod( object, _inout_MethodID );
isExceptionOccurred(t.pEnv, true);
}
-void java_lang_Object::callVoidMethodWithIntArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const
+void java_lang_Object::callVoidMethodWithIntArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
@@ -351,18 +351,18 @@ void java_lang_Object::callVoidMethodWithIntArg_Throw( const char* _pMethodName,
ThrowSQLException( t.pEnv, NULL );
}
-void java_lang_Object::callVoidMethodWithIntArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const
+void java_lang_Object::callVoidMethodWithIntArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
- obtainMethodId_throwSQL(t.pEnv, _pMethodName,"(I)V", _inout_MethodID);
+ obtainMethodId_throwRuntime(t.pEnv, _pMethodName,"(I)V", _inout_MethodID);
// call method
t.pEnv->CallVoidMethod( object, _inout_MethodID,_nArgument );
isExceptionOccurred(t.pEnv, true);
}
-void java_lang_Object::callVoidMethodWithBoolArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const
+void java_lang_Object::callVoidMethodWithBoolArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
@@ -372,11 +372,11 @@ void java_lang_Object::callVoidMethodWithBoolArg_Throw( const char* _pMethodName
ThrowSQLException( t.pEnv, NULL );
}
-void java_lang_Object::callVoidMethodWithBoolArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const
+void java_lang_Object::callVoidMethodWithBoolArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const
{
SDBThreadAttach t;
OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
- obtainMethodId_throwSQL(t.pEnv, _pMethodName,"(Z)V", _inout_MethodID);
+ obtainMethodId_throwRuntime(t.pEnv, _pMethodName,"(Z)V", _inout_MethodID);
// call method
t.pEnv->CallVoidMethod( object, _inout_MethodID,int(_nArgument) );
isExceptionOccurred(t.pEnv,true);
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 41d6ab87d2a4..6b82ce07f77c 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -113,7 +113,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::su
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- return callIntMethod_Throw("executeUpdate", mID);
+ return callIntMethod_ThrowSQL("executeUpdate", mID);
}
@@ -169,7 +169,7 @@ void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex,
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setBoolean", "(IZ)V", mID, parameterIndex, x);
+ callVoidMethod_ThrowSQL("setBoolean", "(IZ)V", mID, parameterIndex, x);
}
@@ -182,7 +182,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setByte", "(IB)V", mID, parameterIndex, x);
+ callVoidMethod_ThrowSQL("setByte", "(IB)V", mID, parameterIndex, x);
}
@@ -196,7 +196,7 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con
createStatement(t.pEnv);
java_sql_Date aT(x);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setDate", "(ILjava/sql/Date;)V", mID, parameterIndex, aT.getJavaObject());
+ callVoidMethod_ThrowSQL("setDate", "(ILjava/sql/Date;)V", mID, parameterIndex, aT.getJavaObject());
}
@@ -211,7 +211,7 @@ void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, con
createStatement(t.pEnv);
java_sql_Time aT(x);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setTime", "(ILjava/sql/Time;)V", mID, parameterIndex, aT.getJavaObject());
+ callVoidMethod_ThrowSQL("setTime", "(ILjava/sql/Time;)V", mID, parameterIndex, aT.getJavaObject());
}
@@ -225,7 +225,7 @@ void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex
createStatement(t.pEnv);
static jmethodID mID(NULL);
java_sql_Timestamp aD(x);
- callVoidMethod_Throw("setTimestamp", "(ILjava/sql/Timestamp;)V", mID, parameterIndex, aD.getJavaObject());
+ callVoidMethod_ThrowSQL("setTimestamp", "(ILjava/sql/Timestamp;)V", mID, parameterIndex, aD.getJavaObject());
}
void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
@@ -237,7 +237,7 @@ void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, d
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setDouble", "(ID)V", mID, parameterIndex, x);
+ callVoidMethod_ThrowSQL("setDouble", "(ID)V", mID, parameterIndex, x);
}
@@ -250,7 +250,7 @@ void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, fl
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setFloat", "(IF)V", mID, parameterIndex, x);
+ callVoidMethod_ThrowSQL("setFloat", "(IF)V", mID, parameterIndex, x);
}
@@ -263,7 +263,7 @@ void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setInt", "(II)V", mID, parameterIndex, x);
+ callVoidMethod_ThrowSQL("setInt", "(II)V", mID, parameterIndex, x);
}
@@ -276,7 +276,7 @@ void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setLong", "(IJ)V", mID, parameterIndex, x);
+ callVoidMethod_ThrowSQL("setLong", "(IJ)V", mID, parameterIndex, x);
}
@@ -289,7 +289,7 @@ void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setNull", "(II)V", mID, parameterIndex, sqlType);
+ callVoidMethod_ThrowSQL("setNull", "(II)V", mID, parameterIndex, sqlType);
}
@@ -385,7 +385,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw<jobject>("setObject", "(ILjava/lang/Object;)V", mID, parameterIndex, NULL);
+ callVoidMethod_ThrowSQL<jobject>("setObject", "(ILjava/lang/Object;)V", mID, parameterIndex, NULL);
}
@@ -411,7 +411,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("setShort", "(IS)V", mID, parameterIndex, x);
+ callVoidMethod_ThrowSQL("setShort", "(IS)V", mID, parameterIndex, x);
}
@@ -549,7 +549,7 @@ void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(::com::sun::
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("clearParameters",mID);
+ callVoidMethod_ThrowSQL("clearParameters",mID);
} //t.pEnv
}
@@ -561,7 +561,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(::com::sun::star:
{
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("clearBatch",mID);
+ callVoidMethod_ThrowSQL("clearBatch",mID);
} //t.pEnv
}
@@ -574,7 +574,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd
{
createStatement(t.pEnv);
static jmethodID mID(NULL);
- callVoidMethod_Throw("addBatch", mID);
+ callVoidMethod_ThrowSQL("addBatch", mID);
} //t.pEnv
}
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 02114d4a9306..323c34e3629a 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -52,7 +52,7 @@ sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( ::com::sun::star::uno::Sequenc
void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callIntMethodWithIntArg_Nothrow("skip",mID,nBytesToSkip);
+ callIntMethodWithIntArg_ThrowRuntime("skip",mID,nBytesToSkip);
}
sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
@@ -75,7 +75,7 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::Not
void SAL_CALL java_io_Reader::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Nothrow("close", mID);
+ callVoidMethod_ThrowRuntime("close", mID);
}
sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 361e4b4f63be..948c127a6d89 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -106,7 +106,7 @@ m_xMetaData.clear();
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
- callVoidMethod_Throw("close", mID);
+ callVoidMethod_ThrowSQL("close", mID);
clearObject(*t.pEnv);
}
@@ -217,14 +217,14 @@ float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLEx
sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethodWithIntArg_Throw("getInt",mID,columnIndex);
+ return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex);
}
sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethod_Throw("getRow", mID);
+ return callIntMethod_ThrowSQL("getRow", mID);
}
@@ -406,13 +406,13 @@ sal_Bool SAL_CALL java_sql_ResultSet::isLast( ) throw(SQLException, RuntimeExce
void SAL_CALL java_sql_ResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("beforeFirst", mID);
+ callVoidMethod_ThrowSQL("beforeFirst", mID);
}
void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("afterLast", mID);
+ callVoidMethod_ThrowSQL("afterLast", mID);
}
@@ -500,13 +500,13 @@ sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeExc
void SAL_CALL java_sql_ResultSet::cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Nothrow("cancel", mID);
+ callVoidMethod_ThrowRuntime("cancel", mID);
}
void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("clearWarnings", mID);
+ callVoidMethod_ThrowSQL("clearWarnings", mID);
}
::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
@@ -530,79 +530,79 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc
void SAL_CALL java_sql_ResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("insertRow", mID);
+ callVoidMethod_ThrowSQL("insertRow", mID);
}
void SAL_CALL java_sql_ResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateRow", mID);
+ callVoidMethod_ThrowSQL("updateRow", mID);
}
void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("deleteRow", mID);
+ callVoidMethod_ThrowSQL("deleteRow", mID);
}
void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("cancelRowUpdates", mID);
+ callVoidMethod_ThrowSQL("cancelRowUpdates", mID);
}
void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("moveToInsertRow", mID);
+ callVoidMethod_ThrowSQL("moveToInsertRow", mID);
}
void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("moveToCurrentRow", mID);
+ callVoidMethod_ThrowSQL("moveToCurrentRow", mID);
}
void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Throw("updateNull", mID, columnIndex);
+ callVoidMethodWithIntArg_ThrowSQL("updateNull", mID, columnIndex);
}
void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateBoolean", "(IZ)V", mID, columnIndex, x);
+ callVoidMethod_ThrowSQL("updateBoolean", "(IZ)V", mID, columnIndex, x);
}
void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateByte", "(IB)V", mID, columnIndex, x);
+ callVoidMethod_ThrowSQL("updateByte", "(IB)V", mID, columnIndex, x);
}
void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateShort", "(IS)V", mID, columnIndex, x);
+ callVoidMethod_ThrowSQL("updateShort", "(IS)V", mID, columnIndex, x);
}
void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateInt", "(II)V", mID, columnIndex, x);
+ callVoidMethod_ThrowSQL("updateInt", "(II)V", mID, columnIndex, x);
}
void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateLong", "(IJ)V", mID, columnIndex, x);
+ callVoidMethod_ThrowSQL("updateLong", "(IJ)V", mID, columnIndex, x);
}
@@ -610,14 +610,14 @@ void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x
void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateFloat", "(IF)V", mID, columnIndex, x);
+ callVoidMethod_ThrowSQL("updateFloat", "(IF)V", mID, columnIndex, x);
}
void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateDouble", "(ID)V", mID, columnIndex, x);
+ callVoidMethod_ThrowSQL("updateDouble", "(ID)V", mID, columnIndex, x);
}
@@ -679,7 +679,7 @@ void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com
{
java_sql_Date aD(x);
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateDate", "(ILjava/sql/Date;)V", mID, columnIndex, aD.getJavaObject());
+ callVoidMethod_ThrowSQL("updateDate", "(ILjava/sql/Date;)V", mID, columnIndex, aD.getJavaObject());
}
@@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com
{
java_sql_Time aD(x);
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateTime", "(ILjava/sql/Time;)V", mID, columnIndex, aD.getJavaObject());
+ callVoidMethod_ThrowSQL("updateTime", "(ILjava/sql/Time;)V", mID, columnIndex, aD.getJavaObject());
}
@@ -695,7 +695,7 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const
{
java_sql_Timestamp aD(x);
static jmethodID mID(NULL);
- callVoidMethod_Throw("updateTimestamp", "(ILjava/sql/Timestamp;)V", mID, columnIndex, aD.getJavaObject());
+ callVoidMethod_ThrowSQL("updateTimestamp", "(ILjava/sql/Timestamp;)V", mID, columnIndex, aD.getJavaObject());
}
@@ -820,25 +820,25 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co
sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
static jmethodID mID(NULL);
- return callIntMethod_Nothrow("getConcurrency", mID);
+ return callIntMethod_ThrowRuntime("getConcurrency", mID);
}
sal_Int32 java_sql_ResultSet::getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
static jmethodID mID(NULL);
- return callIntMethod_Nothrow("getType",mID);
+ return callIntMethod_ThrowRuntime("getType",mID);
}
sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
static jmethodID mID(NULL);
- return callIntMethod_Nothrow("getFetchDirection", mID);
+ return callIntMethod_ThrowRuntime("getFetchDirection", mID);
}
sal_Int32 java_sql_ResultSet::getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
static jmethodID mID(NULL);
- return callIntMethod_Nothrow("getFetchSize", mID);
+ return callIntMethod_ThrowRuntime("getFetchSize", mID);
}
OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -851,19 +851,19 @@ OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc:
void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Nothrow("setFetchDirection", mID, _par0);
+ callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0);
}
void SAL_CALL java_sql_ResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- callVoidMethod_Throw("refreshRow",mID);
+ callVoidMethod_ThrowSQL("refreshRow",mID);
}
void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
{
static jmethodID mID(NULL);
- callVoidMethodWithIntArg_Nothrow("setFetchSize", mID, _par0);
+ callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0);
}
::cppu::IPropertyArrayHelper* java_sql_ResultSet::createArrayHelper( ) const
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 6dcd5da2f982..508d76950163 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -58,14 +58,14 @@ jclass java_sql_ResultSetMetaData::getMyClass() const
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethodWithIntArg_Throw("getColumnDisplaySize",mID,column);
+ return callIntMethodWithIntArg_ThrowSQL("getColumnDisplaySize",mID,column);
}
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethodWithIntArg_Throw("getColumnType",mID,column);
+ return callIntMethodWithIntArg_ThrowSQL("getColumnType",mID,column);
}
@@ -74,7 +74,7 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLExcep
if ( m_nColumnCount == -1 )
{
static jmethodID mID(NULL);
- m_nColumnCount = callIntMethod_Throw("getColumnCount", mID);
+ m_nColumnCount = callIntMethod_ThrowSQL("getColumnCount", mID);
} // if ( m_nColumnCount == -1 )
return m_nColumnCount;
@@ -157,19 +157,19 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethodWithIntArg_Throw("getPrecision",mID,column);
+ return callIntMethodWithIntArg_ThrowSQL("getPrecision",mID,column);
}
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethodWithIntArg_Throw("getScale",mID,column);
+ return callIntMethodWithIntArg_ThrowSQL("getScale",mID,column);
}
sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
{
static jmethodID mID(NULL);
- return callIntMethodWithIntArg_Throw("isNullable",mID,column);
+ return callIntMethodWithIntArg_ThrowSQL("isNullable",mID,column);
}
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 1b2cc88551fa..c05650e66beb 100644
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -84,7 +84,7 @@ OUString java_sql_SQLException_BASE::getSQLState() const
sal_Int32 java_sql_SQLException_BASE::getErrorCode() const
{
static jmethodID mID(NULL);
- return callIntMethod_Throw("getErrorCode", mID);
+ return callIntMethod_ThrowSQL("getErrorCode", mID);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index 18d7a2bce369..d4172bd93300 100644
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -59,7 +59,7 @@ OUString java_lang_Throwable::getLocalizedMessage() const
void java_lang_Throwable::printStackTrace() const
{
static jmethodID mID(NULL);
- return callVoidMethod_Throw("printStackTrace",mID);
+ return callVoidMethod_ThrowSQL("printStackTrace",mID);
}
#endif
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 0d524aeb1893..190433427624 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -115,19 +115,19 @@ namespace connectivity
bool callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const;
bool callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
jobject callResultSetMethod( JNIEnv& _rEnv, const char* _pMethodName, jmethodID& _inout_MethodID ) const;
- sal_Int32 callIntMethod_Throw(const char* _pMethodName, jmethodID& _inout_MethodID) const;
- sal_Int32 callIntMethod_Nothrow(const char* _pMethodName, jmethodID& _inout_MethodID) const;
- sal_Int32 callIntMethodWithIntArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
- sal_Int32 callIntMethodWithIntArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
+ sal_Int32 callIntMethod_ThrowSQL(const char* _pMethodName, jmethodID& _inout_MethodID) const;
+ sal_Int32 callIntMethod_ThrowRuntime(const char* _pMethodName, jmethodID& _inout_MethodID) const;
+ sal_Int32 callIntMethodWithIntArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
+ sal_Int32 callIntMethodWithIntArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
sal_Int32 callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const;
OUString callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const;
OUString callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const;
- void callVoidMethod_Throw( const char* _pMethodName, jmethodID& _inout_MethodID) const;
- void callVoidMethod_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID) const;
- void callVoidMethodWithIntArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
- void callVoidMethodWithIntArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
- void callVoidMethodWithBoolArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const;
- void callVoidMethodWithBoolArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const;
+ void callVoidMethod_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID) const;
+ void callVoidMethod_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID) const;
+ void callVoidMethodWithIntArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
+ void callVoidMethodWithIntArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
+ void callVoidMethodWithBoolArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const;
+ void callVoidMethodWithBoolArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const;
void callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID, const OUString& _nArgument ) const;
jobject callObjectMethod( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID ) const;
jobject callObjectMethodWithIntArg( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const;
@@ -143,7 +143,7 @@ namespace connectivity
}
template< typename T >
- void callVoidMethod_Throw(const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID,sal_Int32 _nArgument, const T& _aValue) const
+ void callVoidMethod_ThrowSQL(const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID,sal_Int32 _nArgument, const T& _aValue) const
{
SDBThreadAttach t;
obtainMethodId_throwSQL(t.pEnv, _pMethodName,_pSignature, _inout_MethodID);
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index bd704a8d1da5..7a8105ae8932 100644
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
@@ -202,8 +202,8 @@ namespace connectivity
private:
bool impl_callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID );
OUString impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID );
- sal_Int32 impl_callIntMethod_Throw( const char* _pMethodName, jmethodID& _inout_MethodID );
- sal_Int32 impl_callIntMethod_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID );
+ sal_Int32 impl_callIntMethod_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID );
+ sal_Int32 impl_callIntMethod_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID );
bool impl_callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument );
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
impl_callResultSetMethod( const char* _pMethodName, jmethodID& _inout_MethodID );
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 08:44:49 +0000