summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 0f2e98546c0d..1629f768b9dc 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -18,9 +18,9 @@
package org.openoffice.xmerge;
-import java.io.InputStream;
import java.io.IOException;
-import java.util.Enumeration;
+import java.io.InputStream;
+import java.util.Iterator;
import org.openoffice.xmerge.util.registry.ConverterInfo;
@@ -212,9 +212,9 @@ public class Convert implements Cloneable {
DocumentSerializerFactory myDocSerializerFactory =
ci.getDocSerializerFactory();
- Enumeration e = inputCD.getDocumentEnumeration();
+ Iterator e = inputCD.getDocumentEnumeration();
- Document doc = (Document) e.nextElement();
+ Document doc = (Document) e.next();
DocumentSerializer ser = myDocSerializerFactory.createDocumentSerializer(doc);
dataOut = ser.serialize();
@@ -266,9 +266,9 @@ public class Convert implements Cloneable {
DocumentSerializerFactory myDocSerializerFactory =
ci.getDocSerializerFactory();
- Enumeration e = inputCD.getDocumentEnumeration();
+ Iterator e = inputCD.getDocumentEnumeration();
- Document doc = (Document) e.nextElement();
+ Document doc = (Document) e.next();
DocumentSerializer ser = myDocSerializerFactory.createDocumentSerializer(doc);
dataOut = ser instanceof DocumentSerializer2 ?
((DocumentSerializer2) ser).serialize(sFromURL,sToURL) :