diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:32:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:32:36 +0000 |
| commit | 3b734a66ed194e47fb2f737a9c0d8388dfa8fb3f (patch) | |
| tree | 118f331cb24866f12d70e963e5482d447de40c0b /connectivity/source/drivers/jdbc/Array.cxx | |
| parent | 4080aeab0c758d247182cacd9984794167b1d7f9 (diff) | |
INTEGRATION: CWS warnings01 (1.7.30); FILE MERGED
2005/11/21 10:07:45 fs 1.7.30.2: #i57457# warning-free code on unx*
2005/11/16 12:59:09 fs 1.7.30.1: #i57457# warning free code
Diffstat (limited to 'connectivity/source/drivers/jdbc/Array.cxx')
| -rw-r--r-- | connectivity/source/drivers/jdbc/Array.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 410c5f601b71..e3435edb5d7d 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -4,9 +4,9 @@ * * $RCSfile: Array.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 06:07:38 $ + * last change: $Author: hr $ $Date: 2006-06-20 01:32:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,8 +79,8 @@ void java_sql_Array::saveClassRef( jclass pClass ) ::rtl::OUString aStr; if( t.pEnv ){ // temporaere Variable initialisieren - static char * cSignature = "(I)Ljava/lang/String;"; - static char * cMethodName = "getBaseTypeName"; + static const char * cSignature = "(I)Ljava/lang/String;"; + static const char * cMethodName = "getBaseTypeName"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -103,8 +103,8 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: if( t.pEnv ) { // temporaere Variable initialisieren - static char * cSignature = "()I"; - static char * cMethodName = "getBaseType"; + static const char * cSignature = "()I"; + static const char * cMethodName = "getBaseType"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -124,9 +124,9 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ) { - jobject obj = XNameAccess2Map(t.pEnv,typeMap); - static char * cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;"; - static char * cMethodName = "getArray"; + jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); + static const char * cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;"; + static const char * cMethodName = "getArray"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -147,9 +147,9 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ) { - jobject obj = XNameAccess2Map(t.pEnv,typeMap); - static char * cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;"; - static char * cMethodName = "getArray"; + jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); + static const char * cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;"; + static const char * cMethodName = "getArray"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -170,10 +170,10 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ // Parameter konvertieren - jobject obj = XNameAccess2Map(t.pEnv,typeMap); + jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); // temporaere Variable initialisieren - static char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;"; - static char * cMethodName = "getResultSet"; + static const char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;"; + static const char * cMethodName = "getResultSet"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) @@ -196,10 +196,10 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ // Parameter konvertieren - jobject obj = XNameAccess2Map(t.pEnv,typeMap); + jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); // temporaere Variable initialisieren - static char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;"; - static char * cMethodName = "getResultSetAtIndex"; + static const char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;"; + static const char * cMethodName = "getResultSetAtIndex"; // Java-Call absetzen static jmethodID mID = NULL; if ( !mID ) |