|
Line
Link Here
|
| 0 |
-- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx |
0 |
++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx |
|
Lines 184-190
Link Here
|
| 184 |
{ |
184 |
{ |
| 185 |
jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); |
185 |
jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); |
| 186 |
if(id) |
186 |
if(id) |
| 187 |
return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); |
187 |
return copyArrayAndDelete( |
|
|
188 |
t.pEnv, |
| 189 |
(jobjectArray)t.pEnv->GetObjectField( object, id), |
| 190 |
static_cast< const ::rtl::OUString* >( NULL ), |
| 191 |
static_cast< const java_lang_String* >( NULL ) |
| 192 |
); |
| 188 |
} //t.pEnv |
193 |
} //t.pEnv |
| 189 |
return Sequence< ::rtl::OUString>(); |
194 |
return Sequence< ::rtl::OUString>(); |
| 190 |
} |
195 |
} |
| 191 |
-- connectivity/source/inc/java/tools.hxx |
196 |
++ connectivity/source/inc/java/tools.hxx |
|
Lines 101-107
Link Here
|
| 101 |
|
101 |
|
| 102 |
java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); |
102 |
java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); |
| 103 |
|
103 |
|
| 104 |
template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) |
104 |
template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) |
| 105 |
{ |
105 |
{ |
| 106 |
::com::sun::star::uno::Sequence< T > xOut; |
106 |
::com::sun::star::uno::Sequence< T > xOut; |
| 107 |
if(_Array) |
107 |
if(_Array) |
