Attachment #60288 for issue #99387

View | Details | Raw Unified | Return to issue 99387
Collapse All | Expand All

Lines 33-41 Link Here

(-)xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java (-3 lines)
33	import java.io.ByteArrayInputStream;	33	import java.io.ByteArrayInputStream;
34	import java.io.DataInputStream;	34	import java.io.DataInputStream;
35	import java.io.IOException;	35	import java.io.IOException;
36	import java.io.UnsupportedEncodingException;
37	import java.util.List;
38	import java.util.ArrayList;
39		36
40	import org.openoffice.xmerge.converter.palm.Record;	37	import org.openoffice.xmerge.converter.palm.Record;
41	import org.openoffice.xmerge.util.Resources;	38	import org.openoffice.xmerge.util.Resources;

Lines 33-39 Link Here

(-)xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java (-1 lines)
33	import java.io.ByteArrayOutputStream;	33	import java.io.ByteArrayOutputStream;
34	import java.io.DataOutputStream;	34	import java.io.DataOutputStream;
35	import java.io.IOException;	35	import java.io.IOException;
36	import java.io.UnsupportedEncodingException;
37	import java.util.List;	36	import java.util.List;
38	import java.util.ArrayList;	37	import java.util.ArrayList;
39		38

Lines 45-51 Link Here

(-)xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java (-1 lines)
45	import org.openoffice.xmerge.converter.xml.OfficeConstants;	45	import org.openoffice.xmerge.converter.xml.OfficeConstants;
46	import org.openoffice.xmerge.converter.xml.sxw.SxwDocument;	46	import org.openoffice.xmerge.converter.xml.sxw.SxwDocument;
47	import org.openoffice.xmerge.converter.palm.PalmDB;	47	import org.openoffice.xmerge.converter.palm.PalmDB;
48	import org.openoffice.xmerge.converter.palm.PdbDecoder;
49	import org.openoffice.xmerge.converter.palm.Record;	48	import org.openoffice.xmerge.converter.palm.Record;
50	import org.openoffice.xmerge.converter.palm.PalmDocument;	49	import org.openoffice.xmerge.converter.palm.PalmDocument;
51	import org.openoffice.xmerge.util.Debug;	50	import org.openoffice.xmerge.util.Debug;

Lines 31-37 Link Here

(-)xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java (-2 lines)
31	package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;	31	package org.openoffice.xmerge.converter.xml.sxw.aportisdoc;
32		32
33	import org.w3c.dom.Document;	33	import org.w3c.dom.Document;
34	import org.w3c.dom.Element;
35		34
36	import org.openoffice.xmerge.DocumentMerger;	35	import org.openoffice.xmerge.DocumentMerger;
37	import org.openoffice.xmerge.MergeException;	36	import org.openoffice.xmerge.MergeException;
Lines 41-47 Link Here
41	import org.openoffice.xmerge.merger.Difference;	40	import org.openoffice.xmerge.merger.Difference;
42	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;	41	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
43	import org.openoffice.xmerge.merger.Iterator;	42	import org.openoffice.xmerge.merger.Iterator;
44	import org.openoffice.xmerge.merger.DiffAlgorithm;
45	import org.openoffice.xmerge.merger.diff.ParaNodeIterator;	43	import org.openoffice.xmerge.merger.diff.ParaNodeIterator;
46	import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm;	44	import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm;
47	import org.openoffice.xmerge.merger.merge.DocumentMerge;	45	import org.openoffice.xmerge.merger.merge.DocumentMerge;

Lines 33-39 Link Here

(-)xmerge.orig/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java (-3 lines)
33	import org.w3c.dom.NodeList;	33	import org.w3c.dom.NodeList;
34	import org.w3c.dom.Node;	34	import org.w3c.dom.Node;
35	import org.w3c.dom.NamedNodeMap;	35	import org.w3c.dom.NamedNodeMap;
36	import org.w3c.dom.Element;
37		36
38	import java.io.IOException;	37	import java.io.IOException;
39	import java.net.URLDecoder;	38	import java.net.URLDecoder;
Lines 45-52 Link Here
45	import org.openoffice.xmerge.converter.xml.OfficeConstants;	44	import org.openoffice.xmerge.converter.xml.OfficeConstants;
46	import org.openoffice.xmerge.converter.xml.sxw.SxwDocument;	45	import org.openoffice.xmerge.converter.xml.sxw.SxwDocument;
47	import org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocConstants;	46	import org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocConstants;
48	import org.openoffice.xmerge.converter.palm.PdbEncoder;
49	import org.openoffice.xmerge.converter.palm.PdbDecoder;
50	import org.openoffice.xmerge.converter.palm.PalmDB;	47	import org.openoffice.xmerge.converter.palm.PalmDB;
51	import org.openoffice.xmerge.converter.palm.Record;	48	import org.openoffice.xmerge.converter.palm.Record;
52	import org.openoffice.xmerge.converter.palm.PalmDocument;	49	import org.openoffice.xmerge.converter.palm.PalmDocument;

Lines 71-80 Link Here

(-)xmerge.orig/source/bridge/java/XMergeBridge.java (-2 lines)
71	import org.openoffice.xmerge.converter.xml.OfficeDocument;	71	import org.openoffice.xmerge.converter.xml.OfficeDocument;
72	/Java Classes/	72	/Java Classes/
73	import java.util.Enumeration;	73	import java.util.Enumeration;
74	import java.util.Vector;
75	import java.io.*;	74	import java.io.*;
76	import javax.xml.parsers.*;	75	import javax.xml.parsers.*;
77	import org.xml.sax.SAXException;
78	import java.net.URI;	76	import java.net.URI;
79		77
80		78





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;

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;





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;

