diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-16 08:26:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-16 08:26:45 +0000 |
| commit | ba278e36fdb2b548889bcc29262590f45ce66a5f (patch) | |
| tree | f648ee6fbb13005feadac0f6f6b0ff49ae61cbe6 /xmerge | |
| parent | 6d4b5845ebd3b4847cb20d906a9b9ae096b3c673 (diff) | |
CWS-TOOLING: integrate CWS xmergeclean
2009-02-18 17:23:25 +0100 cmc r268246 : #i99387# add a final DOM->XML serialization fallback and clean up trivial warnings
Diffstat (limited to 'xmerge')
101 files changed, 41 insertions, 254 deletions
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java index 24d8eac20a59..a1e96b12124c 100644 --- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java +++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java @@ -33,9 +33,6 @@ package org.openoffice.xmerge.converter.xml.sxw.aportisdoc; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.List; -import java.util.ArrayList; import org.openoffice.xmerge.converter.palm.Record; import org.openoffice.xmerge.util.Resources; diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java index 231681e35771..18c9f2f4efb9 100644 --- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java +++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java @@ -33,7 +33,6 @@ package org.openoffice.xmerge.converter.xml.sxw.aportisdoc; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.util.List; import java.util.ArrayList; diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java index abc8ccdab993..486e118c9128 100644 --- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java +++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java @@ -45,7 +45,6 @@ import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; import org.openoffice.xmerge.converter.palm.PalmDB; -import org.openoffice.xmerge.converter.palm.PdbDecoder; import org.openoffice.xmerge.converter.palm.Record; import org.openoffice.xmerge.converter.palm.PalmDocument; import org.openoffice.xmerge.util.Debug; diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java index 2daa09389b4f..051b56797d7c 100644 --- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java +++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.converter.xml.sxw.aportisdoc; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.openoffice.xmerge.DocumentMerger; import org.openoffice.xmerge.MergeException; @@ -41,7 +40,6 @@ import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.Difference; import org.openoffice.xmerge.merger.NodeMergeAlgorithm; import org.openoffice.xmerge.merger.Iterator; -import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.diff.ParaNodeIterator; import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm; import org.openoffice.xmerge.merger.merge.DocumentMerge; diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java index bc1f0b95adc7..f50a00a10c6e 100644 --- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java +++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java @@ -33,7 +33,6 @@ package org.openoffice.xmerge.converter.xml.sxw.aportisdoc; import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Element; import java.io.IOException; import java.net.URLDecoder; @@ -45,8 +44,6 @@ import org.openoffice.xmerge.DocumentSerializer; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; import org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocConstants; -import org.openoffice.xmerge.converter.palm.PdbEncoder; -import org.openoffice.xmerge.converter.palm.PdbDecoder; import org.openoffice.xmerge.converter.palm.PalmDB; import org.openoffice.xmerge.converter.palm.Record; import org.openoffice.xmerge.converter.palm.PalmDocument; diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index 955128d9631b..4be1fdc11617 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -71,10 +71,8 @@ import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.converter.xml.OfficeDocument; /*Java Classes*/ import java.util.Enumeration; -import java.util.Vector; import java.io.*; import javax.xml.parsers.*; -import org.xml.sax.SAXException; import java.net.URI; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java index c56f0b8c1044..f4d6249405cc 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java @@ -30,13 +30,7 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel; -import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; -import java.io.DataOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.util.Stack; -import java.util.LinkedList; import java.util.Vector; import java.util.Enumeration; import java.util.NoSuchElementException; @@ -44,9 +38,7 @@ import java.util.NoSuchElementException; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.util.Debug; -import org.openoffice.xmerge.converter.xml.sxc.SheetSettings; import org.openoffice.xmerge.converter.xml.sxc.BookSettings; -import org.openoffice.xmerge.converter.xml.sxc.SxcDocumentDeserializer; import org.openoffice.xmerge.converter.xml.sxc.SpreadsheetDecoder; import org.openoffice.xmerge.converter.xml.sxc.Format; import org.openoffice.xmerge.converter.xml.sxc.NameDefinition; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java index ce7ad9fc8b62..2bbdb75a8894 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java @@ -30,21 +30,15 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel; -import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; -import java.io.DataOutputStream; import java.io.IOException; import java.util.Vector; import org.openoffice.xmerge.util.Debug; -import org.openoffice.xmerge.util.IntArrayList; import org.openoffice.xmerge.converter.xml.sxc.SpreadsheetEncoder; import org.openoffice.xmerge.converter.xml.sxc.Format; import org.openoffice.xmerge.converter.xml.sxc.BookSettings; -import org.openoffice.xmerge.converter.xml.sxc.SheetSettings; import org.openoffice.xmerge.converter.xml.sxc.NameDefinition; -import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook; /** diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java index 22884e9ef505..99ae1d60634f 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java @@ -30,22 +30,16 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel; -import java.awt.Color; - import org.w3c.dom.NodeList; import org.w3c.dom.Node; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Element; import java.io.IOException; import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConvertException; -import org.openoffice.xmerge.converter.xml.sxc.Format; import org.openoffice.xmerge.converter.xml.sxc.SxcDocumentSerializer; import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook; -import org.openoffice.xmerge.converter.xml.StyleCatalog; /** * <p>Pocket Excel implementation of <code>SxcDocumentDeserializer</code> diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java index e46a16c5b64d..73c6fc4c9f75 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java index dffa19278862..da45208ee090 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java index 323458b79ecb..1782ba5de159 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java @@ -30,14 +30,12 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; import org.openoffice.xmerge.util.Debug; -import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; /** diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java index 465bbd25aa2f..85c917190576 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java @@ -36,7 +36,6 @@ import java.io.OutputStream; import java.io.InputStream; import org.openoffice.xmerge.util.Debug; -import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; /** diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java index 0d4ca2fdfd2a..2b5c68b4399c 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java @@ -30,14 +30,12 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.EndianConverter; -import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; public abstract class CellValue implements BIFFRecord { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java index 38fa9e53fbaf..7f8dbe1428b0 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java index 409261ebaa75..61196889802c 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; import java.io.IOException; -import java.io.DataInputStream; import java.io.InputStream; import java.io.OutputStream; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java index cc4d32b79310..e11d56847c57 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java index e0f804554349..286f69151cde 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java index c56768cb5c6b..6da880b3b6ff 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java index d23827cac4bb..059ccd7dd4dd 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java @@ -30,13 +30,11 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; import org.openoffice.xmerge.util.Debug; -import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; /** diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java index bcd2ccda1666..f71edcb339cb 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java index 7da66a6ef1cb..c433a7397182 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java index 69c8d82a0dae..6ac78b67c7af 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java index 7e997e740979..0bd23789f799 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java @@ -30,15 +30,9 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Calendar; -import java.util.Date; -import java.text.DateFormat; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.EndianConverter; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java index 48bbe3fd2ddc..17530ccfdba1 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.InputStream; import java.io.OutputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java index c736ba380500..18b21114ad55 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java @@ -30,13 +30,11 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; import org.openoffice.xmerge.util.Debug; -import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java index 788a4f9b43d8..82b7370eae96 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java index 47e006e867e2..a561907dd0f1 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java index 0f9e71df6a92..075321b79f26 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java index d1960049186f..400ac890f077 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java index 0a791a3ff985..5028d5767fd1 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java @@ -32,8 +32,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; import java.lang.Exception; -import org.openoffice.xmerge.util.Debug; - /** * At the moment any functions within a formula will result in this exception * being thrown. diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java index be68d592dad0..13a601d9ed82 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java index 9e9d90d3c2de..3ab42d0364d2 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records; -import java.io.DataInputStream; import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java index 74eb3dd9800b..5abf0bd27937 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java @@ -42,7 +42,6 @@ import org.openoffice.xmerge.converter.xml.sxc.NameDefinition; import org.openoffice.xmerge.converter.xml.sxc.BookSettings; import org.openoffice.xmerge.converter.xml.sxc.SheetSettings; import org.openoffice.xmerge.util.Debug; -import org.openoffice.xmerge.util.IntArrayList; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; import org.openoffice.xmerge.converter.xml.sxc.ColumnRowInfo; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java index 6ed73c10cf8d..51cb2d9b094a 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java @@ -37,7 +37,6 @@ import java.util.Vector; import java.util.Enumeration; import java.awt.Point; -import org.openoffice.xmerge.util.IntArrayList; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.converter.xml.sxc.SheetSettings; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java index 52d3f17ce153..9890a20f3c70 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java @@ -35,7 +35,6 @@ import java.io.IOException; import java.util.Vector; import java.util.Enumeration; -import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook; /** diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java index 24ef0e8a23d1..55314c3559c0 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java @@ -31,9 +31,7 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; -import java.io.*; import java.util.Vector; -import java.util.Enumeration; import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook; import org.openoffice.xmerge.util.Debug; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java index a076cfb65ead..295f58faba3c 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java @@ -36,10 +36,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; * Martin Maher */ -import java.io.*; - -import org.openoffice.xmerge.util.Debug; - public class FormulaParsingException extends Exception { public FormulaParsingException(String message) { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java index 932b535e66a6..43f34c33351f 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java @@ -30,8 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; -import org.openoffice.xmerge.util.Debug; - import java.util.HashMap; public class FunctionLookup extends SymbolLookup { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java index cc1a813b1689..d35db126005c 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java @@ -31,8 +31,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; import java.util.HashMap; -import org.openoffice.xmerge.util.Debug; - /** * A lookup table containing information about operands */ diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java index d27c8feeeede..08b557e3a6d3 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java @@ -32,8 +32,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; import java.util.HashMap; -import org.openoffice.xmerge.util.Debug; - /** * A lookup table containing information about operators */ diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java index 649f7d8f715e..a16a8af4d3fe 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java @@ -31,8 +31,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; -import java.io.*; - /** * A Token is the basic building block of any formula. * A Token can be of four types (Operator, Operand, Function with fixed diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java index 2c448a7afbde..2bbfdd8b1791 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java @@ -30,8 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; -import java.io.*; - public interface TokenConstants { // Unary Operator Tokens diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java index a49210679b66..a00a3f1ec31c 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java @@ -37,7 +37,6 @@ import java.util.Enumeration; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook; -import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.BoundSheet; import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.DefinedName; /** diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java index ec2dd91ee6b2..aa9c92c101d6 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java @@ -30,10 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; -import java.io.*; -import java.util.Vector; -import java.util.Enumeration; - import org.openoffice.xmerge.util.Debug; /** diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java index 4c8ee6949bfc..2a2a905b1131 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java @@ -44,10 +44,7 @@ import org.openoffice.xmerge.converter.xml.StyleCatalog; import org.openoffice.xmerge.util.OfficeUtil; -import java.io.InputStream; import java.io.IOException; -import java.io.FileInputStream; -import java.io.FileDescriptor; import java.util.Enumeration; import java.util.Vector; diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java index 37b53d329118..04ca8e851456 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.converter.xml.sxw.pocketword; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.openoffice.xmerge.DocumentMerger; import org.openoffice.xmerge.MergeException; @@ -41,7 +40,6 @@ import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.Difference; import org.openoffice.xmerge.merger.NodeMergeAlgorithm; import org.openoffice.xmerge.merger.Iterator; -import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.diff.ParaNodeIterator; import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm; import org.openoffice.xmerge.merger.merge.DocumentMerge; diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java index 9a82ed2f4531..de1ae3429836 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java @@ -33,7 +33,6 @@ package org.openoffice.xmerge.converter.xml.sxw.pocketword; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Element; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConvertException; @@ -47,8 +46,6 @@ import org.openoffice.xmerge.converter.xml.ParaStyle; import org.openoffice.xmerge.converter.xml.TextStyle; import org.openoffice.xmerge.converter.xml.StyleCatalog; -import java.io.OutputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java index c56be2e3f55f..216248d54efd 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.converter.xml.sxw.pocketword; import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Vector; diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java index 72832ea2929c..56cd1262189b 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java @@ -39,8 +39,6 @@ import org.openoffice.xmerge.util.ColourConverter; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.awt.Color; - /** * This class represents a portion of text with a particular formatting style. * The style may differ from the default style of the paragraph of which it diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java index 6e7304d4f5e8..9026732fa064 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java @@ -34,12 +34,9 @@ import org.openoffice.xmerge.Document; import org.openoffice.xmerge.converter.xml.ParaStyle; import org.openoffice.xmerge.converter.xml.TextStyle; -import java.awt.Font; - import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java index b305a0800ddd..83c2270e5e61 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java @@ -32,9 +32,8 @@ package org.openoffice.xmerge.converter.dom; import java.io.InputStream; import java.io.OutputStream; -import java.io.BufferedInputStream; +import java.io.StringWriter; import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; import java.io.IOException; @@ -42,11 +41,15 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.dom.DOMSource; + import org.w3c.dom.Node; import org.w3c.dom.Element; import org.w3c.dom.Document; import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; import org.openoffice.xmerge.util.Resources; import org.openoffice.xmerge.util.Debug; @@ -65,9 +68,6 @@ public class DOMDocument /** DOM <code>Document</code> of content.xml. */ private Document contentDoc = null; - /** DOM <code>Document</code> of content.xml. */ - private Document styleDoc = null; - private String documentName = null; private String fileName = null; private String fileExt = null; @@ -259,6 +259,8 @@ public class DOMDocument String domImpl = doc.getClass().getName(); + System.err.println("type b " + domImpl); + /* * We may have multiple XML parsers in the Classpath. * Depending on which one is first, the actual type of @@ -331,7 +333,19 @@ public class DOMDocument } else { // We dont have another parser - throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl); + try { + DOMSource domSource = new DOMSource(doc); + StringWriter writer = new StringWriter(); + StreamResult result = new StreamResult(writer); + TransformerFactory tf = TransformerFactory.newInstance(); + Transformer transformer = tf.newTransformer(); + transformer.transform(domSource, result); + return writer.toString().getBytes(); + } + catch (Exception e) { + // We don't have another parser + throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl); + } } } catch (ClassNotFoundException cnfe) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java index a6deaabd8214..f039dab382ee 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java @@ -35,9 +35,6 @@ import java.io.InputStream; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import java.io.Reader; -import java.io.BufferedReader; -import java.io.StringReader; import java.io.UnsupportedEncodingException; import org.openoffice.xmerge.Document; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java index 0945c1f5c226..f6df00664b27 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java @@ -35,8 +35,6 @@ import java.io.IOException; import java.io.ByteArrayInputStream; import java.io.DataInputStream; -import org.openoffice.xmerge.converter.palm.*; - /** * <p>Provides functionality to decode a PDB formatted file into * a <code>PalmDB</code> object given an <code>InputStream</code>. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java index 9cfb1e63182e..30052140bdae 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java @@ -33,7 +33,6 @@ package org.openoffice.xmerge.converter.xml; import org.w3c.dom.Document; import org.w3c.dom.DOMException; import org.w3c.dom.Element; -import org.w3c.dom.Node; /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java index cacc870d09c7..b3f8f5769b7d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml; -import java.io.ByteArrayInputStream; import java.io.IOException; import javax.xml.parsers.DocumentBuilder; @@ -42,8 +41,6 @@ import org.w3c.dom.DOMException; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; import org.xml.sax.SAXException; /** @@ -298,4 +295,4 @@ public class EmbeddedXMLObject extends EmbeddedObject { root.appendChild(objectNode); } -}
\ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java index 3ab95654f454..bc62cc0a7e2a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java @@ -35,13 +35,11 @@ import java.io.OutputStream; import java.io.Reader; import java.io.BufferedReader; import java.io.StringReader; +import java.io.StringWriter; import java.io.InputStreamReader; -import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; import java.util.Iterator; import java.util.Map; import java.util.HashMap; @@ -59,7 +57,10 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.w3c.dom.NamedNodeMap; import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; + +import javax.xml.transform.*; +import javax.xml.transform.dom.*; +import javax.xml.transform.stream.*; import org.openoffice.xmerge.util.Resources; import org.openoffice.xmerge.util.Debug; @@ -872,6 +873,7 @@ public abstract class OfficeDocument * doc may vary. Need a way to find out which API is being * used and use an appropriate serialization method. */ + try { // First of all try for JAXP 1.0 if (domImpl.equals("com.sun.xml.tree.XmlDocument")) { @@ -942,8 +944,19 @@ public abstract class OfficeDocument meth.invoke(serializer, new Object [] { doc, baos } ); } else { - // We don't have another parser - throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl); + try { + DOMSource domSource = new DOMSource(doc); + StringWriter writer = new StringWriter(); + StreamResult result = new StreamResult(writer); + TransformerFactory tf = TransformerFactory.newInstance(); + Transformer transformer = tf.newTransformer(); + transformer.transform(domSource, result); + return writer.toString().getBytes(); + } + catch (Exception e) { + // We don't have another parser + throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl); + } } } catch (ClassNotFoundException cnfe) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java index 408d3eddaa8c..b6a77d6d57f7 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java @@ -32,7 +32,6 @@ package org.openoffice.xmerge.converter.xml; import java.io.IOException; -import javax.xml.parsers.ParserConfigurationException; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index d7954fba921f..69d4f66f1164 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -35,12 +35,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Element; -import org.openoffice.xmerge.Document; -import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.converter.xml.OfficeDocument; -import java.io.IOException; -import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; -import java.lang.reflect.Constructor; import org.openoffice.xmerge.util.Debug; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java index f860ae2bc8a0..6d464671f1af 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java @@ -30,16 +30,8 @@ package org.openoffice.xmerge.converter.xml; -import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Element; - -import org.openoffice.xmerge.Document; -import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.converter.xml.OfficeDocument; -import java.io.IOException; -import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; /** * An object of class <code>Style</code> represents a <i>style</i> diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java index 258d943b4bcb..32732b65f4a3 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java @@ -35,15 +35,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Element; import org.openoffice.xmerge.util.*; -import org.openoffice.xmerge.Document; -import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.converter.xml.OfficeDocument; -import java.io.IOException; -import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; import java.util.Vector; import java.lang.reflect.Constructor; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java index b12a6fc10271..06f2bc778210 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java @@ -33,17 +33,12 @@ package org.openoffice.xmerge.converter.xml; import java.awt.Color; -import java.io.IOException; import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Element; -import org.openoffice.xmerge.Document; -import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.converter.xml.OfficeDocument; -import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; import org.openoffice.xmerge.util.Debug; /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java index ca551973c745..b3d99fa0d5b6 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java @@ -36,7 +36,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.Element; -import java.awt.Point; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.util.Debug; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java index b121c1f86b52..131e8aa35613 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java @@ -31,19 +31,14 @@ package org.openoffice.xmerge.converter.xml.sxc; import java.awt.Color; -import java.io.IOException; import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Element; -import org.openoffice.xmerge.Document; -import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.converter.xml.OfficeDocument; import org.openoffice.xmerge.converter.xml.Style; import org.openoffice.xmerge.converter.xml.StyleCatalog; -import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; import org.openoffice.xmerge.util.Debug; /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index f942575aea9d..e7c1cb2ce354 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java @@ -30,17 +30,11 @@ package org.openoffice.xmerge.converter.xml.sxc; -import java.awt.Color; -import java.io.IOException; - import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Element; -import org.openoffice.xmerge.Document; -import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.converter.xml.OfficeDocument; import org.openoffice.xmerge.converter.xml.Style; import org.openoffice.xmerge.converter.xml.StyleCatalog; import org.openoffice.xmerge.util.Debug; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java index 8321110a250d..df190ed83396 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java @@ -42,7 +42,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.Difference; import org.openoffice.xmerge.merger.Iterator; -import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.NodeMergeAlgorithm; import org.openoffice.xmerge.merger.diff.IteratorRowCompare; import org.openoffice.xmerge.merger.diff.RowIterator; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java index c4a2bd74bbd7..55690658de07 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java @@ -32,8 +32,6 @@ package org.openoffice.xmerge.converter.xml.sxc; import java.awt.Color; -import org.openoffice.xmerge.util.Debug; - /** * This class specifies the format for a given spreadsheet cell. * diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java index 7ec9e39550eb..f5b485eeb636 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc; -import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index 84615b3da07b..4f5ee01f91e3 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java @@ -30,16 +30,11 @@ package org.openoffice.xmerge.converter.xml.sxc; -import java.io.IOException; - import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Element; -import org.openoffice.xmerge.Document; -import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.converter.xml.OfficeDocument; import org.openoffice.xmerge.converter.xml.Style; import org.openoffice.xmerge.converter.xml.StyleCatalog; import org.openoffice.xmerge.util.Debug; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java index 53d7f1fec3a4..c0074e5a8bbd 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java @@ -37,7 +37,6 @@ import org.w3c.dom.Element; import java.awt.Point; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import org.openoffice.xmerge.util.Debug; /** * This is a class representing the different attributes for a worksheet diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java index 539f359d4084..f01f40ff98e9 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.converter.xml.sxc; import java.io.IOException; -import java.io.InputStream; import java.util.Enumeration; import org.openoffice.xmerge.converter.xml.sxc.Format; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java index 18a95ec1c971..01ce78322c09 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java @@ -33,8 +33,6 @@ package org.openoffice.xmerge.converter.xml.sxc; import java.io.IOException; import java.util.Vector; -import org.openoffice.xmerge.util.IntArrayList; - /** * <p>This class is a abstract class for encoding an SXC into an * alternative spreadsheet format.</p> diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java index d14afbccff79..f5b2977839d8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc; -import org.w3c.dom.Document; import org.openoffice.xmerge.converter.xml.OfficeDocument; import org.openoffice.xmerge.converter.xml.OfficeConstants; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java index acd8659b08e7..ab6a941a60f4 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java @@ -34,7 +34,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Node; import org.w3c.dom.Element; -import java.awt.Point; import java.io.IOException; import java.util.Enumeration; @@ -45,7 +44,6 @@ import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.converter.xml.sxc.SxcDocument; import org.openoffice.xmerge.converter.xml.sxc.BookSettings; -import org.openoffice.xmerge.converter.xml.sxc.SheetSettings; import org.openoffice.xmerge.converter.xml.sxc.NameDefinition; import org.openoffice.xmerge.converter.xml.sxc.CellStyle; import org.openoffice.xmerge.converter.xml.Style; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java index 5a552ff0388c..9fb29e5504a4 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java @@ -48,7 +48,6 @@ import org.openoffice.xmerge.DocumentSerializer; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.converter.xml.sxc.SxcDocument; -import org.openoffice.xmerge.converter.xml.ParaStyle; import org.openoffice.xmerge.converter.xml.sxc.CellStyle; import org.openoffice.xmerge.converter.xml.StyleCatalog; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java index 73e05f94aafb..abd12130057b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java @@ -34,7 +34,6 @@ import java.io.InputStream; import java.io.IOException; import org.openoffice.xmerge.util.registry.ConverterInfo; -import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.PluginFactory; import org.openoffice.xmerge.Document; import org.openoffice.xmerge.DocumentMergerFactory; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java index 7141e739b637..c530868910d9 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java @@ -30,7 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxw; -import org.w3c.dom.Document; import org.openoffice.xmerge.converter.xml.OfficeDocument; import org.openoffice.xmerge.converter.xml.OfficeConstants; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java index 140764e77595..9051769e04c8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java @@ -33,8 +33,6 @@ package org.openoffice.xmerge.converter.xml.sxw; import java.io.InputStream; import java.io.IOException; -import org.openoffice.xmerge.ConvertData; -import org.openoffice.xmerge.PluginFactory; import org.openoffice.xmerge.PluginFactory; import org.openoffice.xmerge.Document; import org.openoffice.xmerge.util.registry.ConverterInfo; 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 150fc4e6c44a..cfdfe9ea1cdf 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 @@ -30,10 +30,6 @@ package org.openoffice.xmerge.converter.xml.xslt; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; -import org.w3c.dom.Element; - import java.io.InputStream; import java.io.IOException; import java.util.Enumeration; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java index 8bff298a0da7..3d5d28737a68 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.converter.xml.xslt; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.openoffice.xmerge.DocumentMerger; import org.openoffice.xmerge.MergeException; @@ -41,7 +40,6 @@ import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.Difference; import org.openoffice.xmerge.merger.NodeMergeAlgorithm; import org.openoffice.xmerge.merger.Iterator; -import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.diff.ParaNodeIterator; import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm; import org.openoffice.xmerge.merger.merge.DocumentMerge; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java index 9ee6cddd8875..2293cb0be74f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java @@ -36,11 +36,8 @@ import org.w3c.dom.Element; import org.w3c.dom.*; import java.io.IOException; -import java.io.InputStream; import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; -import java.util.Enumeration; -import java.util.Properties; import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; @@ -48,7 +45,6 @@ import org.openoffice.xmerge.ConvertException; import org.openoffice.xmerge.DocumentSerializer; import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument; import org.openoffice.xmerge.converter.dom.DOMDocument; -import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.registry.ConverterInfo; import org.openoffice.xmerge.converter.xml.OfficeConstants; @@ -58,7 +54,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.dom.DOMResult; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.URIResolver; @@ -69,8 +64,6 @@ import javax.xml.parsers.DocumentBuilderFactory; // Imported java classes import java.io.FileNotFoundException; -import java.io.File; -import java.net.URI; /** * <p>Xslt implementation of diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java index 5a8182a9292d..a996bf7f07bf 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java @@ -30,9 +30,7 @@ package org.openoffice.xmerge.converter.xml.xslt; -import org.w3c.dom.Document; import org.openoffice.xmerge.converter.xml.OfficeDocument; -import org.openoffice.xmerge.converter.xml.OfficeConstants; /** * This class is an implementation of <code>OfficeDocument</code> for diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java index 0f9a2cc1563f..9f5d39d6ea37 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java @@ -45,11 +45,9 @@ import org.openoffice.xmerge.util.registry.ConverterInfo; import org.openoffice.xmerge.DocumentMerger; import org.openoffice.xmerge.DocumentMergerFactory; import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.util.registry.ConverterInfo; import java.io.InputStream; import java.util.Enumeration; -import java.io.InputStream; import java.io.IOException; import java.util.Properties; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java index d0433edd66f6..e83a08cf9e74 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java @@ -32,9 +32,6 @@ package org.openoffice.xmerge.merger; import org.w3c.dom.Node; -import org.openoffice.xmerge.merger.Iterator; -import org.openoffice.xmerge.merger.Difference; - /** * This is an interface for a {@link * org.openoffice.xmerge.merger.MergeAlgorithm diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java index 106f7a94f9db..e15112a57218 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java @@ -34,9 +34,7 @@ import org.w3c.dom.Node; import org.w3c.dom.Element; import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.merger.Iterator; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.Resources; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java index 1f2607658b18..46af77d1e19b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.merger.diff; import java.util.Vector; -import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.Difference; /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java index 0cea79693cb5..1901c1877baa 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.merger.diff; import org.w3c.dom.Node; -import org.w3c.dom.Element; import org.openoffice.xmerge.converter.xml.OfficeConstants; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java index 11d5efce34a5..237ee44fad53 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java @@ -33,11 +33,9 @@ package org.openoffice.xmerge.merger.diff; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Element; import org.openoffice.xmerge.ConverterCapabilities; import org.openoffice.xmerge.merger.Iterator; -import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.Resources; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java index 6483a899d077..bf73d6e51602 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java @@ -31,15 +31,10 @@ package org.openoffice.xmerge.merger.diff; import org.w3c.dom.Node; -import org.w3c.dom.Element; import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.merger.Iterator; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import java.util.Vector; -import java.util.List; - /** * <p>This is an implementation of the <code>Iterator</code> interface. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java index 4e63545df156..a0311a156c64 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java @@ -31,12 +31,9 @@ package org.openoffice.xmerge.merger.diff; import org.w3c.dom.Node; -import org.w3c.dom.Element; import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.merger.Iterator; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.Resources; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java index 9598a2aa4c4d..5c7e8b3f572b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java @@ -31,15 +31,9 @@ package org.openoffice.xmerge.merger.diff; import org.w3c.dom.Node; -import org.w3c.dom.Element; -import org.w3c.dom.Document; -import org.openoffice.xmerge.merger.Iterator; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import java.util.Vector; -import java.util.List; - /** * <p>This is an implementation of the <code>Iterator</code> interface. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java index 6870141f925a..1a9b54bbf482 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java @@ -31,10 +31,7 @@ package org.openoffice.xmerge.merger.merge; import org.w3c.dom.Element; -import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.NamedNodeMap; import org.openoffice.xmerge.ConverterCapabilities; import org.openoffice.xmerge.MergeException; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java index cb38c3c01a7d..47736c061bb3 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java @@ -30,23 +30,17 @@ package org.openoffice.xmerge.merger.merge; -import java.util.List; - import org.w3c.dom.Node; import org.w3c.dom.Element; -import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.w3c.dom.NamedNodeMap; import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.merger.Difference; import org.openoffice.xmerge.merger.Iterator; -import org.openoffice.xmerge.merger.DiffAlgorithm; import org.openoffice.xmerge.merger.NodeMergeAlgorithm; import org.openoffice.xmerge.merger.diff.CellNodeIterator; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.util.XmlUtil; -import org.openoffice.xmerge.util.Debug; /** @@ -82,7 +76,6 @@ public final class PositionBaseRowMerge implements NodeMergeAlgorithm { // used to compare the cell 1 by 1 private void mergeCellSequences(Iterator orgSeq, Iterator modSeq) { - int i, j; boolean needMerge = true; Element orgCell, modCell; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java index 98c11bb1c8bb..323530adcddb 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java @@ -35,7 +35,6 @@ import org.w3c.dom.NodeList; import org.openoffice.xmerge.ConverterCapabilities; import org.openoffice.xmerge.merger.NodeMergeAlgorithm; -import org.openoffice.xmerge.util.Debug; /** * This class extends the <code>DocumentMerge</code> class. @@ -81,8 +80,6 @@ public final class SheetMerge extends DocumentMerge { NodeList children = node.getChildNodes(); int numOfChildren = children.getLength(); - Node child; - // clear all the cells under the row node but maintain any unsupported // features // TODO: we can actually check anything left after the clear up. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java index ceba5168765f..7d92a442f4d0 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java @@ -36,7 +36,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.NamedNodeMap; import org.openoffice.xmerge.ConverterCapabilities; -import org.openoffice.xmerge.merger.diff.CellNodeIterator; import org.openoffice.xmerge.converter.xml.OfficeConstants; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java index 306adeb3e10a..c55dec4ea839 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java @@ -30,10 +30,7 @@ package org.openoffice.xmerge.test; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStreamReader; -import java.io.FileReader; import java.io.InputStream; import java.io.BufferedInputStream; import java.util.Properties; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java index a3559a3f7863..86ec98e83732 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java @@ -32,8 +32,6 @@ package org.openoffice.xmerge.test; import java.util.Vector; import java.util.Enumeration; -import java.io.IOException; -import java.io.InputStream; import java.io.FileOutputStream; import java.io.FileInputStream; import java.io.File; @@ -43,7 +41,6 @@ import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConverterFactory; import org.openoffice.xmerge.test.ConverterInfoList; -import org.openoffice.xmerge.util.registry.ConverterInfo; import org.openoffice.xmerge.util.registry.ConverterInfoMgr; import org.openoffice.xmerge.util.registry.ConverterInfoReader; import org.openoffice.xmerge.DocumentMerger; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java index 26b5357e459b..b0ed4818d216 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java @@ -35,13 +35,10 @@ import java.io.FileOutputStream; import java.io.FileInputStream; import java.util.StringTokenizer; -import java.net.URL; - import org.openoffice.xmerge.Convert; import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConverterFactory; -import org.openoffice.xmerge.util.registry.ConverterInfo; import org.openoffice.xmerge.util.registry.ConverterInfoMgr; import org.openoffice.xmerge.util.registry.ConverterInfoReader; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java index 9d2b96a0bc38..7e96e50e6f29 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java @@ -42,8 +42,6 @@ import java.text.DateFormat; import java.util.Date; import java.util.Calendar; import java.util.Properties; -import org.w3c.dom.Node; - /** * This class is used for logging debug messages. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java index 46259bccdb6d..f69b2ad4beeb 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java @@ -31,7 +31,6 @@ package org.openoffice.xmerge.util; import java.util.ResourceBundle; -import java.util.MissingResourceException; /** * <p>Provides a singleton resource class for converter messages.</p> diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java index 71b980efb91c..13efabf85769 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java @@ -32,7 +32,6 @@ package org.openoffice.xmerge.util.registry; import java.util.*; import java.io.*; -import javax.xml.parsers.*; /** * Manages the converter plug-ins that are currently active. |