From 52964d40a8a5c8727a3c821e1ecb979b0b21be03 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 16 May 2006 10:21:23 +0000 Subject: [PATCH] INTEGRATION: CWS java15enum (1.2.20); FILE MERGED 2006/05/16 04:45:43 pjanik 1.2.20.1: #i59368#: enum is a reserved word in Java JDK 1.5 --- .../xmerge/converter/xml/xslt/DocumentDeserializerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java index 2182a87c258c..538705b1d1a8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java @@ -155,14 +155,14 @@ public final class DocumentDeserializerImpl */ public Document deserialize() throws ConvertException, IOException { log("\nFound the XSLT deserializer"); - Enumeration enum = cd.getDocumentEnumeration(); + Enumeration enumerate = 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 (enumerate.hasMoreElements()) { + docOut = (DOMDocument) enumerate.nextElement(); } domDoc = docOut.getContentDOM(); try{