/**

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;





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;

/**

Lines 36-42 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java (-1 lines)
36	import java.io.InputStream;	36	import java.io.InputStream;
37		37
38	import org.openoffice.xmerge.util.Debug;	38	import org.openoffice.xmerge.util.Debug;
39	import org.openoffice.xmerge.util.EndianConverter;
40	import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;	39	import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
41		40
42	/**	41	/**





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 {


Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 31-37 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java (-1 lines)
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.IOException;	33	import java.io.IOException;
34	import java.io.DataInputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.OutputStream;	35	import java.io.OutputStream;
37		36

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;





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;

/**

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 35-41 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java (-1 lines)
35	import java.util.Vector;	35	import java.util.Vector;
36	import java.util.Enumeration;	36	import java.util.Enumeration;
37		37
38	import org.openoffice.xmerge.util.Debug;
39	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;	38	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
40		39
41	/**	40	/**

Lines 31-39 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java (-2 lines)
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;
32		32
33		33
34	import java.io.*;
35	import java.util.Vector;	34	import java.util.Vector;
36	import java.util.Enumeration;
37		35
38	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;	36	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
39	import org.openoffice.xmerge.util.Debug;	37	import org.openoffice.xmerge.util.Debug;

Lines 36-45 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java (-4 lines)
36	* Martin Maher	36	* Martin Maher
37	*/	37	*/
38		38
39	import java.io.*;
40
41	import org.openoffice.xmerge.util.Debug;
42
43	public class FormulaParsingException extends Exception {	39	public class FormulaParsingException extends Exception {
44		40
45	public FormulaParsingException(String message) {	41	public FormulaParsingException(String message) {

Lines 30-37 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java (-2 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;
32		32
33	import org.openoffice.xmerge.util.Debug;
34
35	import java.util.HashMap;	33	import java.util.HashMap;
36		34
37	public class FunctionLookup extends SymbolLookup {	35	public class FunctionLookup extends SymbolLookup {

Lines 31-38 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java (-2 lines)
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;
32	import java.util.HashMap;	32	import java.util.HashMap;
33		33
34	import org.openoffice.xmerge.util.Debug;
35
36	/**	34	/**
37	* A lookup table containing information about operands	35	* A lookup table containing information about operands
38	*/	36	*/

Lines 32-39 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java (-2 lines)
32		32
33	import java.util.HashMap;	33	import java.util.HashMap;
34		34
35	import org.openoffice.xmerge.util.Debug;
36
37	/**	35	/**
38	* A lookup table containing information about operators	36	* A lookup table containing information about operators
39	*/	37	*/

Lines 30-37 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java (-2 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;
32		32
33	import java.io.*;
34
35	public interface TokenConstants {	33	public interface TokenConstants {
36		34
37	// Unary Operator Tokens	35	// Unary Operator Tokens

Lines 37-43 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java (-1 lines)
37	import org.openoffice.xmerge.util.Debug;	37	import org.openoffice.xmerge.util.Debug;
38	import org.openoffice.xmerge.util.EndianConverter;	38	import org.openoffice.xmerge.util.EndianConverter;
39	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;	39	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
40	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.BoundSheet;
41	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.DefinedName;	40	import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.DefinedName;
42		41
43	/**	42	/**

Lines 30-39 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java (-4 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;
32		32
33	import java.io.*;
34	import java.util.Vector;
35	import java.util.Enumeration;
36
37	import org.openoffice.xmerge.util.Debug;	33	import org.openoffice.xmerge.util.Debug;
38		34
39	/**	35	/**

Lines 31-38 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java (-2 lines)
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula;
32		32
33		33
34	import java.io.*;
35
36	/**	34	/**
37	* A Token is the basic building block of any formula.	35	* A Token is the basic building block of any formula.
38	* A Token can be of four types (Operator, Operand, Function with fixed	36	* A Token can be of four types (Operator, Operand, Function with fixed





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;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.InputStream;	33	import java.io.InputStream;
35	import java.io.OutputStream;	34	import java.io.OutputStream;
36	import java.io.IOException;	35	import java.io.IOException;





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;



Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 32-39 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java (-2 lines)
32		32
33	import java.lang.Exception;	33	import java.lang.Exception;
34		34
35	import org.openoffice.xmerge.util.Debug;
36
37	/**	35	/**
38	* At the moment any functions within a formula will result in this exception	36	* At the moment any functions within a formula will result in this exception
39	* being thrown.	37	* being thrown.

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 30-36 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;	31	package org.openoffice.xmerge.converter.xml.sxc.pexcel.records;
32		32
33	import java.io.DataInputStream;
34	import java.io.OutputStream;	33	import java.io.OutputStream;
35	import java.io.InputStream;	34	import java.io.InputStream;
36	import java.io.IOException;	35	import java.io.IOException;

Lines 42-48 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java (-1 lines)
42	import org.openoffice.xmerge.converter.xml.sxc.BookSettings;	42	import org.openoffice.xmerge.converter.xml.sxc.BookSettings;
43	import org.openoffice.xmerge.converter.xml.sxc.SheetSettings;	43	import org.openoffice.xmerge.converter.xml.sxc.SheetSettings;
44	import org.openoffice.xmerge.util.Debug;	44	import org.openoffice.xmerge.util.Debug;
45	import org.openoffice.xmerge.util.IntArrayList;
46	import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;	45	import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
47	import org.openoffice.xmerge.converter.xml.sxc.ColumnRowInfo;	46	import org.openoffice.xmerge.converter.xml.sxc.ColumnRowInfo;
48		47

Lines 37-43 Link Here

(-)xmerge.orig/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java (-1 lines)
37	import java.util.Enumeration;	37	import java.util.Enumeration;
38	import java.awt.Point;	38	import java.awt.Point;
39		39
40	import org.openoffice.xmerge.util.IntArrayList;
41	import org.openoffice.xmerge.util.Debug;	40	import org.openoffice.xmerge.util.Debug;
42	import org.openoffice.xmerge.converter.xml.sxc.SheetSettings;	41	import org.openoffice.xmerge.converter.xml.sxc.SheetSettings;
43	import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;	42	import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;





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> 

Lines 44-53 Link Here

(-)xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java (-3 lines)
44		44
45	import org.openoffice.xmerge.util.OfficeUtil;	45	import org.openoffice.xmerge.util.OfficeUtil;
46		46
47	import java.io.InputStream;
48	import java.io.IOException;	47	import java.io.IOException;
49	import java.io.FileInputStream;
50	import java.io.FileDescriptor;
51		48
52	import java.util.Enumeration;	49	import java.util.Enumeration;
53	import java.util.Vector;	50	import java.util.Vector;

Lines 31-37 Link Here

(-)xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java (-2 lines)
31	package org.openoffice.xmerge.converter.xml.sxw.pocketword;	31	package org.openoffice.xmerge.converter.xml.sxw.pocketword;
32		32
33	import org.w3c.dom.Document;	33	import org.w3c.dom.Document;
34	import org.w3c.dom.Element;
35		34
36	import org.openoffice.xmerge.DocumentMerger;	35	import org.openoffice.xmerge.DocumentMerger;
37	import org.openoffice.xmerge.MergeException;	36	import org.openoffice.xmerge.MergeException;
Lines 41-47 Link Here
41	import org.openoffice.xmerge.merger.Difference;	40	import org.openoffice.xmerge.merger.Difference;
42	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;	41	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
43	import org.openoffice.xmerge.merger.Iterator;	42	import org.openoffice.xmerge.merger.Iterator;
44	import org.openoffice.xmerge.merger.DiffAlgorithm;
45	import org.openoffice.xmerge.merger.diff.ParaNodeIterator;	43	import org.openoffice.xmerge.merger.diff.ParaNodeIterator;
46	import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm;	44	import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm;
47	import org.openoffice.xmerge.merger.merge.DocumentMerge;	45	import org.openoffice.xmerge.merger.merge.DocumentMerge;

Lines 33-39 Link Here

(-)xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java (-3 lines)
33	import org.w3c.dom.Node;	33	import org.w3c.dom.Node;
34	import org.w3c.dom.NodeList;	34	import org.w3c.dom.NodeList;
35	import org.w3c.dom.NamedNodeMap;	35	import org.w3c.dom.NamedNodeMap;
36	import org.w3c.dom.Element;
37		36
38	import org.openoffice.xmerge.ConvertData;	37	import org.openoffice.xmerge.ConvertData;
39	import org.openoffice.xmerge.ConvertException;	38	import org.openoffice.xmerge.ConvertException;
Lines 47-54 Link Here
47	import org.openoffice.xmerge.converter.xml.TextStyle;	46	import org.openoffice.xmerge.converter.xml.TextStyle;
48	import org.openoffice.xmerge.converter.xml.StyleCatalog;	47	import org.openoffice.xmerge.converter.xml.StyleCatalog;
49		48
50	import java.io.OutputStream;
51	import java.io.ByteArrayOutputStream;
52	import java.io.IOException;	49	import java.io.IOException;
53		50
54		51

Lines 31-37 Link Here

(-)xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java (-1 lines)
31	package org.openoffice.xmerge.converter.xml.sxw.pocketword;	31	package org.openoffice.xmerge.converter.xml.sxw.pocketword;
32		32
33	import java.io.ByteArrayOutputStream;	33	import java.io.ByteArrayOutputStream;
34	import java.io.ByteArrayInputStream;
35	import java.io.IOException;	34	import java.io.IOException;
36		35
37	import java.util.Vector;	36	import java.util.Vector;

Lines 39-46 Link Here

(-)xmerge.orig/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java (-2 lines)
39	import java.io.ByteArrayOutputStream;	39	import java.io.ByteArrayOutputStream;
40	import java.io.IOException;	40	import java.io.IOException;
41		41
42	import java.awt.Color;
43
44	/**	42	/**
45	* This class represents a portion of text with a particular formatting style.	43	* This class represents a portion of text with a particular formatting style.
46	* The style may differ from the default style of the paragraph of which it	44	* The style may differ from the default style of the paragraph of which it




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;






import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringWriter;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;



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;

    /** 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;

        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.

            }
            else {
                // We dont have another parser  
                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) {

Lines 35-43 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java (-3 lines)
35	import java.io.ByteArrayOutputStream;	35	import java.io.ByteArrayOutputStream;
36		36
37	import java.io.OutputStream;	37	import java.io.OutputStream;
38	import java.io.Reader;
39	import java.io.BufferedReader;
40	import java.io.StringReader;
41	import java.io.UnsupportedEncodingException;	38	import java.io.UnsupportedEncodingException;
42		39
43	import org.openoffice.xmerge.Document;	40	import org.openoffice.xmerge.Document;

Lines 35-42 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java (-2 lines)
35	import java.io.ByteArrayInputStream;	35	import java.io.ByteArrayInputStream;
36	import java.io.DataInputStream;	36	import java.io.DataInputStream;
37		37
38	import org.openoffice.xmerge.converter.palm.*;
39
40	/**	38	/**
41	* <p>Provides functionality to decode a PDB formatted file into	39	* <p>Provides functionality to decode a PDB formatted file into
42	* a <code>PalmDB</code> object given an <code>InputStream</code>.	40	* a <code>PalmDB</code> object given an <code>InputStream</code>.

Lines 33-39 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java (-1 lines)
33	import org.w3c.dom.Document;	33	import org.w3c.dom.Document;
34	import org.w3c.dom.DOMException;	34	import org.w3c.dom.DOMException;
35	import org.w3c.dom.Element;	35	import org.w3c.dom.Element;
36	import org.w3c.dom.Node;
37		36
38		37
39	/**	38	/**

Lines 30-36 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java (-4 / +1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml;	31	package org.openoffice.xmerge.converter.xml;
32		32
33	import java.io.ByteArrayInputStream;
34	import java.io.IOException;	33	import java.io.IOException;
35		34
36	import javax.xml.parsers.DocumentBuilder;	35	import javax.xml.parsers.DocumentBuilder;
Lines 42-49 Link Here
42	import org.w3c.dom.Element;	41	import org.w3c.dom.Element;
43	import org.w3c.dom.Node;	42	import org.w3c.dom.Node;
44		43
45	import org.xml.sax.EntityResolver;
46	import org.xml.sax.InputSource;
47	import org.xml.sax.SAXException;	44	import org.xml.sax.SAXException;
48		45
49	/**	46	/**
Lines 298-301 Link Here
298	root.appendChild(objectNode);	295	root.appendChild(objectNode);
299	}	296	}
300		297
301	}	298	}

Lines 32-38 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java (-1 lines)
32		32
33	import java.io.IOException;	33	import java.io.IOException;
34		34
35	import javax.xml.parsers.ParserConfigurationException;
36	import org.xml.sax.SAXException;	35	import org.xml.sax.SAXException;
37	import org.xml.sax.SAXParseException;	36	import org.xml.sax.SAXParseException;
38		37

Lines 35-47 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java (-6 / +19 lines)
35	import java.io.Reader;	35	import java.io.Reader;
36	import java.io.BufferedReader;	36	import java.io.BufferedReader;
37	import java.io.StringReader;	37	import java.io.StringReader;
		38	import java.io.StringWriter;
38	import java.io.InputStreamReader;	39	import java.io.InputStreamReader;
39	import java.io.BufferedInputStream;
40	import java.io.ByteArrayOutputStream;	40	import java.io.ByteArrayOutputStream;
41	import java.io.ByteArrayInputStream;	41	import java.io.ByteArrayInputStream;
42	import java.io.IOException;	42	import java.io.IOException;
43	import java.util.zip.ZipEntry;
44	import java.util.zip.ZipInputStream;
45	import java.util.Iterator;	43	import java.util.Iterator;
46	import java.util.Map;	44	import java.util.Map;
47	import java.util.HashMap;	45	import java.util.HashMap;
Lines 59-65 Link Here
59	import org.xml.sax.InputSource;	57	import org.xml.sax.InputSource;
60	import org.w3c.dom.NamedNodeMap;	58	import org.w3c.dom.NamedNodeMap;
61	import org.xml.sax.SAXException;	59	import org.xml.sax.SAXException;
62	import org.xml.sax.SAXParseException;	60
		61	import javax.xml.transform.*;
		62	import javax.xml.transform.dom.*;
		63	import javax.xml.transform.stream.*;
63		64
64	import org.openoffice.xmerge.util.Resources;	65	import org.openoffice.xmerge.util.Resources;
65	import org.openoffice.xmerge.util.Debug;	66	import org.openoffice.xmerge.util.Debug;
Lines 872-877 Link Here
872	* doc may vary. Need a way to find out which API is being	873	* doc may vary. Need a way to find out which API is being
873	* used and use an appropriate serialization method.	874	* used and use an appropriate serialization method.
874	*/	875	*/
		876
875	try {	877	try {
876	// First of all try for JAXP 1.0	878	// First of all try for JAXP 1.0
877	if (domImpl.equals("com.sun.xml.tree.XmlDocument")) {	879	if (domImpl.equals("com.sun.xml.tree.XmlDocument")) {
Lines 942-949 Link Here
942	meth.invoke(serializer, new Object [] { doc, baos } );	944	meth.invoke(serializer, new Object [] { doc, baos } );
943	}	945	}
944	else {	946	else {
945	// We don't have another parser	947	try {
946	throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl);	948	DOMSource domSource = new DOMSource(doc);
		949	StringWriter writer = new StringWriter();
		950	StreamResult result = new StreamResult(writer);
		951	TransformerFactory tf = TransformerFactory.newInstance();
		952	Transformer transformer = tf.newTransformer();
		953	transformer.transform(domSource, result);
		954	return writer.toString().getBytes();
		955	}
		956	catch (Exception e) {
		957	// We don't have another parser
		958	throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl);
		959	}
947	}	960	}
948	}	961	}
949	catch (ClassNotFoundException cnfe) {	962	catch (ClassNotFoundException cnfe) {




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;






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;


/**





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>

Lines 36-42 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java (-1 lines)
36	import org.w3c.dom.NodeList;	36	import org.w3c.dom.NodeList;
37	import org.w3c.dom.Node;	37	import org.w3c.dom.Node;
38	import org.w3c.dom.Element;	38	import org.w3c.dom.Element;
39	import java.awt.Point;
40		39
41	import org.openoffice.xmerge.converter.xml.OfficeConstants;	40	import org.openoffice.xmerge.converter.xml.OfficeConstants;
42	import org.openoffice.xmerge.util.Debug;	41	import org.openoffice.xmerge.util.Debug;




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;

/**





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;

Lines 42-48 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java (-1 lines)
42	import org.openoffice.xmerge.merger.DiffAlgorithm;	42	import org.openoffice.xmerge.merger.DiffAlgorithm;
43	import org.openoffice.xmerge.merger.Difference;	43	import org.openoffice.xmerge.merger.Difference;
44	import org.openoffice.xmerge.merger.Iterator;	44	import org.openoffice.xmerge.merger.Iterator;
45	import org.openoffice.xmerge.merger.DiffAlgorithm;
46	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;	45	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
47	import org.openoffice.xmerge.merger.diff.IteratorRowCompare;	46	import org.openoffice.xmerge.merger.diff.IteratorRowCompare;
48	import org.openoffice.xmerge.merger.diff.RowIterator;	47	import org.openoffice.xmerge.merger.diff.RowIterator;

Lines 32-39 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java (-2 lines)
32		32
33	import java.awt.Color;	33	import java.awt.Color;
34		34
35	import org.openoffice.xmerge.util.Debug;
36
37	/**	35	/**
38	* This class specifies the format for a given spreadsheet cell.	36	* This class specifies the format for a given spreadsheet cell.
39	*	37	*

Lines 30-36 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc;	31	package org.openoffice.xmerge.converter.xml.sxc;
32		32
33	import org.w3c.dom.NodeList;
34	import org.w3c.dom.Node;	33	import org.w3c.dom.Node;
35	import org.w3c.dom.Element;	34	import org.w3c.dom.Element;
36	import org.w3c.dom.NamedNodeMap;	35	import org.w3c.dom.NamedNodeMap;





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;

Lines 37-43 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java (-1 lines)
37	import java.awt.Point;	37	import java.awt.Point;
38		38
39	import org.openoffice.xmerge.converter.xml.OfficeConstants;	39	import org.openoffice.xmerge.converter.xml.OfficeConstants;
40	import org.openoffice.xmerge.util.Debug;
41		40
42	/**	41	/**
43	* This is a class representing the different attributes for a worksheet	42	* This is a class representing the different attributes for a worksheet

Lines 31-37 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java (-1 lines)
31	package org.openoffice.xmerge.converter.xml.sxc;	31	package org.openoffice.xmerge.converter.xml.sxc;
32		32
33	import java.io.IOException;	33	import java.io.IOException;
34	import java.io.InputStream;
35	import java.util.Enumeration;	34	import java.util.Enumeration;
36		35
37	import org.openoffice.xmerge.converter.xml.sxc.Format;	36	import org.openoffice.xmerge.converter.xml.sxc.Format;

Lines 33-40 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java (-2 lines)
33	import java.io.IOException;	33	import java.io.IOException;
34	import java.util.Vector;	34	import java.util.Vector;
35		35
36	import org.openoffice.xmerge.util.IntArrayList;
37
38	/**	36	/**
39	* <p>This class is a abstract class for encoding an SXC into an	37	* <p>This class is a abstract class for encoding an SXC into an
40	* alternative spreadsheet format.</p>	38	* alternative spreadsheet format.</p>

Lines 34-40 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java (-2 lines)
34	import org.w3c.dom.Node;	34	import org.w3c.dom.Node;
35	import org.w3c.dom.Element;	35	import org.w3c.dom.Element;
36		36
37	import java.awt.Point;
38	import java.io.IOException;	37	import java.io.IOException;
39	import java.util.Enumeration;	38	import java.util.Enumeration;
40		39
Lines 45-51 Link Here
45	import org.openoffice.xmerge.converter.xml.OfficeConstants;	44	import org.openoffice.xmerge.converter.xml.OfficeConstants;
46	import org.openoffice.xmerge.converter.xml.sxc.SxcDocument;	45	import org.openoffice.xmerge.converter.xml.sxc.SxcDocument;
47	import org.openoffice.xmerge.converter.xml.sxc.BookSettings;	46	import org.openoffice.xmerge.converter.xml.sxc.BookSettings;
48	import org.openoffice.xmerge.converter.xml.sxc.SheetSettings;
49	import org.openoffice.xmerge.converter.xml.sxc.NameDefinition;	47	import org.openoffice.xmerge.converter.xml.sxc.NameDefinition;
50	import org.openoffice.xmerge.converter.xml.sxc.CellStyle;	48	import org.openoffice.xmerge.converter.xml.sxc.CellStyle;
51	import org.openoffice.xmerge.converter.xml.Style;	49	import org.openoffice.xmerge.converter.xml.Style;

Lines 30-36 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxc;	31	package org.openoffice.xmerge.converter.xml.sxc;
32		32
33	import org.w3c.dom.Document;
34	import org.openoffice.xmerge.converter.xml.OfficeDocument;	33	import org.openoffice.xmerge.converter.xml.OfficeDocument;
35	import org.openoffice.xmerge.converter.xml.OfficeConstants;	34	import org.openoffice.xmerge.converter.xml.OfficeConstants;
36		35

Lines 48-54 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java (-1 lines)
48		48
49	import org.openoffice.xmerge.converter.xml.OfficeConstants;	49	import org.openoffice.xmerge.converter.xml.OfficeConstants;
50	import org.openoffice.xmerge.converter.xml.sxc.SxcDocument;	50	import org.openoffice.xmerge.converter.xml.sxc.SxcDocument;
51	import org.openoffice.xmerge.converter.xml.ParaStyle;
52	import org.openoffice.xmerge.converter.xml.sxc.CellStyle;	51	import org.openoffice.xmerge.converter.xml.sxc.CellStyle;
53	import org.openoffice.xmerge.converter.xml.StyleCatalog;	52	import org.openoffice.xmerge.converter.xml.StyleCatalog;
54		53

Lines 34-40 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java (-1 lines)
34	import java.io.IOException;	34	import java.io.IOException;
35		35
36	import org.openoffice.xmerge.util.registry.ConverterInfo;	36	import org.openoffice.xmerge.util.registry.ConverterInfo;
37	import org.openoffice.xmerge.ConvertData;
38	import org.openoffice.xmerge.PluginFactory;	37	import org.openoffice.xmerge.PluginFactory;
39	import org.openoffice.xmerge.Document;	38	import org.openoffice.xmerge.Document;
40	import org.openoffice.xmerge.DocumentMergerFactory;	39	import org.openoffice.xmerge.DocumentMergerFactory;

Lines 30-36 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java (-1 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.sxw;	31	package org.openoffice.xmerge.converter.xml.sxw;
32		32
33	import org.w3c.dom.Document;
34	import org.openoffice.xmerge.converter.xml.OfficeDocument;	33	import org.openoffice.xmerge.converter.xml.OfficeDocument;
35	import org.openoffice.xmerge.converter.xml.OfficeConstants;	34	import org.openoffice.xmerge.converter.xml.OfficeConstants;
36		35

Lines 33-40 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java (-2 lines)
33	import java.io.InputStream;	33	import java.io.InputStream;
34	import java.io.IOException;	34	import java.io.IOException;
35		35
36	import org.openoffice.xmerge.ConvertData;
37	import org.openoffice.xmerge.PluginFactory;
38	import org.openoffice.xmerge.PluginFactory;	36	import org.openoffice.xmerge.PluginFactory;
39	import org.openoffice.xmerge.Document;	37	import org.openoffice.xmerge.Document;
40	import org.openoffice.xmerge.util.registry.ConverterInfo;	38	import org.openoffice.xmerge.util.registry.ConverterInfo;




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;

/**

Lines 30-39 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java (-4 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.xslt;	31	package org.openoffice.xmerge.converter.xml.xslt;
32		32
33	import org.w3c.dom.NodeList;
34	import org.w3c.dom.Node;
35	import org.w3c.dom.Element;
36
37	import java.io.InputStream;	33	import java.io.InputStream;
38	import java.io.IOException;	34	import java.io.IOException;
39	import java.util.Enumeration;	35	import java.util.Enumeration;

Lines 31-37 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java (-2 lines)
31	package org.openoffice.xmerge.converter.xml.xslt;	31	package org.openoffice.xmerge.converter.xml.xslt;
32		32
33	import org.w3c.dom.Document;	33	import org.w3c.dom.Document;
34	import org.w3c.dom.Element;
35		34
36	import org.openoffice.xmerge.DocumentMerger;	35	import org.openoffice.xmerge.DocumentMerger;
37	import org.openoffice.xmerge.MergeException;	36	import org.openoffice.xmerge.MergeException;
Lines 41-47 Link Here
41	import org.openoffice.xmerge.merger.Difference;	40	import org.openoffice.xmerge.merger.Difference;
42	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;	41	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
43	import org.openoffice.xmerge.merger.Iterator;	42	import org.openoffice.xmerge.merger.Iterator;
44	import org.openoffice.xmerge.merger.DiffAlgorithm;
45	import org.openoffice.xmerge.merger.diff.ParaNodeIterator;	43	import org.openoffice.xmerge.merger.diff.ParaNodeIterator;
46	import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm;	44	import org.openoffice.xmerge.merger.diff.IteratorLCSAlgorithm;
47	import org.openoffice.xmerge.merger.merge.DocumentMerge;	45	import org.openoffice.xmerge.merger.merge.DocumentMerge;




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;

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;


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;


// Imported java classes
import java.io.FileNotFoundException;
import java.io.File;
import java.net.URI;

/**
 *  <p>Xslt implementation of

Lines 30-38 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java (-2 lines)
30		30
31	package org.openoffice.xmerge.converter.xml.xslt;	31	package org.openoffice.xmerge.converter.xml.xslt;
32		32
33	import org.w3c.dom.Document;
34	import org.openoffice.xmerge.converter.xml.OfficeDocument;	33	import org.openoffice.xmerge.converter.xml.OfficeDocument;
35	import org.openoffice.xmerge.converter.xml.OfficeConstants;
36		34
37	/**	35	/**
38	* This class is an implementation of <code>OfficeDocument</code> for	36	* This class is an implementation of <code>OfficeDocument</code> for

Lines 45-55 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java (-2 lines)
45	import org.openoffice.xmerge.DocumentMerger;	45	import org.openoffice.xmerge.DocumentMerger;
46	import org.openoffice.xmerge.DocumentMergerFactory;	46	import org.openoffice.xmerge.DocumentMergerFactory;
47	import org.openoffice.xmerge.ConverterCapabilities;	47	import org.openoffice.xmerge.ConverterCapabilities;
48	import org.openoffice.xmerge.util.registry.ConverterInfo;
49		48
50	import java.io.InputStream;	49	import java.io.InputStream;
51	import java.util.Enumeration;	50	import java.util.Enumeration;
52	import java.io.InputStream;
53	import java.io.IOException;	51	import java.io.IOException;
54	import java.util.Properties;	52	import java.util.Properties;
55		53

Lines 34-42 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java (-2 lines)
34	import org.w3c.dom.Element;	34	import org.w3c.dom.Element;
35		35
36	import org.openoffice.xmerge.ConverterCapabilities;	36	import org.openoffice.xmerge.ConverterCapabilities;
37	import org.openoffice.xmerge.merger.Iterator;
38	import org.openoffice.xmerge.converter.xml.OfficeConstants;	37	import org.openoffice.xmerge.converter.xml.OfficeConstants;
39	import org.openoffice.xmerge.util.Debug;
40	import org.openoffice.xmerge.util.Resources;	38	import org.openoffice.xmerge.util.Resources;
41		39
42		40

Lines 31-37 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java (-1 lines)
31	package org.openoffice.xmerge.merger.diff;	31	package org.openoffice.xmerge.merger.diff;
32		32
33	import org.w3c.dom.Node;	33	import org.w3c.dom.Node;
34	import org.w3c.dom.Element;
35		34
36	import org.openoffice.xmerge.converter.xml.OfficeConstants;	35	import org.openoffice.xmerge.converter.xml.OfficeConstants;
37		36

Lines 31-37 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java (-1 lines)
31	package org.openoffice.xmerge.merger.diff;	31	package org.openoffice.xmerge.merger.diff;
32		32
33	import java.util.Vector;	33	import java.util.Vector;
34	import org.openoffice.xmerge.merger.DiffAlgorithm;
35	import org.openoffice.xmerge.merger.Difference;	34	import org.openoffice.xmerge.merger.Difference;
36		35
37	/**	36	/**

Lines 33-43 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java (-2 lines)
33	import org.w3c.dom.Node;	33	import org.w3c.dom.Node;
34	import org.w3c.dom.NodeList;	34	import org.w3c.dom.NodeList;
35	import org.w3c.dom.NamedNodeMap;	35	import org.w3c.dom.NamedNodeMap;
36	import org.w3c.dom.Element;
37		36
38	import org.openoffice.xmerge.ConverterCapabilities;	37	import org.openoffice.xmerge.ConverterCapabilities;
39	import org.openoffice.xmerge.merger.Iterator;	38	import org.openoffice.xmerge.merger.Iterator;
40	import org.openoffice.xmerge.converter.xml.OfficeConstants;
41	import org.openoffice.xmerge.util.Debug;	39	import org.openoffice.xmerge.util.Debug;
42	import org.openoffice.xmerge.util.Resources;	40	import org.openoffice.xmerge.util.Resources;
43		41




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.




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;






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.

Lines 31-40 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java (-3 lines)
31	package org.openoffice.xmerge.merger.merge;	31	package org.openoffice.xmerge.merger.merge;
32		32
33	import org.w3c.dom.Element;	33	import org.w3c.dom.Element;
34	import org.w3c.dom.Document;
35	import org.w3c.dom.Node;	34	import org.w3c.dom.Node;
36	import org.w3c.dom.NodeList;
37	import org.w3c.dom.NamedNodeMap;
38		35
39	import org.openoffice.xmerge.ConverterCapabilities;	36	import org.openoffice.xmerge.ConverterCapabilities;
40	import org.openoffice.xmerge.MergeException;	37	import org.openoffice.xmerge.MergeException;





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;


/**

    // used to compare the cell 1 by 1
    private void mergeCellSequences(Iterator orgSeq, Iterator modSeq) {

        int i, j;
        boolean needMerge = true;
        Element orgCell, modCell;


Lines 35-41 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java (-3 lines)
35		35
36	import org.openoffice.xmerge.ConverterCapabilities;	36	import org.openoffice.xmerge.ConverterCapabilities;
37	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;	37	import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
38	import org.openoffice.xmerge.util.Debug;
39		38
40	/**	39	/**
41	* This class extends the <code>DocumentMerge</code> class.	40	* This class extends the <code>DocumentMerge</code> class.
Lines 81-88 Link Here
81	NodeList children = node.getChildNodes();	80	NodeList children = node.getChildNodes();
82	int numOfChildren = children.getLength();	81	int numOfChildren = children.getLength();
83		82
84	Node child;
85
86	// clear all the cells under the row node but maintain any unsupported	83	// clear all the cells under the row node but maintain any unsupported
87	// features	84	// features
88	// TODO: we can actually check anything left after the clear up.	85	// TODO: we can actually check anything left after the clear up.

Lines 36-42 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java (-1 lines)
36	import org.w3c.dom.NamedNodeMap;	36	import org.w3c.dom.NamedNodeMap;
37		37
38	import org.openoffice.xmerge.ConverterCapabilities;	38	import org.openoffice.xmerge.ConverterCapabilities;
39	import org.openoffice.xmerge.merger.diff.CellNodeIterator;
40	import org.openoffice.xmerge.converter.xml.OfficeConstants;	39	import org.openoffice.xmerge.converter.xml.OfficeConstants;
41		40
42		41

Lines 32-40 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java (-3 lines)
32		32
33	import org.w3c.dom.Node;	33	import org.w3c.dom.Node;
34		34
35	import org.openoffice.xmerge.merger.Iterator;
36	import org.openoffice.xmerge.merger.Difference;
37
38	/**	35	/**
39	* This is an interface for a {@link	36	* This is an interface for a {@link
40	* org.openoffice.xmerge.merger.MergeAlgorithm	37	* org.openoffice.xmerge.merger.MergeAlgorithm

Lines 30-39 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java (-3 lines)
30		30
31	package org.openoffice.xmerge.test;	31	package org.openoffice.xmerge.test;
32		32
33	import java.io.BufferedReader;
34	import java.io.IOException;	33	import java.io.IOException;
35	import java.io.InputStreamReader;
36	import java.io.FileReader;
37	import java.io.InputStream;	34	import java.io.InputStream;
38	import java.io.BufferedInputStream;	35	import java.io.BufferedInputStream;
39	import java.util.Properties;	36	import java.util.Properties;

Lines 32-39 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/test/Driver.java (-3 lines)
32		32
33	import java.util.Vector;	33	import java.util.Vector;
34	import java.util.Enumeration;	34	import java.util.Enumeration;
35	import java.io.IOException;
36	import java.io.InputStream;
37	import java.io.FileOutputStream;	35	import java.io.FileOutputStream;
38	import java.io.FileInputStream;	36	import java.io.FileInputStream;
39	import java.io.File;	37	import java.io.File;
Lines 43-49 Link Here
43	import org.openoffice.xmerge.ConvertData;	41	import org.openoffice.xmerge.ConvertData;
44	import org.openoffice.xmerge.ConverterFactory;	42	import org.openoffice.xmerge.ConverterFactory;
45	import org.openoffice.xmerge.test.ConverterInfoList;	43	import org.openoffice.xmerge.test.ConverterInfoList;
46	import org.openoffice.xmerge.util.registry.ConverterInfo;
47	import org.openoffice.xmerge.util.registry.ConverterInfoMgr;	44	import org.openoffice.xmerge.util.registry.ConverterInfoMgr;
48	import org.openoffice.xmerge.util.registry.ConverterInfoReader;	45	import org.openoffice.xmerge.util.registry.ConverterInfoReader;
49	import org.openoffice.xmerge.DocumentMerger;	46	import org.openoffice.xmerge.DocumentMerger;




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;


Lines 42-49 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/Debug.java (-2 lines)
42	import java.util.Date;	42	import java.util.Date;
43	import java.util.Calendar;	43	import java.util.Calendar;
44	import java.util.Properties;	44	import java.util.Properties;
45	import org.w3c.dom.Node;
46
47		45
48	/**	46	/**
49	* This class is used for logging debug messages.	47	* This class is used for logging debug messages.

Lines 32-38 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java (-1 lines)
32		32
33	import java.util.*;	33	import java.util.*;
34	import java.io.*;	34	import java.io.*;
35	import javax.xml.parsers.*;
36		35
37	/**	36	/**
38	* Manages the converter plug-ins that are currently active.	37	* Manages the converter plug-ins that are currently active.

Lines 31-37 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/util/Resources.java (-1 lines)
31	package org.openoffice.xmerge.util;	31	package org.openoffice.xmerge.util;
32		32
33	import java.util.ResourceBundle;	33	import java.util.ResourceBundle;
34	import java.util.MissingResourceException;
35		34
36	/**	35	/**
37	* <p>Provides a singleton resource class for converter messages.</p>	36	* <p>Provides a singleton resource class for converter messages.</p>

Return to issue 99387

Lines 36-46 Link Here

(-)xmerge.orig/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java (-7 lines)
36	import org.w3c.dom.*;	36	import org.w3c.dom.*;
37		37
38	import java.io.IOException;	38	import java.io.IOException;
39	import java.io.InputStream;
40	import java.io.ByteArrayOutputStream;	39	import java.io.ByteArrayOutputStream;
41	import java.io.ByteArrayInputStream;	40	import java.io.ByteArrayInputStream;
42	import java.util.Enumeration;
43	import java.util.Properties;
44		41
45	import org.openoffice.xmerge.Document;	42	import org.openoffice.xmerge.Document;
46	import org.openoffice.xmerge.ConvertData;	43	import org.openoffice.xmerge.ConvertData;
Lines 48-54 Link Here
48	import org.openoffice.xmerge.DocumentSerializer;	45	import org.openoffice.xmerge.DocumentSerializer;
49	import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument;	46	import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument;
50	import org.openoffice.xmerge.converter.dom.DOMDocument;	47	import org.openoffice.xmerge.converter.dom.DOMDocument;
51	import org.openoffice.xmerge.util.Debug;
52	import org.openoffice.xmerge.util.registry.ConverterInfo;	48	import org.openoffice.xmerge.util.registry.ConverterInfo;
53	import org.openoffice.xmerge.converter.xml.OfficeConstants;	49	import org.openoffice.xmerge.converter.xml.OfficeConstants;
54		50
Lines 58-64 Link Here
58	import javax.xml.transform.stream.StreamSource;	54	import javax.xml.transform.stream.StreamSource;
59	import javax.xml.transform.stream.StreamResult;	55	import javax.xml.transform.stream.StreamResult;
60	import javax.xml.transform.dom.DOMSource;	56	import javax.xml.transform.dom.DOMSource;
61	import javax.xml.transform.dom.DOMResult;
62	import javax.xml.transform.TransformerException;	57	import javax.xml.transform.TransformerException;
63	import javax.xml.transform.TransformerConfigurationException;	58	import javax.xml.transform.TransformerConfigurationException;
64	import javax.xml.transform.URIResolver;	59	import javax.xml.transform.URIResolver;
Lines 69-76 Link Here
69		64
70	// Imported java classes	65	// Imported java classes
71	import java.io.FileNotFoundException;	66	import java.io.FileNotFoundException;
72	import java.io.File;
73	import java.net.URI;
74		67
75	/**	68	/**
76	* <p>Xslt implementation of	69	* <p>Xslt implementation of