diff options
| -rw-r--r-- | connectivity/source/drivers/jdbc/Array.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/Blob.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/CallableStatement.cxx | 42 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/Clob.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 10 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/InputStream.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/JConnection.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/JStatement.cxx | 38 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/PreparedStatement.cxx | 48 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/Reader.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/ResultSet.cxx | 26 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/tools.cxx | 2 |
12 files changed, 100 insertions, 100 deletions
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 9cc6ecc50741..3e67b7f2398f 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -54,7 +54,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { jobject obj = convertTypeMapToJavaMap(typeMap); static const char * const cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;"; @@ -72,7 +72,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { jobject obj = convertTypeMapToJavaMap(typeMap); static const char * const cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;"; @@ -90,7 +90,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sa css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { // convert Parameter jobject obj = convertTypeMapToJavaMap(typeMap); @@ -110,7 +110,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { // convert parameter jobject obj = convertTypeMapToJavaMap(typeMap); diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index ec4bb0b0e74b..191a2f9a37f0 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.cxx @@ -51,7 +51,7 @@ jclass java_sql_Blob::getMyClass() const sal_Int64 SAL_CALL java_sql_Blob::length( ) { jlong out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { // initialize temporary variable @@ -68,7 +68,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); css::uno::Sequence< sal_Int8 > aSeq; { // initialize temporary variable @@ -93,7 +93,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getBinaryStream","()Ljava/io/InputStream;", mID); // WARNING: the caller becomes the owner of the returned pointer @@ -103,7 +103,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinarySt sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) { jlong out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { // initialize temporary variable diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index 769cc520e147..713a22e3dd49 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -70,7 +70,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTyp sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callBooleanMethod( "wasNull", mID ); @@ -78,14 +78,14 @@ sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex ); } sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod; @@ -97,7 +97,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); Sequence< sal_Int8 > aSeq; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jbyteArray out = static_cast<jbyteArray>(callObjectMethodWithIntArg(t.pEnv,"getBytes","(I)[B", mID, columnIndex)); @@ -112,7 +112,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co } css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); @@ -120,7 +120,7 @@ css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIn } double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); double (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallDoubleMethod; @@ -129,7 +129,7 @@ double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jfloat (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallFloatMethod; @@ -138,7 +138,7 @@ float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex); @@ -146,7 +146,7 @@ sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jlong (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallLongMethod; @@ -155,7 +155,7 @@ sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callObjectMethodWithIntArg(t.pEnv,"getObject","(I)Ljava/lang/Object;", mID, columnIndex); @@ -165,7 +165,7 @@ Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jshort (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallShortMethod; @@ -176,7 +176,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callStringMethodWithIntArg("getString",mID,columnIndex); @@ -184,7 +184,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex); @@ -194,7 +194,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex); @@ -206,7 +206,7 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); @@ -227,7 +227,7 @@ void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); @@ -265,7 +265,7 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getChara Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex); @@ -275,7 +275,7 @@ Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sa Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getClob","(I)Ljava/sql/Clob;", mID, columnIndex); @@ -284,7 +284,7 @@ Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_ } Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBlob","(I)Ljava/sql/Blob;", mID, columnIndex); @@ -294,7 +294,7 @@ Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_ Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex); @@ -318,7 +318,7 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); if( t.pEnv && !object ){ // initialize temporary variable static const char * const cMethodName = "prepareCall"; diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index 3793b3c7543c..a12cce6d2f6c 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -50,7 +50,7 @@ jclass java_sql_Clob::getMyClass() const sal_Int64 SAL_CALL java_sql_Clob::length( ) { jlong out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { // initialize temporary variable @@ -67,7 +67,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); OUString aStr; { // initialize temporary variable @@ -97,7 +97,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacte sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) { jlong out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { jvalue args[1]; diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 9967d09c5bf9..6a91b6cc8e20 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -111,7 +111,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName ); jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/sql/ResultSet;"; @@ -340,7 +340,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName ); jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Ljava/sql/ResultSet;"; @@ -381,7 +381,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName ); jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)Ljava/sql/ResultSet;"; @@ -497,7 +497,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference( m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName ); jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { static const char * const cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/ResultSet;"; // execute Java-Call @@ -1415,7 +1415,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs( const Sequence< sal_Int32 >& types ) { jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 856c0de38fb1..c92b71344b8e 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -86,7 +86,7 @@ sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 throw css::io::BufferSizeExceededException( THROW_WHERE, *this ); jint out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { jbyteArray pByteArray = t.pEnv->NewByteArray(nBytesToRead); diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index d089a3e43e0e..4239aca287da 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -341,7 +341,7 @@ Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) Reference< XDatabaseMetaData > xMetaData = m_xMetaData; if(!xMetaData.is()) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/DatabaseMetaData;", mID); if(out) @@ -416,7 +416,7 @@ Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMa ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); callObjectMethod(t.pEnv,"getTypeMap","()Ljava/util/Map;", mID); // WARNING: the caller becomes the owner of the returned pointer @@ -533,7 +533,7 @@ OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); OUString aStr; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { // initialize temporary Variable diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 275dfcaeb7e9..4b1534a0bad0 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -149,7 +149,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); // initialize temporary Variable try @@ -186,7 +186,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) void SAL_CALL java_sql_Statement_Base::cancel( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("cancel",mID); @@ -206,7 +206,7 @@ void SAL_CALL java_sql_Statement_Base::close( ) void SAL_CALL java_sql_Statement::clearBatch( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); @@ -223,7 +223,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); jboolean out(false); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); m_sSqlStatement = sql; @@ -257,7 +257,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OU m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_QUERY, sql ); jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); @@ -304,7 +304,7 @@ void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); static jmethodID mID(nullptr); @@ -318,7 +318,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); Sequence< sal_Int32 > aSeq; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jintArray out = static_cast<jintArray>(callObjectMethod(t.pEnv,"executeBatch","()[I", mID)); @@ -339,7 +339,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_UPDATE, sql ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); m_sSqlStatement = sql; static jmethodID mID(nullptr); @@ -349,7 +349,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callResultSetMethod(t.env(),"getResultSet",mID); @@ -361,7 +361,7 @@ Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSe sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); sal_Int32 out = callIntMethod_ThrowSQL("getUpdateCount", mID); @@ -443,7 +443,7 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jmethodID& _inout_MethodID) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); return callIntMethod_ThrowRuntime(_pMethodName, _inout_MethodID); } @@ -470,7 +470,7 @@ OUString java_sql_Statement_Base::getCursorName() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); try @@ -487,7 +487,7 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setQueryTimeOut", mID, _par0); @@ -500,7 +500,7 @@ void java_sql_Statement_Base::setEscapeProcessing(bool _par0) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_SET_ESCAPE_PROCESSING, _par0 ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); m_bEscapeProcessing = _par0; createStatement( t.pEnv ); static jmethodID mID(nullptr); @@ -511,7 +511,7 @@ void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setMaxRows", mID, _par0); @@ -542,7 +542,7 @@ void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINER, STR_LOG_FETCH_DIRECTION, _par0 ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0); @@ -554,7 +554,7 @@ void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINER, STR_LOG_FETCH_SIZE, _par0 ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0); @@ -564,7 +564,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setMaxFieldSize", mID, _par0); @@ -574,7 +574,7 @@ void java_sql_Statement_Base::setCursorName(const OUString &_par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); static jmethodID mID(nullptr); diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 0a995a50d6fd..2dab49c56ebb 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -99,7 +99,7 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callBooleanMethod( "execute", mID ); @@ -112,7 +112,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_UPDATE ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callIntMethod_ThrowSQL("executeUpdate", mID); @@ -125,7 +125,7 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINER, STR_LOG_STRING_PARAMETER, parameterIndex, x ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { // initialize temporary Variable createStatement(t.pEnv); static const char * const cSignature = "(ILjava/lang/String;)V"; @@ -153,7 +153,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callResultSetMethod(t.env(),"executeQuery",mID); @@ -168,7 +168,7 @@ void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setBoolean", "(IZ)V", mID, parameterIndex, x); @@ -181,7 +181,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setByte", "(IB)V", mID, parameterIndex, x); @@ -194,7 +194,7 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); java_sql_Date aT(x); static jmethodID mID(nullptr); @@ -208,7 +208,7 @@ void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, con ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); java_sql_Time aT(x); static jmethodID mID(nullptr); @@ -222,7 +222,7 @@ void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); java_sql_Timestamp aD(x); @@ -235,7 +235,7 @@ void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, d ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setDouble", "(ID)V", mID, parameterIndex, x); @@ -248,7 +248,7 @@ void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, fl ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setFloat", "(IF)V", mID, parameterIndex, x); @@ -261,7 +261,7 @@ void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setInt", "(II)V", mID, parameterIndex, x); @@ -274,7 +274,7 @@ void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setLong", "(IJ)V", mID, parameterIndex, x); @@ -287,7 +287,7 @@ void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setNull", "(II)V", mID, parameterIndex, sqlType); @@ -324,7 +324,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); @@ -384,7 +384,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL<jobject>("setObject", "(ILjava/lang/Object;)V", mID, parameterIndex, nullptr); @@ -410,7 +410,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setShort", "(IS)V", mID, parameterIndex, x); @@ -423,7 +423,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); @@ -457,7 +457,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); SDBThreadAttach t; - assert(t.pEnv && "Java enviroment has been deleted!"); + assert(t.pEnv && "Java environment has been deleted!"); { createStatement(t.pEnv); @@ -515,7 +515,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); // initialize temporary variable @@ -587,7 +587,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); static jmethodID mID(nullptr); @@ -600,7 +600,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { createStatement(t.pEnv); static jmethodID mID(nullptr); @@ -614,7 +614,7 @@ css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatc ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); css::uno::Sequence< sal_Int32 > aSeq; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jintArray out = static_cast<jintArray>(callObjectMethod(t.pEnv,"executeBatch","()[I", mID)); @@ -632,7 +632,7 @@ css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedS { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID); diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index e9a38075347c..1342d0c0a14c 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -79,7 +79,7 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) if(m_buf != boost::none) return 1; jboolean out; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { static const char * const cSignature = "()Z"; @@ -129,7 +129,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aD sal_Int32 nCharsToRead = (nBytesToRead + 1)/2; jint outChars(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { jcharArray pCharArray = t.pEnv->NewCharArray(nCharsToRead); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 61703d6edcce..29ad290bb25f 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -103,7 +103,7 @@ void java_sql_ResultSet::disposing() ::osl::MutexGuard aGuard(m_aMutex); if( object ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("close", mID); clearObject(*t.pEnv); @@ -136,7 +136,7 @@ sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBinaryStream","(I)Ljava/io/InputStream;", mID, columnIndex); @@ -146,7 +146,7 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getCharacterStream","(I)Ljava/io/Reader;", mID, columnIndex); @@ -173,7 +173,7 @@ sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) { Sequence< sal_Int8 > aSeq; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jbyteArray out = static_cast<jbyteArray>(callObjectMethodWithIntArg(t.pEnv,"getBytes","(I)[B", mID, columnIndex)); if (out) @@ -189,7 +189,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer @@ -237,7 +237,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID); @@ -246,7 +246,7 @@ css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex); @@ -257,7 +257,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getClob","(I)Ljava/sql/Clob;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer @@ -266,7 +266,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBlob","(I)Ljava/sql/Blob;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer @@ -276,7 +276,7 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex); @@ -289,7 +289,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen { jobject out(nullptr); Any aRet; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); { jvalue args[2]; // convert parameter @@ -363,7 +363,7 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer @@ -373,7 +373,7 @@ css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index 13ee3000ddb5..cdb69dd3a76c 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang; void java_util_Properties::setProperty(const OUString& key, const OUString& value) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java environment has been deleted!"); jobject out(nullptr); { |