User: hr Date: 06/06/19 18:33:49 Modified: /dba/connectivity/source/drivers/jdbc/ Connection.cxx
Log: INTEGRATION: CWS warnings01 (1.23.26); FILE MERGED 2006/01/25 20:50:21 sb 1.23.26.4: RESYNC: (1.23-1.24); FILE MERGED 2005/11/21 10:07:46 fs 1.23.26.3: #i57457# warning-free code on unx* 2005/11/16 12:59:10 fs 1.23.26.2: #i57457# warning free code 2005/11/07 14:43:40 fs 1.23.26.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: Connection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/Connection.cxx?r1=1.24&r2=1.25 Delta lines: +48 -69 --------------------- --- Connection.cxx 10 Jan 2006 15:44:54 -0000 1.24 +++ Connection.cxx 20 Jun 2006 01:33:46 -0000 1.25 @@ -86,14 +86,14 @@ jclass java_sql_Connection::theClass = 0; java_sql_Connection::java_sql_Connection( const java_sql_Driver* _pDriver) -: java_lang_Object( _pDriver->getORB() ) + :java_lang_Object( _pDriver->getORB() ) ,OSubComponent<java_sql_Connection, java_sql_Connection_BASE>((::cppu::OWeakObject*)_pDriver, this) ,m_xMetaData(NULL) ,m_pDriver(_pDriver) - ,m_Driver_theClass(NULL) ,m_pDriverobject(NULL) - ,m_bIgnoreDriverPrivileges(sal_True) + ,m_Driver_theClass(NULL) ,m_bParameterSubstitution(sal_False) + ,m_bIgnoreDriverPrivileges(sal_True) { } // ----------------------------------------------------------------------------- @@ -148,8 +148,8 @@ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "()V"; - static char * cMethodName = "close"; + static const char * cSignature = "()V"; + static const char * cMethodName = "close"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -194,8 +194,8 @@ if( t.pEnv ) { // temporaere Variable initialisieren - static char * cSignature = "()Ljava/lang/String;"; - static char * cMethodName = "getCatalog"; + static const char * cSignature = "()Ljava/lang/String;"; + static const char * cMethodName = "getCatalog"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -224,8 +224,8 @@ if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "()Ljava/sql/DatabaseMetaData;"; - static char * cMethodName = "getMetaData"; + static const char * cSignature = "()Ljava/sql/DatabaseMetaData;"; + static const char * cMethodName = "getMetaData"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -260,8 +260,8 @@ if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "()V"; - static char * cMethodName = "commit"; + static const char * cSignature = "()V"; + static const char * cMethodName = "commit"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -282,8 +282,8 @@ if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "()Z"; - static char * cMethodName = "isClosed"; + static const char * cSignature = "()Z"; + static const char * cMethodName = "isClosed"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -306,8 +306,8 @@ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "()Z"; - static char * cMethodName = "isReadOnly"; + static const char * cSignature = "()Z"; + static const char * cMethodName = "isReadOnly"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -329,8 +329,8 @@ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "(Ljava/lang/String;)V"; - static char * cMethodName = "setCatalog"; + static const char * cSignature = "(Ljava/lang/String;)V"; + static const char * cMethodName = "setCatalog"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -356,8 +356,8 @@ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "()V"; - static char * cMethodName = "rollback"; + static const char * cSignature = "()V"; + static const char * cMethodName = "rollback"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -380,8 +380,8 @@ if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "()Z"; - static char * cMethodName = "getAutoCommit"; + static const char * cSignature = "()Z"; + static const char * cMethodName = "getAutoCommit"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -403,8 +403,8 @@ if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "(Z)V"; - static char * cMethodName = "setReadOnly"; + static const char * cSignature = "(Z)V"; + static const char * cMethodName = "setReadOnly"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -427,8 +427,8 @@ if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "(Z)V"; - static char * cMethodName = "setAutoCommit"; + static const char * cSignature = "(Z)V"; + static const char * cMethodName = "setAutoCommit"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -452,8 +452,8 @@ if( t.pEnv ) { // temporaere Variable initialisieren - static char * cSignature = "()Ljava/util/Map;"; - static char * cMethodName = "getTypeMap"; + static const char * cSignature = "()Ljava/util/Map;"; + static const char * cMethodName = "getTypeMap"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -467,33 +467,12 @@ return 0;// ? 0 : Map2XNameAccess( t.pEnv, out ); } // ------------------------------------------------------------------------- -void SAL_CALL java_sql_Connection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); - - return; -// SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); -// if( t.pEnv ){ -// -// jvalue args[1]; -// // Parameter konvertieren -// args[0].l = XNameAccess2Map(t.pEnv, typeMap); -// // temporaere Variable initialisieren -// static char * cSignature = "(Ljava/util/Map;)V"; -// static char * cMethodName = "setTypeMap"; -// // Java-Call absetzen -// static jmethodID mID = NULL; -// if ( !mID ) -// mID = t.pEnv->GetMethodID( getMyClass(), cMethodName, cSignature );OSL_ENSURE(mID,"Unknown method id!"); -// if( mID ){ -// t.pEnv->CallVoidMethod( object, mID, args[0].l ); -// ThrowSQLException(t.pEnv,*this); -// t.pEnv->DeleteLocalRef((jstring)args[0].l); -// // und aufraeumen -// } //mID -// } //t.pEnv + ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this ); } // ------------------------------------------------------------------------- @@ -508,8 +487,8 @@ if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "()I"; - static char * cMethodName = "getTransactionIsolation"; + static const char * cSignature = "()I"; + static const char * cMethodName = "getTransactionIsolation"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -530,8 +509,8 @@ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "(I)V"; - static char * cMethodName = "setTransactionIsolation"; + static const char * cSignature = "(I)V"; + static const char * cMethodName = "setTransactionIsolation"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -620,8 +599,8 @@ if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "(Ljava/lang/String;)Ljava/lang/String;"; - static char * cMethodName = "nativeSQL"; + static const char * cSignature = "(Ljava/lang/String;)Ljava/lang/String;"; + static const char * cMethodName = "nativeSQL"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -652,8 +631,8 @@ if( t.pEnv ) { // temporaere Variable initialisieren - static char * cSignature = "()V"; - static char * cMethodName = "clearWarnings"; + static const char * cSignature = "()V"; + static const char * cMethodName = "clearWarnings"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -676,8 +655,8 @@ if( t.pEnv ) { // temporaere Variable initialisieren - static char * cSignature = "()Ljava/sql/SQLWarning;"; - static char * cMethodName = "getWarnings"; + static const char * cSignature = "()Ljava/sql/SQLWarning;"; + static const char * cMethodName = "getWarnings"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -711,7 +690,7 @@ { const PropertyValue* pBegin = info.getConstArray(); const PropertyValue* pEnd = pBegin + info.getLength(); - for(jsize i=0;pBegin != pEnd;++pBegin) + for(;pBegin != pEnd;++pBegin) { if ( !object && !pBegin->Name.compareToAscii("JavaDriverClass") ) { @@ -796,8 +775,8 @@ if ( t.pEnv && m_Driver_theClass && m_pDriverobject ) { // temporaere Variable initialisieren - static char * cSignature = "(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;"; - static char * cMethodName = "connect"; + static const char * cSignature = "(Ljava/lang/String;Ljava/util/Properties;)Ljava/sql/Connection;"; + static const char * cMethodName = "connect"; // Java-Call absetzen jmethodID mID = NULL; if ( !mID ) @@ -808,7 +787,7 @@ jvalue args[2]; // Parameter konvertieren args[0].l = convertwchar_tToJavaString(t.pEnv,url); - java_util_Properties* pProps = createStringPropertyArray(t.pEnv,info); + java_util_Properties* pProps = createStringPropertyArray(info); args[1].l = pProps->getJavaObject(); jobject out = t.pEnv->CallObjectMethod( m_pDriverobject, mID, args[0].l,args[1].l ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
