To comment on the following update, log in, then open the issue:
http://www.openoffice.org/issues/show_bug.cgi?id=57544
Issue #:|57544
Summary:|patch to solve the enum keyword problem in sun jdk1.5
Component:|xml
Version:|OOO 2.0 Beta2
Platform:|All
URL:|
OS/Version:|Linux
Status:|UNCONFIRMED
Status whiteboard:|
Keywords:|
Resolution:|
Issue type:|PATCH
Priority:|P3
Subcomponent:|code
Assigned to:|jsi
Reported by:|weichuan_lin
------- Additional comments from [EMAIL PROTECTED] Tue Nov 8 22:22:49 -0800
2005 -------
The patch is for Sun jdk1.5.0_05, enum is interpreted as keyword by the
jvm, and the old code use enum as an identifier. This patch just revises
them to "enumer".
I have successfully built the ooo with this patch on FC4, ia32, and
--with-tag=src680-m136, the tar file which I got is
ooo-build-src680.137.0.tar.gz.
diff -urp
ooo-build-src680.137.0.orig/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
ooo-build-src680.137.0/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
---
ooo-build-src680.137.0.orig/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
2005-11-08 13:27:21.000000000 +0800
+++
ooo-build-src680.137.0/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
2005-11-08 13:06:06.000000000 +0800
@@ -127,8 +127,8 @@ public class ConvertData {
* <code>Vector</code> of <code>Document</code> objects.
*/
public Enumeration getDocumentEnumeration() {
- Enumeration enum = v.elements();
- return (enum);
+ Enumeration enumer = v.elements();
+ return (enumer);
}
diff -urp
ooo-build-src680.137.0.orig/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
ooo-build-src680.137.0/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
---
ooo-build-src680.137.0.orig/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
2005-11-08 13:29:15.000000000 +0800
+++
ooo-build-src680.137.0/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
2005-11-08 13:11:05.000000000 +0800
@@ -155,14 +155,14 @@ public final class DocumentDeserializerI
*/
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{
diff -urp
ooo-build-src680.137.0.orig/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
ooo-build-src680.137.0/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
---
ooo-build-src680.137.0.orig/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
2005-11-08 13:29:04.000000000 +0800
+++
ooo-build-src680.137.0/build/src680-m136/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
2005-11-08 13:14:00.000000000 +0800
@@ -183,9 +183,9 @@ public final class PluginFactoryImpl ext
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);
---------------------------------------------------------------------
Please do not reply to this automatically generated notification from
Issue Tracker. Please log onto the website and enter your comments.
http://qa.openoffice.org/issue_handling/project_issues.html#notification
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
