[Libreoffice-commits] .: 2 commits - connectivity/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Thu Feb 24 04:27:34 PST 2011
connectivity/source/drivers/jdbc/CallableStatement.cxx | 4 -
connectivity/source/drivers/jdbc/JConnection.cxx | 18 ++---
connectivity/source/drivers/jdbc/JStatement.cxx | 28 +++----
connectivity/source/drivers/jdbc/Object.cxx | 10 +-
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 44 ++++++------
connectivity/source/drivers/jdbc/Reader.cxx | 6 -
connectivity/source/drivers/jdbc/Ref.cxx | 2
connectivity/source/drivers/jdbc/ResultSet.cxx | 60 ++++++++---------
8 files changed, 86 insertions(+), 86 deletions(-)
New commits:
commit bfea60c4799cab31ce8fc3ed0c8f3c50fe30f2da
Author: Rob Snelders <programming at ertai.nl>
Date: Thu Feb 24 13:27:12 2011 +0100
translated comments
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index a8ed19c..452ecb0 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -325,7 +325,7 @@ void java_sql_Connection::disposing()
// -------------------------------------------------------------------------
jclass java_sql_Connection::getMyClass() const
{
- // die Klasse muss nur einmal geholt werden, daher statisch
+ // the class must be fetched only once, therefore static
if( !theClass )
theClass = findMyClass("java/sql/Connection");
return theClass;
@@ -428,7 +428,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connecti
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
/*jobject out = */callObjectMethod(t.pEnv,"getTypeMap","()Ljava/util/Map;", mID);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return 0;// ? 0 : Map2XNameAccess( t.pEnv, out );
}
// -------------------------------------------------------------------------
@@ -545,13 +545,13 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
- // temporaere Variable initialisieren
+ // initialize temporary Variable
static const char * cSignature = "(Ljava/lang/String;)Ljava/lang/String;";
static const char * cMethodName = "nativeSQL";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
- // Parameter konvertieren
+ // Convert Parameter
jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,sql));
jobject out = t.pEnv->CallObjectMethod( object, mID, str.get() );
@@ -578,7 +578,7 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc
SDBThreadAttach t;
static jmethodID mID(NULL);
jobject out = callObjectMethod(t.pEnv,"getWarnings","()Ljava/sql/SQLWarning;", mID);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
if( out )
{
java_sql_SQLWarning_BASE warn_base(t.pEnv, out);
@@ -819,17 +819,17 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url,
if ( t.pEnv && m_Driver_theClass && m_pDriverobject )
{
- // temporaere Variable initialisieren
+ // initialize temporary Variable
static const char * cSignature = "(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;";
static const char * cMethodName = "connect";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID = NULL;
if ( !mID )
mID = t.pEnv->GetMethodID( m_Driver_theClass, cMethodName, cSignature );
if ( mID )
{
jvalue args[2];
- // Parameter konvertieren
+ // convert Parameter
args[0].l = convertwchar_tToJavaString(t.pEnv,url);
java_util_Properties* pProps = createStringPropertyArray(info);
args[1].l = pProps->getJavaObject();
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index bde7622..b5847ba 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -109,7 +109,7 @@ void SAL_CALL OStatement_BASE2::disposing()
// -------------------------------------------------------------------------
jclass java_sql_Statement_Base::getMyClass() const
{
- // die Klasse muss nur einmal geholt werden, daher statisch
+ // the class must be fetched only once, therefore static
if( !theClass )
theClass = findMyClass("java/sql/Statement");
return theClass;
@@ -163,7 +163,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( )
jobject out(0);
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
- // temporaere Variable initialisieren
+ // initialize temporary Variable
try
{
static jmethodID mID(NULL);
@@ -240,13 +240,13 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql )
{
createStatement(t.pEnv);
m_sSqlStatement = sql;
- // temporaere Variable initialisieren
+ // initialize temporary Variable
static const char * cSignature = "(Ljava/lang/String;)Z";
static const char * cMethodName = "execute";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
- // Parameter konvertieren
+ // convert Parameter
jdbc::LocalRef< jstring > str( t.env(), convertwchar_tToJavaString( t.pEnv, sql ) );
{
jdbc::ContextClassLoaderScope ccl( t.env(),
@@ -275,13 +275,13 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const ::
{
createStatement(t.pEnv);
m_sSqlStatement = sql;
- // temporaere Variable initialisieren
+ // initialize temporary variable
static const char * cSignature = "(Ljava/lang/String;)Ljava/sql/ResultSet;";
static const char * cMethodName = "executeQuery";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
- // Parameter konvertieren
+ // convert Parameter
jdbc::LocalRef< jstring > str( t.env(), convertwchar_tToJavaString( t.pEnv, sql ) );
{
jdbc::ContextClassLoaderScope ccl( t.env(),
@@ -294,7 +294,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const ::
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
}
} //t.pEnv
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this );
}
// -------------------------------------------------------------------------
@@ -368,7 +368,7 @@ Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base
static jmethodID mID(NULL);
jobject out = callResultSetMethod(t.env(),"getResultSet",mID);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this );
}
// -------------------------------------------------------------------------
@@ -398,7 +398,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sd
createStatement(t.pEnv);
static jmethodID mID(NULL);
jobject out = callObjectMethod(t.pEnv,"getWarnings","()Ljava/sql/SQLWarning;", mID);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
if( out )
{
java_sql_SQLWarning_BASE warn_base( t.pEnv, out );
@@ -758,7 +758,7 @@ java_sql_Statement::~java_sql_Statement()
jclass java_sql_Statement::getMyClass() const
{
- // die Klasse muss nur einmal geholt werden, daher statisch
+ // the class must be fetched only once, therefore static
if( !theClass )
theClass = findMyClass("java/sql/Statement");
return theClass;
@@ -771,10 +771,10 @@ void java_sql_Statement::createStatement(JNIEnv* _pEnv)
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
if( _pEnv && !object ){
- // temporaere Variable initialisieren
+ // initialize temporary variable
static const char * cSignature = "(II)Ljava/sql/Statement;";
static const char * cMethodName = "createStatement";
- // Java-Call absetzen
+ // Java-Call
jobject out = NULL;
static jmethodID mID(NULL);
if ( !mID )
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 811c2e5..a78d8fe 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -104,7 +104,7 @@ void SDBThreadAttach::releaseRef()
}
}
// -----------------------------------------------------------------------------
-// statische Variablen der Klasse:
+// static variables of the class
jclass java_lang_Object::theClass = 0;
jclass java_lang_Object::getMyClass() const
@@ -113,14 +113,14 @@ jclass java_lang_Object::getMyClass() const
theClass = findMyClass("java/lang/Object");
return theClass;
}
-// der eigentliche Konstruktor
+// the actual constructor
java_lang_Object::java_lang_Object(const Reference<XMultiServiceFactory >& _rxFactory)
: m_xFactory(_rxFactory),object( 0 )
{
SDBThreadAttach::addRef();
}
-// der protected-Konstruktor fuer abgeleitete Klassen
+// the protected-constructor for the derived classes
java_lang_Object::java_lang_Object( JNIEnv * pXEnv, jobject myObj )
: object( NULL )
{
@@ -155,7 +155,7 @@ void java_lang_Object::clearObject()
clearObject(*t.pEnv);
}
}
-// der protected-Konstruktor fuer abgeleitete Klassen
+// the protected-constructor for the derived classes
void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj )
{
OSL_ENSURE( myObj, "object in c++ -> Java Wrapper" );
@@ -412,7 +412,7 @@ sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName
// -----------------------------------------------------------------------------
jclass java_lang_Object::findMyClass(const char* _pClassName)
{
- // die Klasse muss nur einmal geholt werden, daher statisch
+ // the class must be fetched only once, therefore static
SDBThreadAttach t;
jclass tempClass = t.pEnv->FindClass(_pClassName); OSL_ENSURE(tempClass,"Java : FindClass nicht erfolgreich!");
if(!tempClass)
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 21092d5..5c112dd 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -73,7 +73,7 @@ java_sql_PreparedStatement::~java_sql_PreparedStatement()
jclass java_sql_PreparedStatement::getMyClass() const
{
- // die Klasse muss nur einmal geholt werden, daher statisch
+ // the class must be fetched only once, therefore static
if( !theClass )
theClass = findMyClass("java/sql/PreparedStatement");
return theClass;
@@ -129,16 +129,16 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c
m_aLogger.log( LogLevel::FINER, STR_LOG_STRING_PARAMETER, parameterIndex, x );
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
- { // temporaere Variable initialisieren
+ { // initialize temporary Variable
createStatement(t.pEnv);
static const char * cSignature = "(ILjava/lang/String;)V";
static const char * cMethodName = "setString";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,x));
t.pEnv->CallVoidMethod( object, mID, parameterIndex,str.get());
- // und aufraeumen
+ // and clean up
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
} //t.pEnv
}
@@ -332,10 +332,10 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
{
createStatement(t.pEnv);
- // temporaere Variable initialisieren
+ // initialize temporary Variable
static const char * cSignature = "(ILjava/lang/Object;II)V";
static const char * cMethodName = "setObject";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
{
@@ -375,7 +375,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
t.pEnv->CallVoidMethod( object, mID, parameterIndex,obj,targetSqlType,scale);
t.pEnv->DeleteLocalRef(obj);
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
- // und aufraeumen
+ // and clean up
} //mID
} //t.pEnv
}
@@ -430,10 +430,10 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co
{
createStatement(t.pEnv);
- // temporaere Variable initialisieren
+ // initialize temporary Variable
static const char * cSignature = "(I[B)V";
static const char * cMethodName = "setBytes";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
jbyteArray pByteArray = t.pEnv->NewByteArray(x.getLength());
@@ -455,10 +455,10 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete
{
createStatement(t.pEnv);
- // temporaere Variable initialisieren
+ // initialize temporary variable
static const char * cSignature = "(ILjava/io/InputStream;I)V";
static const char * cMethodName = "setCharacterStream";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
Sequence< sal_Int8 > aSeq;
@@ -472,9 +472,9 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete
args2[0].l = pByteArray;
args2[1].i = 0;
args2[2].i = actualLength;
- // temporaere Variable initialisieren
+ // initialize temporary variable
const char * cSignatureStream = "([BII)V";
- // Java-Call absetzen
+ // Java-Call
jclass aClass = t.pEnv->FindClass("java/io/CharArrayInputStream");
static jmethodID mID2 = NULL;
if ( !mID2 )
@@ -484,7 +484,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete
tempObj = t.pEnv->NewObjectA( aClass, mID2, args2 );
t.pEnv->CallVoidMethod( object, mID, parameterIndex,tempObj,actualLength);
- // und aufraeumen
+ // and clean up
t.pEnv->DeleteLocalRef(pByteArray);
t.pEnv->DeleteLocalRef(tempObj);
t.pEnv->DeleteLocalRef(aClass);
@@ -502,10 +502,10 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
createStatement(t.pEnv);
- // temporaere Variable initialisieren
+ // initialize temporary variable
static const char * cSignature = "(ILjava/io/InputStream;I)V";
static const char * cMethodName = "setBinaryStream";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
{
@@ -521,9 +521,9 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn
args2[1].i = 0;
args2[2].i = (sal_Int32)actualLength;
- // temporaere Variable initialisieren
+ // initialize temporary variable
const char * cSignatureStream = "([BII)V";
- // Java-Call absetzen
+ // Java-Call
jclass aClass = t.pEnv->FindClass("java/io/ByteArrayInputStream");
static jmethodID mID2 = NULL;
if ( !mID2 )
@@ -532,7 +532,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn
if(mID2)
tempObj = t.pEnv->NewObjectA( aClass, mID2, args2 );
t.pEnv->CallVoidMethod( object, mID, parameterIndex,tempObj,(sal_Int32)actualLength);
- // und aufraeumen
+ // and clean up
t.pEnv->DeleteLocalRef(pByteArray);
t.pEnv->DeleteLocalRef(tempObj);
t.pEnv->DeleteLocalRef(aClass);
@@ -630,14 +630,14 @@ void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv)
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
if( !object && _pEnv ){
- // temporaere Variable initialisieren
+ // initialize temporary variable
static const char * cSignature = "(Ljava/lang/String;II)Ljava/sql/PreparedStatement;";
static const char * cMethodName = "prepareStatement";
jvalue args[1];
- // Parameter konvertieren
+ // convert Parameter
args[0].l = convertwchar_tToJavaString(_pEnv,m_sSqlStatement);
- // Java-Call absetzen
+ // Java-Call
jobject out = NULL;
static jmethodID mID(NULL);
if ( !mID )
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 6bf9bf9..9998b6c 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -49,7 +49,7 @@ java_io_Reader::~java_io_Reader()
jclass java_io_Reader::getMyClass() const
{
- // die Klasse muss nur einmal geholt werden, daher statisch
+ // the class must be fetched only once, therefore static
if( !theClass )
theClass = findMyClass("java/io/Reader");
return theClass;
@@ -74,7 +74,7 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::Not
{
static const char * cSignature = "()Z";
static const char * cMethodName = "available";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
out = t.pEnv->CallBooleanMethod( object, mID);
@@ -99,7 +99,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< s
jcharArray pCharArray = t.pEnv->NewCharArray(nBytesToRead);
static const char * cSignature = "([CII)I";
static const char * cMethodName = "read";
- // Java-Call absetzen
+ // Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
out = t.pEnv->CallIntMethod( object, mID, pCharArray, 0, nBytesToRead );
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index 82a4aa4..ad49a24 100644
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
@@ -48,7 +48,7 @@ java_sql_Ref::~java_sql_Ref()
jclass java_sql_Ref::getMyClass() const
{
- // die Klasse muss nur einmal geholt werden, daher statisch
+ // the class must be fetched only once, therefore static
if( !theClass )
theClass = findMyClass("java/sql/Ref");
return theClass;
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 91a67cd..9ab7934 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -104,7 +104,7 @@ java_sql_ResultSet::~java_sql_ResultSet()
jclass java_sql_ResultSet::getMyClass() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen at sun.com", "java_sql_ResultSet::getMyClass" );
- // die Klasse muss nur einmal geholt werden, daher statisch
+ // the class must be fetched only once, therefore static
if( !theClass )
theClass = findMyClass("java/sql/ResultSet");
return theClass;
@@ -161,7 +161,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getBinaryStream","(I)Ljava/io/InputStream;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_io_InputStream( t.pEnv, out );
}
// -------------------------------------------------------------------------
@@ -172,7 +172,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getCharacterStream","(I)Ljava/io/Reader;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_io_Reader( t.pEnv, out );
}
// -------------------------------------------------------------------------
@@ -218,7 +218,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out ? static_cast <com::sun::star::util::Date> (java_sql_Date( t.pEnv, out )) : ::com::sun::star::util::Date();
}
// -------------------------------------------------------------------------
@@ -283,7 +283,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_sql_Array( t.pEnv, out );
}
// -------------------------------------------------------------------------
@@ -294,7 +294,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex )
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getClob","(I)Ljava/sql/Clob;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_sql_Clob( t.pEnv, out );
}
// -------------------------------------------------------------------------
@@ -304,7 +304,7 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex )
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getBlob","(I)Ljava/sql/Blob;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_sql_Blob( t.pEnv, out );
}
// -------------------------------------------------------------------------
@@ -316,7 +316,7 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out==0 ? 0 : new java_sql_Ref( t.pEnv, out );
}
// -------------------------------------------------------------------------
@@ -329,11 +329,11 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
{
jvalue args[2];
- // Parameter konvertieren
+ // convert parameter
args[0].i = (sal_Int32)columnIndex;
args[1].l = convertTypeMapToJavaMap(t.pEnv,typeMap);
- // temporaere Variable initialisieren
- // Java-Call absetzen
+ // initialize temporary Variable
+ // Java-Call
static jmethodID mID(NULL);
if ( !mID )
{
@@ -346,7 +346,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
out = t.pEnv->CallObjectMethodA( object, mID, args);
t.pEnv->DeleteLocalRef((jstring)args[1].l);
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
- // und aufraeumen
+ // and clean up
if ( out )
{
if ( t.pEnv->IsInstanceOf(out,java_lang_String::st_getMyClass()) )
@@ -408,7 +408,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out ? static_cast <com::sun::star::util::Time> (java_sql_Time( t.pEnv, out )) : ::com::sun::star::util::Time();
}
// -------------------------------------------------------------------------
@@ -420,7 +420,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
static jmethodID mID(NULL);
jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime();
}
// -------------------------------------------------------------------------
@@ -578,7 +578,7 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc
SDBThreadAttach t;
static jmethodID mID(NULL);
jobject out = callObjectMethod(t.pEnv,"getWarnings","()Ljava/sql/SQLWarning;", mID);
- // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
+ // WARNING: the caller becomes the owner of the returned pointer
if( out )
{
java_sql_SQLWarning_BASE warn_base( t.pEnv, out );
@@ -706,8 +706,8 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::r
{
- // temporaere Variable initialisieren
- // Java-Call absetzen
+ // initialize temporary variable
+ // Java-Call
static jmethodID mID(NULL);
if ( !mID )
{
@@ -718,7 +718,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::r
}
{
- // Parameter konvertieren
+ // convert parameter
jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,x));
t.pEnv->CallVoidMethod( object, mID,columnIndex,str.get());
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
@@ -733,8 +733,8 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co
SDBThreadAttach t;
{
- // temporaere Variable initialisieren
- // Java-Call absetzen
+ // initialize temporary variable
+ // Java-Call
static jmethodID mID(NULL);
if ( !mID )
{
@@ -747,7 +747,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co
{
jbyteArray aArray = t.pEnv->NewByteArray(x.getLength());
t.pEnv->SetByteArrayRegion(aArray,0,x.getLength(),(jbyte*)x.getConstArray());
- // Parameter konvertieren
+ // convert parameter
t.pEnv->CallVoidMethod( object, mID,columnIndex,aArray);
t.pEnv->DeleteLocalRef(aArray);
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
@@ -791,8 +791,8 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con
SDBThreadAttach t;
{
- // temporaere Variable initialisieren
- // Java-Call absetzen
+ // initialize temporary variable
+ // Java-Call
static jmethodID mID(NULL);
if ( !mID )
{
@@ -802,7 +802,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con
}
{
- // Parameter konvertieren
+ // convert Parameter
jobject obj = createByteInputStream(x,length);
t.pEnv->CallVoidMethod( object, mID, columnIndex,obj,length);
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
@@ -823,8 +823,8 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex,
SDBThreadAttach t;
{
- // temporaere Variable initialisieren
- // Java-Call absetzen
+ // initialize temporary variable
+ // Java-Call
static jmethodID mID(NULL);
if ( !mID )
{
@@ -834,7 +834,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex,
}
{
- // Parameter konvertieren
+ // convert Parameter
jobject obj = createCharArrayReader(x,length);
t.pEnv->CallVoidMethod( object, mID, columnIndex,obj,length);
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
@@ -872,8 +872,8 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co
{
- // temporaere Variable initialisieren
- // Java-Call absetzen
+ // initialize temporary variable
+ // Java-Call
static jmethodID mID(NULL);
if ( !mID )
{
@@ -884,7 +884,7 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co
}
{
- // Parameter konvertieren
+ // convert parameter
double nTemp = 0.0;
::std::auto_ptr<java_math_BigDecimal> pBigDecimal;
if ( x >>= nTemp)
commit 817222f3ac91e124e2cea018067e05618611eb00
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Thu Feb 24 10:00:02 2011 +0100
Removed commented code
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 6d22347..910b643 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -164,9 +164,9 @@ Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
createStatement(t.pEnv);
static jmethodID mID(NULL);
- /*jobject out = */callObjectMethodWithIntArg(t.pEnv,"getObject","(I)Ljava/lang/Object;", mID, columnIndex);
+ callObjectMethodWithIntArg(t.pEnv,"getObject","(I)Ljava/lang/Object;", mID, columnIndex);
// WARNING: the caller becomes the owner of the returned pointer
- return Any(); //out==0 ? 0 : new java_lang_Object( t.pEnv, out );
+ return Any();
}
sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException)
More information about the Libreoffice-commits
mailing list