diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-01-15 00:45:37 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-01-15 00:45:37 +0000 |
| commit | 7d0905266f7aa6ca60aa661eb2ad0ce1cdb38333 (patch) | |
| tree | 6abea26b0d67f0248c3f53f734c7ba2d708eb142 /app-office/openoffice-ximian | |
| parent | made dep on a monolithic kde-base package accept the equivalent -meta package... (diff) | |
| download | gentoo-2-7d0905266f7aa6ca60aa661eb2ad0ce1cdb38333.tar.gz gentoo-2-7d0905266f7aa6ca60aa661eb2ad0ce1cdb38333.tar.bz2 gentoo-2-7d0905266f7aa6ca60aa661eb2ad0ce1cdb38333.zip | |
really fix the broken patch, closes bug #78020
(Portage version: 2.0.51-r12)
Diffstat (limited to 'app-office/openoffice-ximian')
| -rw-r--r-- | app-office/openoffice-ximian/files/1.1.3/javafix.patch | 54 |
1 files changed, 27 insertions, 27 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<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2)
-+ template<class T,class JT> ::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<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) ++ template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) + { + ::com::sun::star::uno::Sequence< T > xOut; + if(_Array) |