Attachment #32408 for issue #59368

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

Lines 127-134 Link Here

(-)xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java.old (-2 / +2 lines)
127	* <code>Vector</code> of <code>Document</code> objects.	127	* <code>Vector</code> of <code>Document</code> objects.
128	*/	128	*/
129	public Enumeration getDocumentEnumeration() {	129	public Enumeration getDocumentEnumeration() {
130	Enumeration enum = v.elements();	130	Enumeration enumerate = v.elements();
131	return (enum);	131	return (enumerate);
132	}	132	}
133		133
134		134




     */
    public Document deserialize() throws ConvertException, IOException {
	log("\nFound the XSLT deserializer");
	Enumeration enumerate = cd.getDocumentEnumeration();
	org.w3c.dom.Document domDoc=null;
	DOMDocument docOut=null;
	GenericOfficeDocument doc = null;
	ByteArrayOutputStream baos =null;
	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
	while (enumerate.hasMoreElements()) {       
		 docOut = (DOMDocument) enumerate.nextElement();
	}
	domDoc = docOut.getContentDOM();	
	try{

Lines 183-191 Link Here

(-)xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java.old (-3 / +3 lines)
183	String ext= ".txt";	183	String ext= ".txt";
184	String mimeType = null;	184	String mimeType = null;
185	ConverterInfo ci = this.getConverterInfo();	185	ConverterInfo ci = this.getConverterInfo();
186	Enumeration enum = ci.getDeviceMime();	186	Enumeration enumerate = ci.getDeviceMime();
187	while (enum.hasMoreElements()) {	187	while (enumerate.hasMoreElements()) {
188	mimeType= (String) enum.nextElement();	188	mimeType= (String) enumerate.nextElement();
189	}	189	}
190	try {	190	try {
191	props.load(is);	191	props.load(is);

Return to issue 59368

Lines 155-168 Link Here

(-)xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java.old (-3 / +3 lines)
155	*/	155	*/
156	public Document deserialize() throws ConvertException, IOException {	156	public Document deserialize() throws ConvertException, IOException {
157	log("\nFound the XSLT deserializer");	157	log("\nFound the XSLT deserializer");
158	Enumeration enum = cd.getDocumentEnumeration();	158	Enumeration enumerate = cd.getDocumentEnumeration();
159	org.w3c.dom.Document domDoc=null;	159	org.w3c.dom.Document domDoc=null;
160	DOMDocument docOut=null;	160	DOMDocument docOut=null;
161	GenericOfficeDocument doc = null;	161	GenericOfficeDocument doc = null;
162	ByteArrayOutputStream baos =null;	162	ByteArrayOutputStream baos =null;
163	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");	163	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
164	while (enum.hasMoreElements()) {	164	while (enumerate.hasMoreElements()) {
165	docOut = (DOMDocument) enum.nextElement();	165	docOut = (DOMDocument) enumerate.nextElement();
166	}	166	}
167	domDoc = docOut.getContentDOM();	167	domDoc = docOut.getContentDOM();
168	try{	168	try{