From 8f569b1b0e665bfa0ea47d356974c815bb1ef3ee Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sat, 15 Apr 2006 02:43:21 +0000 Subject: Update to SRC680_m163 o buildable with diablo-jdk 1.5 --- .../openoffice.org-2.0-devel/files/patch-i59368 | 63 ++++++++++++++++++++++ .../openoffice.org-2.0-devel/files/patch-i63833 | 11 ---- .../openoffice.org-2.0-devel/files/patch-i64412 | 15 ++++++ 3 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 editors/openoffice.org-2.0-devel/files/patch-i59368 delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-i63833 create mode 100644 editors/openoffice.org-2.0-devel/files/patch-i64412 (limited to 'editors/openoffice.org-2.0-devel/files') diff --git a/editors/openoffice.org-2.0-devel/files/patch-i59368 b/editors/openoffice.org-2.0-devel/files/patch-i59368 new file mode 100644 index 000000000000..0d81635520e7 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-i59368 @@ -0,0 +1,63 @@ +Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java +=================================================================== +RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v +retrieving revision 1.2 +diff -u -r1.2 ConvertData.java +--- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java 24 Oct 2005 17:58:33 -0000 1.2 ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java 15 Apr 2006 00:36:23 -0000 +@@ -127,8 +127,8 @@ + * Vector of Document objects. + */ + public Enumeration getDocumentEnumeration() { +- Enumeration enum = v.elements(); +- return (enum); ++ Enumeration enumer = v.elements(); ++ return (enumer); + } + + +Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java +=================================================================== +RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v +retrieving revision 1.2 +diff -u -r1.2 DocumentDeserializerImpl.java +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 24 Oct 2005 18:12:55 -0000 1.2 ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 15 Apr 2006 00:36:23 -0000 +@@ -155,14 +155,14 @@ + */ + public Document deserialize() throws ConvertException, IOException { + log("\nFound the XSLT deserializer"); +- Enumeration enum = cd.getDocumentEnumeration(); ++ Enumeration enumer = cd.getDocumentEnumeration(); + org.w3c.dom.Document domDoc=null; + DOMDocument docOut=null; + GenericOfficeDocument doc = null; + ByteArrayOutputStream baos =null; + GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output"); +- while (enum.hasMoreElements()) { +- docOut = (DOMDocument) enum.nextElement(); ++ while (enumer.hasMoreElements()) { ++ docOut = (DOMDocument) enumer.nextElement(); + } + domDoc = docOut.getContentDOM(); + try{ +Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +=================================================================== +RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v +retrieving revision 1.2 +diff -u -r1.2 PluginFactoryImpl.java +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 24 Oct 2005 18:13:41 -0000 1.2 ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 15 Apr 2006 00:36:23 -0000 +@@ -183,9 +183,9 @@ + String ext= ".txt"; + String mimeType = null; + ConverterInfo ci = this.getConverterInfo(); +- Enumeration enum = ci.getDeviceMime(); +- while (enum.hasMoreElements()) { +- mimeType= (String) enum.nextElement(); ++ Enumeration enumer = ci.getDeviceMime(); ++ while (enumer.hasMoreElements()) { ++ mimeType= (String) enumer.nextElement(); + } + try { + props.load(is); diff --git a/editors/openoffice.org-2.0-devel/files/patch-i63833 b/editors/openoffice.org-2.0-devel/files/patch-i63833 deleted file mode 100644 index cc62cb72b09a..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-i63833 +++ /dev/null @@ -1,11 +0,0 @@ ---- codemaker/prj/build.lst 2006-03-31 06:30:23.000000000 +0200 -+++ codemaker/prj/build.lst 2006-03-31 06:29:01.000000000 +0200 -@@ -4,7 +4,7 @@ - cm codemaker\prj get - all cm_prj NULL - cm codemaker\source\codemaker nmake - all cm_codemaker NULL - cm codemaker\source\commoncpp nmake - all cm_cpp NULL --cm codemaker\source\cppumaker nmake - all cm_cppumaker cm_codemaker NULL -+cm codemaker\source\cppumaker nmake - all cm_cppumaker cm_codemaker cm_cpp NULL - cm codemaker\source\commonjava nmake - all cm_java NULL - cm codemaker\source\javamaker nmake - all cm_javamaker cm_codemaker cm_java NULL - diff --git a/editors/openoffice.org-2.0-devel/files/patch-i64412 b/editors/openoffice.org-2.0-devel/files/patch-i64412 new file mode 100644 index 000000000000..6edf8d9c51a0 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-i64412 @@ -0,0 +1,15 @@ +Index: config_office/set_soenv.in +=================================================================== +RCS file: /cvs/tools/config_office/set_soenv.in,v +retrieving revision 1.97 +diff -u -r1.97 set_soenv.in +--- config_office/set_soenv.in 7 Apr 2006 08:02:29 -0000 1.97 ++++ config_office/set_soenv.in 14 Apr 2006 21:35:53 -0000 +@@ -342,6 +342,7 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; ++ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt"; + if( @GCCVER@ >= 30401 ) { + $CVER = "C341"; + } -- cgit v1.2.3