From 22c42a3a1650426852fa334766b5da85d4668a4f Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Sat, 15 Jan 2005 00:45:37 +0000 Subject: [PATCH] really fix the broken patch, closes bug #78020 Package-Manager: portage-2.0.51-r12 --- .../files/1.1.3/javafix.patch | 54 +++++++++---------- .../openoffice/files/1.1.4/javafix.patch | 54 +++++++++---------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/app-office/openoffice-ximian/files/1.1.3/javafix.patch b/app-office/openoffice-ximian/files/1.1.3/javafix.patch index 6546ff1a7c95..e2d9ccf723b1 100644 --- a/app-office/openoffice-ximian/files/1.1.3/javafix.patch +++ b/app-office/openoffice-ximian/files/1.1.3/javafix.patch @@ -1,27 +1,27 @@ ---- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx 24 Apr 2003 13:20:29 -0000 -+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx 27 Dec 2004 09:35:38 -0000 -@@ -184,7 +184,12 @@ - { - jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); - if(id) -- return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); -+ return copyArrayAndDelete( -+ t.pEnv, -+ (jobjectArray)t.pEnv->GetObjectField( object, id), -+ static_cast< const ::rtl::OUString* >( NULL ), -+ static_cast< const java_lang_String* >( NULL ) -+ ); - } //t.pEnv - return Sequence< ::rtl::OUString>(); - } ---- connectivity/source/inc/java/tools.hxx 1 Nov 2002 10:58:49 -0000 -+++ connectivity/source/inc/java/tools.hxx 27 Dec 2004 09:35:42 -0000 -@@ -101,7 +101,7 @@ - - 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); - -- template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) -+ template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) - { - ::com::sun::star::uno::Sequence< T > xOut; - if(_Array) +--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx ++++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +@@ -184,7 +184,12 @@ + { + jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); + if(id) +- return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); ++ return copyArrayAndDelete( ++ t.pEnv, ++ (jobjectArray)t.pEnv->GetObjectField( object, id), ++ static_cast< const ::rtl::OUString* >( NULL ), ++ static_cast< const java_lang_String* >( NULL ) ++ ); + } //t.pEnv + return Sequence< ::rtl::OUString>(); + } +--- connectivity/source/inc/java/tools.hxx ++++ connectivity/source/inc/java/tools.hxx +@@ -101,7 +101,7 @@ + + 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); + +- template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) ++ template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) + { + ::com::sun::star::uno::Sequence< T > xOut; + if(_Array) diff --git a/app-office/openoffice/files/1.1.4/javafix.patch b/app-office/openoffice/files/1.1.4/javafix.patch index 6546ff1a7c95..e2d9ccf723b1 100644 --- a/app-office/openoffice/files/1.1.4/javafix.patch +++ b/app-office/openoffice/files/1.1.4/javafix.patch @@ -1,27 +1,27 @@ ---- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx 24 Apr 2003 13:20:29 -0000 -+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx 27 Dec 2004 09:35:38 -0000 -@@ -184,7 +184,12 @@ - { - jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); - if(id) -- return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); -+ return copyArrayAndDelete( -+ t.pEnv, -+ (jobjectArray)t.pEnv->GetObjectField( object, id), -+ static_cast< const ::rtl::OUString* >( NULL ), -+ static_cast< const java_lang_String* >( NULL ) -+ ); - } //t.pEnv - return Sequence< ::rtl::OUString>(); - } ---- connectivity/source/inc/java/tools.hxx 1 Nov 2002 10:58:49 -0000 -+++ connectivity/source/inc/java/tools.hxx 27 Dec 2004 09:35:42 -0000 -@@ -101,7 +101,7 @@ - - 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); - -- template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) -+ template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) - { - ::com::sun::star::uno::Sequence< T > xOut; - if(_Array) +--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx ++++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +@@ -184,7 +184,12 @@ + { + jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); + if(id) +- return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); ++ return copyArrayAndDelete( ++ t.pEnv, ++ (jobjectArray)t.pEnv->GetObjectField( object, id), ++ static_cast< const ::rtl::OUString* >( NULL ), ++ static_cast< const java_lang_String* >( NULL ) ++ ); + } //t.pEnv + return Sequence< ::rtl::OUString>(); + } +--- connectivity/source/inc/java/tools.hxx ++++ connectivity/source/inc/java/tools.hxx +@@ -101,7 +101,7 @@ + + 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); + +- template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) ++ template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) + { + ::com::sun::star::uno::Sequence< T > xOut; + if(_Array) -- 2.26.2