really fix the broken patch, closes bug #78020

Package-Manager: portage-2.0.51-r12

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 6546ff1a7c954a040cb79cd45fafa364a118a4f1..e2d9ccf723b154511685051ac55d5c6fc64245a4 100644 (file)
--- 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\r
-+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    27 Dec 2004 09:35:38 -0000\r
-@@ -184,7 +184,12 @@\r
-       {\r
-               jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;");\r
-               if(id)\r
--                      return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL));\r
-+                      return copyArrayAndDelete(\r
-+                t.pEnv,\r
-+                (jobjectArray)t.pEnv->GetObjectField( object, id),\r
-+                static_cast< const ::rtl::OUString* >( NULL ),\r
-+                static_cast< const java_lang_String* >( NULL )\r
-+            );\r
-       } //t.pEnv\r
-       return Sequence< ::rtl::OUString>();\r
- }\r
---- connectivity/source/inc/java/tools.hxx     1 Nov 2002 10:58:49 -0000\r
-+++ connectivity/source/inc/java/tools.hxx     27 Dec 2004 09:35:42 -0000\r
-@@ -101,7 +101,7 @@\r
- \r
-       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);\r
- \r
--    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const  T& _rD1,const  JT& _rD2)\r
-+    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* )\r
-       {\r
-                 ::com::sun::star::uno::Sequence< T > xOut;\r
-               if(_Array)\r
+--- 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)

diff --git a/app-office/openoffice/files/1.1.4/javafix.patch b/app-office/openoffice/files/1.1.4/javafix.patch
index 6546ff1a7c954a040cb79cd45fafa364a118a4f1..e2d9ccf723b154511685051ac55d5c6fc64245a4 100644 (file)
--- 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\r
-+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx    27 Dec 2004 09:35:38 -0000\r
-@@ -184,7 +184,12 @@\r
-       {\r
-               jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;");\r
-               if(id)\r
--                      return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL));\r
-+                      return copyArrayAndDelete(\r
-+                t.pEnv,\r
-+                (jobjectArray)t.pEnv->GetObjectField( object, id),\r
-+                static_cast< const ::rtl::OUString* >( NULL ),\r
-+                static_cast< const java_lang_String* >( NULL )\r
-+            );\r
-       } //t.pEnv\r
-       return Sequence< ::rtl::OUString>();\r
- }\r
---- connectivity/source/inc/java/tools.hxx     1 Nov 2002 10:58:49 -0000\r
-+++ connectivity/source/inc/java/tools.hxx     27 Dec 2004 09:35:42 -0000\r
-@@ -101,7 +101,7 @@\r
- \r
-       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);\r
- \r
--    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const  T& _rD1,const  JT& _rD2)\r
-+    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* )\r
-       {\r
-                 ::com::sun::star::uno::Sequence< T > xOut;\r
-               if(_Array)\r
+--- 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)