diff -ru xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java --- xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java 2009-02-18 13:17:08.000000000 +0000 +++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java 2009-02-18 13:17:14.000000000 +0000 @@ -33,9 +33,6 @@ 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 -ru xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java --- xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java 2009-02-18 13:17:08.000000000 +0000 +++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java 2009-02-18 13:17:14.000000000 +0000 @@ -33,7 +33,6 @@ 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 -ru xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java --- xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java 2009-02-18 13:17:08.000000000 +0000 +++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java 2009-02-18 13:17:14.000000000 +0000 @@ -45,7 +45,6 @@ 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 -ru xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java --- xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java 2009-02-18 13:17:08.000000000 +0000 +++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java 2009-02-18 13:17:14.000000000 +0000 @@ -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.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 -ru xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java --- xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java 2009-02-18 13:17:08.000000000 +0000 +++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java 2009-02-18 13:17:14.000000000 +0000 @@ -33,7 +33,6 @@ 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.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 -ru xmerge.orig/source/bridge/java/XMergeBridge.java xmerge/source/bridge/java/XMergeBridge.java --- xmerge.orig/source/bridge/java/XMergeBridge.java 2009-02-18 13:17:10.000000000 +0000 +++ xmerge/source/bridge/java/XMergeBridge.java 2009-02-18 13:17:14.000000000 +0000 @@ -71,10 +71,8 @@ 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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java 2009-02-18 13:17:14.000000000 +0000 @@ -36,7 +36,6 @@ 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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java 2009-02-18 13:17:14.000000000 +0000 @@ -35,7 +35,6 @@ 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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java 2009-02-18 13:17:14.000000000 +0000 @@ -36,10 +36,6 @@ * Martin Maher */ -import java.io.*; - -import org.openoffice.xmerge.util.Debug; - public class FormulaParsingException extends Exception { public FormulaParsingException(String message) { diff -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java 2009-02-18 13:17:14.000000000 +0000 @@ -32,8 +32,6 @@ import java.util.HashMap; -import org.openoffice.xmerge.util.Debug; - /** * A lookup table containing information about operators */ diff -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java 2009-02-18 13:17:14.000000000 +0000 @@ -30,8 +30,6 @@ package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula; -import java.io.*; - public interface TokenConstants { // Unary Operator Tokens diff -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java 2009-02-18 13:17:14.000000000 +0000 @@ -37,7 +37,6 @@ 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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java 2009-02-18 13:17:14.000000000 +0000 @@ -32,8 +32,6 @@ 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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java 2009-02-18 13:17:14.000000000 +0000 @@ -42,7 +42,6 @@ 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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java 2009-02-18 13:17:14.000000000 +0000 @@ -37,7 +37,6 @@ 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 -ru xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java --- xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java 2009-02-18 13:17:14.000000000 +0000 @@ -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; /** *
Pocket Excel implementation of SxcDocumentDeserializer
diff -ru xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
--- xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java 2009-02-18 13:17:10.000000000 +0000
+++ xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java 2009-02-18 13:17:14.000000000 +0000
@@ -44,10 +44,7 @@
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 -ru xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java
--- xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java 2009-02-18 13:17:10.000000000 +0000
+++ xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java 2009-02-18 13:17:14.000000000 +0000
@@ -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.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 -ru xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
--- xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java 2009-02-18 13:17:10.000000000 +0000
+++ xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java 2009-02-18 13:17:14.000000000 +0000
@@ -33,7 +33,6 @@
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.TextStyle;
import org.openoffice.xmerge.converter.xml.StyleCatalog;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff -ru xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java
--- xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java 2009-02-18 13:17:10.000000000 +0000
+++ xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
--- xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java 2009-02-18 13:17:10.000000000 +0000
+++ xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java 2009-02-18 13:17:14.000000000 +0000
@@ -39,8 +39,6 @@
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 -ru xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
--- xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java 2009-02-18 13:17:10.000000000 +0000
+++ xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java 2009-02-18 13:17:14.000000000 +0000
@@ -34,12 +34,9 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java 2009-02-18 13:17:14.000000000 +0000
@@ -32,9 +32,8 @@
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.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 @@
/** DOM Document
of content.xml. */
private Document contentDoc = null;
- /** DOM Document
of content.xml. */
- private Document styleDoc = null;
-
private String documentName = null;
private String fileName = null;
private String fileExt = null;
@@ -258,6 +258,8 @@
java.lang.reflect.Method meth;
String domImpl = doc.getClass().getName();
+
+ System.err.println("type b " + domImpl);
/*
* We may have multiple XML parsers in the Classpath.
@@ -331,7 +333,19 @@
}
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java 2009-02-18 13:17:14.000000000 +0000
@@ -35,9 +35,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java 2009-02-18 13:17:14.000000000 +0000
@@ -35,8 +35,6 @@
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
-import org.openoffice.xmerge.converter.palm.*;
-
/**
*
Provides functionality to decode a PDB formatted file into
* a PalmDB
object given an InputStream
.
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java 2009-02-18 13:17:14.000000000 +0000
@@ -33,7 +33,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
/**
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java 2009-02-18 13:17:14.000000000 +0000
@@ -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.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 @@
root.appendChild(objectNode);
}
-}
\ No newline at end of file
+}
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java 2009-02-18 13:17:14.000000000 +0000
@@ -32,7 +32,6 @@
import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java 2009-02-18 13:17:14.000000000 +0000
@@ -35,13 +35,11 @@
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.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 @@
* 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 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java 2009-02-18 13:17:14.000000000 +0000
@@ -35,12 +35,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java 2009-02-18 13:17:14.000000000 +0000
@@ -35,15 +35,8 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 Style
represents a style
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java 2009-02-18 13:17:14.000000000 +0000
@@ -36,7 +36,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java 2009-02-18 13:17:14.000000000 +0000
@@ -42,7 +42,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java 2009-02-18 13:17:14.000000000 +0000
@@ -32,8 +32,6 @@
import java.awt.Color;
-import org.openoffice.xmerge.util.Debug;
-
/**
* This class specifies the format for a given spreadsheet cell.
*
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java 2009-02-18 13:17:14.000000000 +0000
@@ -37,7 +37,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java 2009-02-18 13:17:14.000000000 +0000
@@ -33,8 +33,6 @@
import java.io.IOException;
import java.util.Vector;
-import org.openoffice.xmerge.util.IntArrayList;
-
/**
*
This class is a abstract class for encoding an SXC into an * alternative spreadsheet format.
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java 2009-02-18 13:17:14.000000000 +0000 @@ -34,7 +34,6 @@ 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.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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java 2009-02-18 13:17:14.000000000 +0000 @@ -48,7 +48,6 @@ 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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java 2009-02-18 13:17:14.000000000 +0000 @@ -34,7 +34,6 @@ 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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java 2009-02-18 13:17:14.000000000 +0000 @@ -33,8 +33,6 @@ 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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 2009-02-18 13:17:14.000000000 +0000 @@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java 2009-02-18 13:17:14.000000000 +0000 @@ -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.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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java --- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java 2009-02-18 13:17:09.000000000 +0000 +++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java 2009-02-18 13:17:14.000000000 +0000 @@ -36,11 +36,8 @@ 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.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.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 @@ // Imported java classes import java.io.FileNotFoundException; -import java.io.File; -import java.net.URI; /** *Xslt implementation of
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 OfficeDocument
for
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java 2009-02-18 13:17:14.000000000 +0000
@@ -45,11 +45,9 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java 2009-02-18 13:17:14.000000000 +0000
@@ -34,9 +34,7 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java 2009-02-18 13:17:14.000000000 +0000
@@ -33,11 +33,9 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java 2009-02-18 13:17:14.000000000 +0000
@@ -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;
-
/**
*
This is an implementation of the Iterator
interface.
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java 2009-02-18 13:17:14.000000000 +0000
@@ -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;
-
/**
*
This is an implementation of the Iterator
interface.
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java 2009-02-18 13:17:14.000000000 +0000
@@ -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 @@
// 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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java 2009-02-18 13:17:14.000000000 +0000
@@ -35,7 +35,6 @@
import org.openoffice.xmerge.ConverterCapabilities;
import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
-import org.openoffice.xmerge.util.Debug;
/**
* This class extends the DocumentMerge
class.
@@ -81,8 +80,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java 2009-02-18 13:17:15.000000000 +0000
@@ -36,7 +36,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java 2009-02-18 13:17:14.000000000 +0000
@@ -32,9 +32,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java 2009-02-18 13:17:15.000000000 +0000
@@ -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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/test/Driver.java xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/test/Driver.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java 2009-02-18 13:17:15.000000000 +0000
@@ -32,8 +32,6 @@
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.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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java 2009-02-18 13:17:15.000000000 +0000
@@ -35,13 +35,10 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/Debug.java xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/Debug.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java 2009-02-18 13:17:15.000000000 +0000
@@ -42,8 +42,6 @@
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 -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java 2009-02-18 13:17:15.000000000 +0000
@@ -32,7 +32,6 @@
import java.util.*;
import java.io.*;
-import javax.xml.parsers.*;
/**
* Manages the converter plug-ins that are currently active.
diff -ru xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/Resources.java xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java
--- xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/Resources.java 2009-02-18 13:17:09.000000000 +0000
+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java 2009-02-18 13:17:15.000000000 +0000
@@ -31,7 +31,6 @@
package org.openoffice.xmerge.util;
import java.util.ResourceBundle;
-import java.util.MissingResourceException;
/**
*
Provides a singleton resource class for converter messages.