diff options
Diffstat (limited to 'xmerge')
23 files changed, 7 insertions, 212 deletions
diff --git a/xmerge/source/activesync/XMergeFilter.cpp b/xmerge/source/activesync/XMergeFilter.cpp index f6d0a4d5394f..e56049f7f836 100644 --- a/xmerge/source/activesync/XMergeFilter.cpp +++ b/xmerge/source/activesync/XMergeFilter.cpp @@ -360,18 +360,6 @@ TCHAR* CXMergeFilter::GetJavaBaseDir() /* use current version */ lRet = ::RegQueryValueEx(hKey, _T("CurrentVersion"), 0, NULL, (LPBYTE)szCurrentJava, &dwSize); - /* - for (DWORD i = 0; lRet != ERROR_NO_MORE_ITEMS; i++) - { - lRet = ::RegEnumKeyEx(hKey, i, szKeyName, &dwKeyName, 0, szClassName, &dwClassName, NULL); - if(!strncmp(szKeyName, "1.4", 3)) - break; - dwKeyName = _MAX_PATH; - } - // Found a Java 1.4 installation. Can now read its home directory. - */ - - lRet = ::RegOpenKeyEx(hKey, _T(szCurrentJava), 0, KEY_READ, &hDataKey); if (lRet != ERROR_SUCCESS) { diff --git a/xmerge/source/activesync/XMergeSync.rc b/xmerge/source/activesync/XMergeSync.rc index b355bcad7adc..3e9d24dd9207 100644 --- a/xmerge/source/activesync/XMergeSync.rc +++ b/xmerge/source/activesync/XMergeSync.rc @@ -2,20 +2,6 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -<<<<<<< XMergeSync.rc -// #include "afxres.h" -======= -//#include "afxres.h" ->>>>>>> 1.1.12.1 - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - ///////////////////////////////////////////////////////////////////////////// // English (Ireland) resources diff --git a/xmerge/source/activesync/makefile.mk b/xmerge/source/activesync/makefile.mk index 18d904f5e158..275dcd333ddb 100644 --- a/xmerge/source/activesync/makefile.mk +++ b/xmerge/source/activesync/makefile.mk @@ -27,7 +27,6 @@ PRJ = ..$/.. PRJNAME = xmerge -#PACKAGE = com$/sun$/star$/documentconversion$/XSLTFilter TARGET = xmergesync ENABLE_EXCEPTIONS=TRUE LIBTARGET=NO diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index 6fc6db43ac70..8c230760e93d 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -93,8 +93,6 @@ public class XMergeBridge { private static String sFileName=null; private static String sURL=""; - //private static FileOutputStream adaptedStream =null; - /** This inner class provides the component as a concrete implementation * of the service description. It implements the needed interfaces. */ @@ -160,16 +158,7 @@ public class XMergeBridge { public boolean importer(com.sun.star.beans.PropertyValue[] aSourceData, com.sun.star.xml.sax.XDocumentHandler xDocHandler, java.lang.String[] msUserData) throws com.sun.star.uno.RuntimeException { - /* - System.out.println("\nFound the Importer!\n"); - - System.out.println("\n"+msUserData[0]); - System.out.println("\n"+msUserData[1]); - System.out.println("\n"+msUserData[2]); - System.out.println("\n"+msUserData[3]); - System.out.println("\n"+msUserData[4]); - System.out.println("\n"+msUserData[5]); - */ + sFileName=""; sURL=""; String sDirectory = null; @@ -185,10 +174,7 @@ public class XMergeBridge { for (int i = 0 ; i < pValue.length; i++) { - //System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value; - try{ - //System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value); if (pValue[i].Name.compareTo("InputStream")==0){ xis=(com.sun.star.io.XInputStream)AnyConverter.toObject(new Type(com.sun.star.io.XInputStream.class), pValue[i].Value); } @@ -243,11 +229,9 @@ public class XMergeBridge { } catch (IOException e){ - //System.out.println("XMergeBridge IO Exception "+e.getMessage()); return false; } catch (Exception e){ - //System.out.println("XMergeBridge Exception "+e+" "+e.getMessage()); return false; } return true; @@ -256,16 +240,6 @@ public class XMergeBridge { public boolean exporter(com.sun.star.beans.PropertyValue[] aSourceData, java.lang.String[] msUserData) throws com.sun.star.uno.RuntimeException{ - /* - System.out.println("\nFound the Exporter!\n"); - - System.out.println("\n"+msUserData[0]); - System.out.println("\n"+msUserData[1]); - System.out.println("\n"+msUserData[2]); - System.out.println("\n"+msUserData[3]); - System.out.println("\n"+msUserData[4]); - System.out.println("\n"+msUserData[5]); - */ sFileName=null; sURL=null; String sDirectory = null; @@ -281,28 +255,22 @@ public class XMergeBridge { for (int i = 0 ; i < pValue.length; i++) { - //System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value); - try{ - //System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value); if (pValue[i].Name.compareTo("OutputStream")==0){ xos=(com.sun.star.io.XOutputStream)AnyConverter.toObject(new Type(com.sun.star.io.XOutputStream.class), pValue[i].Value); - // System.out.println(pValue[i].Name+" "+xos); } + if (pValue[i].Name.compareTo("FileName")==0){ sFileName=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); - //System.out.println(pValue[i].Name+" "+sFileName); } + if (pValue[i].Name.compareTo("URL")==0){ sURL=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); - // System.out.println("\nMediaDescriptor url "+pValue[i].Name+" "+sURL); - } - if (pValue[i].Name.compareTo("Title")==0){ + if (pValue[i].Name.compareTo("Title")==0){ title=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); - //System.out.println(pValue[i].Name+" "+title); } } catch(com.sun.star.lang.IllegalArgumentException AnyExec){ @@ -379,7 +347,6 @@ public class XMergeBridge { public void startDocument () { - //System.out.println("\nStart Document!"); } public void endDocument()throws com.sun.star.uno.RuntimeException @@ -391,12 +358,10 @@ public class XMergeBridge { } catch (IOException e){ - //System.out.println("Exception "+e); throw new com.sun.star.uno.RuntimeException(e.getMessage()); } catch (Exception e){ - //System.out.println("Exception "+e); throw new com.sun.star.uno.RuntimeException("Xmerge Exception"); } @@ -421,7 +386,7 @@ public class XMergeBridge { } } str=str.concat(">"); - // System.out.println(str); + try{ xOutStream.writeBytes(str.getBytes("UTF-8")); } @@ -534,12 +499,10 @@ public class XMergeBridge { int i=1; while (docEnum.hasMoreElements() && sURL.startsWith("file:")) { - //URI uri=new URI(sFileName); + URI uri=new URI(sURL); String newFileName= getPath(uri); - - //System.out.println("\nURI: "+uri.getPath()); File newFile=null; if (newFileName.lastIndexOf(".")!=-1){ newFile =new File(newFileName.substring(0,newFileName.lastIndexOf("."))+String.valueOf(i)+newFileName.substring(newFileName.lastIndexOf("."))); @@ -583,27 +546,15 @@ public class XMergeBridge { } else { - /* - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - byte[][] buf = new byte[1][4096]; - int n=0; - while ((n=xml.readSomeBytes(buf, 4096))>0) - bout.write(buf[0], 0, n); - ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); - cv.addInputStream(name, bin, false); - */ + cv.addInputStream(name,(InputStream)xis,false); - //System.out.println("\nConverting"); ConvertData dataIn = cv.convert(); - //System.out.println("\nFinished Converting"); Enumeration docEnum = dataIn.getDocumentEnumeration(); while (docEnum.hasMoreElements()) { OfficeDocument docIn = (OfficeDocument)docEnum.nextElement(); docIn.write(newxos,false); } - //newxos.write(-1); //EOF character - //newxos.flush(); newxos.close(); } ConverterInfoMgr.removeByJar(jarName); @@ -631,12 +582,6 @@ public class XMergeBridge { return path; } - - - - - - // Implement methods from interface XTypeProvider public byte[] getImplementationId() { byte[] byteReturn = {}; diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java index 37768fa4fb02..cd872329b596 100644 --- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java +++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java @@ -111,8 +111,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder { Debug.log(Debug.ERROR, "MinicalcDecoder.constructor:" + e.getMessage()); throw new IOException(e.getMessage()); - // e.printStackTrace(); - } } @@ -237,8 +235,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder { Debug.log(Debug.ERROR, "MinicalcDecoder.setWorksheet:" + e.getMessage()); throw new IOException(e.getMessage()); - // e.printStackTrace(); - } } @@ -286,8 +282,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder { Debug.log(Debug.ERROR, "MinicalcDecoder.goToNextCell:" + e.getMessage()); throw new IOException(e.getMessage()); - // e.printStackTrace(); - } return gotCell; diff --git a/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java b/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java index da01306d9545..617f60b1a152 100644 --- a/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java +++ b/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java @@ -25,12 +25,6 @@ * ************************************************************************/ -/* - * SimplePdbCompare.java - * - * Created on September 21, 2001, 10:23 AM - */ - /** * * @author mh101528 @@ -80,13 +74,11 @@ public final class SimplePdbCompare { if (pdb1.equals(pdb2)) { - //writeToLog("PDB " + pdbname1 + " and PDB " + pdbname2 + " are equal"); System.out.println("PDB " + pdbname1 + " and PDB " + pdbname2 + " are equal"); return true; } else { - //writeToLog("PDB " + pdbname1 + " and PDB " + pdbname2 + " are not equal"); System.out.println("PDB " + pdbname1 + " and PDB " + pdbname2 + " are not equal"); return false; } diff --git a/xmerge/source/palmtests/qa/comparator/XmlDiff.properties b/xmerge/source/palmtests/qa/comparator/XmlDiff.properties index 2fdff0953ed6..aa6e67772ef6 100644 --- a/xmerge/source/palmtests/qa/comparator/XmlDiff.properties +++ b/xmerge/source/palmtests/qa/comparator/XmlDiff.properties @@ -1,6 +1,4 @@ # -# $Id: XmlDiff.properties,v 1.2 2005-10-24 16:13:45 hr Exp $ -# # This properties file provides info for XmlDiff program # XmlDiff.file1 is the first input XML file # XmlDiff.file2 is the second input XML file diff --git a/xmerge/source/palmtests/qa/comparator/XmlWrapper.java b/xmerge/source/palmtests/qa/comparator/XmlWrapper.java index 16dddcb0a4f3..9502e61c2933 100644 --- a/xmerge/source/palmtests/qa/comparator/XmlWrapper.java +++ b/xmerge/source/palmtests/qa/comparator/XmlWrapper.java @@ -36,9 +36,7 @@ public class XmlWrapper System.out.println("args.length is " + args.length); if (args.length < 2) { System.out.println("Usage: java XmlWrapper [<zipfile1> <zipfile2>]."); - //return; System.exit(-1); - } XmlWrapper w = new XmlWrapper(); @@ -47,7 +45,6 @@ public class XmlWrapper currdirfp = new File("."); } catch (Exception fx) { System.out.println("Could not get File instance for current directory \n"); - //return; System.exit(-1); } @@ -60,7 +57,6 @@ public class XmlWrapper } catch (Exception tx) { System.out.println("Could not create TempFile "); System.out.println("Exception: " + tx.toString()); - //return; System.exit(-1); } @@ -76,14 +72,12 @@ public class XmlWrapper System.out.println("Exception: file is not a ZIP file: " + args[0]); f1.delete(); f2.delete(); - //return; System.exit(-1); } catch (Exception e) { System.out.println("Exception: Could not extract XML from " + args[0]); System.out.println("Exception: " + e.toString()); f1.delete(); f2.delete(); - //return; System.exit(-1); } @@ -96,7 +90,6 @@ public class XmlWrapper System.out.println("Exception: file is not a ZIP file: " + args[0]); f1.delete(); f2.delete(); - //return; System.exit(-1); } catch (Exception ex) { System.out.println(ex.getMessage()); @@ -104,7 +97,6 @@ public class XmlWrapper System.out.println("Exception: " + ex.toString()); f1.delete(); f2.delete(); - //return; System.exit(-1); } @@ -126,7 +118,6 @@ public class XmlWrapper System.out.println("Exception: " + ex.toString()); f1.delete(); f2.delete(); - //return; System.exit(-1); } diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java index fe61eb3c5ee8..28c7b627cf59 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java @@ -57,7 +57,6 @@ public class BeginningOfFile implements BIFFRecord { setSubStreamWBGlobal(); else setSubStreamWorkSheet(); - // this.subStream = EndianConverter.writeShort(dt); } public BeginningOfFile(InputStream is) throws IOException { @@ -73,12 +72,10 @@ public class BeginningOfFile implements BIFFRecord { } private void setSubStreamWBGlobal() { - // subStream = new byte[] {0x05}; subStream = EndianConverter.writeShort((short) 0x05); } private void setSubStreamWorkSheet() { - // subStream = new byte[] {0x10}; subStream = EndianConverter.writeShort((short) 0x10); } diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java index 91186fa27c3c..9211bfb8e2bf 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java @@ -79,7 +79,6 @@ public class CodePage implements BIFFRecord { int numOfBytesRead = input.read(codepage); numOfBytesRead += input.read(unknown1); numOfBytesRead += input.read(unknown2); - // numOfBytesRead += input.read(unknown3); unknown3 = (byte) input.read(); numOfBytesRead++; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java index 2e060ca0a148..ff1facbcc279 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java @@ -154,7 +154,6 @@ public class FormulaCompiler { bPop = false; } else { tmpTok = (Token)evalStack.pop(); - //if (!(isOpenBrace(tmpTok) || isParamDelimiter(tmpTok))) { //Don't output brackets and commas if (!isParamDelimiter(tmpTok)) { //Don't output commas rpnExpr.add(tmpTok); } diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java index 29098b72cc17..91c0074f4698 100644 --- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java +++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java @@ -551,15 +551,5 @@ implements DOCConstants, OfficeConstants, DocumentDeserializer { Debug.log(Debug.TRACE, str); } - - - /* - public static void main(String args[]) { - - // DocumentDeserializerImpl d = new DocumentDeserializerImpl(new InputStream()); - - Node nodes[] = parseText("Tab here:\tThen some more text"); - } -*/ } diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java index 36b21e21b931..bbd105a2097f 100644 --- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java +++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java @@ -261,30 +261,13 @@ class WsePara extends Wse { temp = firstIndent / 1.6; values[2] = (new Double(temp)).toString() + "mm"; -/* if ((lineSpace & LS_MULTIPLE) != 0) { - temp = (lineSpace & LS_VALUEMASK) / 2; - temp *= 100; - values[3] = (new Double(temp)).toString() + "%"; - } else { - values[3] = (new Double(temp)).toString() + "mm"; - // DJP: handle other cases - } -*/ temp = spaceBefore / 1.6; -// values[4] = (new Double(temp)).toString() + "mm"; values[3] = (new Double(temp)).toString() + "mm"; temp = spaceAfter / 1.6; -// values[5] = (new Double(temp)).toString() + "mm"; values[4] = (new Double(temp)).toString() + "mm"; switch (misc) { - -// case ALIGN_RIGHT: values[6] = "right"; break; -// case ALIGN_LEFT: values[6] = "left"; break; -// case ALIGN_CENTER:values[6] = "center"; break; -// case ALIGN_JUST: values[6] = "justified"; break; - case ALIGN_RIGHT: values[5] = "right"; break; case ALIGN_LEFT: values[5] = "left"; break; case ALIGN_CENTER:values[5] = "center"; break; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java index e14ce25999db..9ba4aca7cf41 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java @@ -202,7 +202,6 @@ public class DOMDocument builder = factory.newDocumentBuilder(); } catch (ParserConfigurationException ex) { System.out.println("Error:"+ ex); - //throw new OfficeDocumentException(ex); } try { @@ -211,7 +210,6 @@ public class DOMDocument } catch (SAXException ex) { System.out.println("Error:"+ ex); - //throw new OfficeDocumentException(ex); } } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java index d3372be5a757..a6be6c044852 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java @@ -531,13 +531,9 @@ public abstract class OfficeDocument } else{ try{ - //System.out.println("\nParsing Input stream, validating?: "+builder.isValidating()); - //contentDoc= builder.parse((InputStream)is); - Reader r = secondHack(is); InputSource ins = new InputSource(r); org.w3c.dom.Document newDoc = builder.parse(ins); - //org.w3c.dom.Document newDoc = builder.parse((InputStream)is); Element rootElement=newDoc.getDocumentElement(); NodeList nodeList; @@ -829,13 +825,11 @@ public abstract class OfficeDocument } byte contentBytes[] = docToBytes(newDoc); - //System.out.println(new String(contentBytes)); os.write(contentBytes); } catch(Exception exc){ System.out.println("\nException in OfficeDocument.write():" +exc); } - //byte contentBytes[] = docToBytes(contentDoc); } } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index e68327792374..1fc12df46fb8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -532,8 +532,6 @@ public class ParaStyle extends Style implements Cloneable { for (int i = 0; i < NR_PROPERTIES; i++) { if (ps.isSet[i]) { - // if (!isSet[i]) return false; - if (i < NR_PROPERTIES - 1) { // Compare the actual values. We allow a margin of error // here because the conversion loses precision. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java index c783d366a68b..4548d672bb9f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java @@ -289,7 +289,6 @@ public class StyleCatalog { styleNode.setAttribute("style:family", s.getFamily()); Element propertiesNode = (Element) s.createNode(parentDoc, "style:properties"); - // if (propertiesNode.getFirstChild() != null) // DJP: only add node if has children OR attributes if (propertiesNode != null) styleNode.appendChild(propertiesNode); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java index b0cfc09893bc..faa9dc7c7352 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java @@ -651,10 +651,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, } } - - // for (int j = 0; j < colsRepeated; j++) { - - if (tableValueTypeNode != null) { // Make sure we initialize to 0 the width of the current cell @@ -858,7 +854,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, } String s = buffer.toString(); - // displayWidth = calculateContentWidth(s); addCell(s); } @@ -960,8 +955,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, String s = child.getNodeValue(); - // displayWidth = calculateContentWidth(s); - int k = s.lastIndexOf("."); if (k > 0) { s = s.substring(k+1); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java index fefd0bdf7261..55a804cbe33f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java @@ -41,7 +41,6 @@ import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConvertException; import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.converter.dom.DOMDocument; -//import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.registry.ConverterInfo; @@ -50,7 +49,6 @@ import org.openoffice.xmerge.util.registry.ConverterInfo; import javax.xml.transform.TransformerFactory; import javax.xml.transform.Transformer; 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.stream.StreamResult; @@ -58,12 +56,6 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.transform.URIResolver; import javax.xml.transform.Source; - -// -//import org.apache.xalan.serialize.Serializer; -//import org.apache.xalan.serialize.SerializerFactory; -//import org.apache.xalan.templates.OutputProperties; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -150,14 +142,12 @@ public final class DocumentDeserializerImpl public Source resolve(String href,String base) throws TransformerException{ - //System.out.println("\nhref "+href+"\nbase "+base); if (href !=null){ if(href.equals("javax.xml.transform.dom.DOMSource")|| href.equals("")) return null; try{ ConverterInfo ci = pluginFactory.getConverterInfo(); String newhRef ="jar:"+ci.getJarName()+"!/"+href; - //System.out.println("\n Looking For "+ newhRef); StreamSource sheetFile= new StreamSource(newhRef); return sheetFile; } @@ -215,13 +205,6 @@ public final class DocumentDeserializerImpl tFactory.setURIResolver(this); Transformer transformer = tFactory.newTransformer(xslDomSource); transformer.transform(xmlDomSource,new StreamResult(baos)); - /* - // Serialize for output to standard out - Serializer serializer = SerializerFactory.getSerializer - (OutputProperties.getDefaultMethodProperties("xml")); - serializer.setOutputStream(System.out); - serializer.asDOMSerializer().serialize(xmlDomResult.getNode()); - */ log("\n** Transform Complete ***"); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java index 4fb0a0e68813..3dc8434b2508 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java @@ -197,14 +197,12 @@ public final class DocumentSerializerImpl public Source resolve(String href,String base) throws TransformerException{ - //System.out.println("\nhref "+href+"\nbase "+base); if (href !=null){ if(href.equals("javax.xml.transform.dom.DOMSource")|| href.equals("")) return null; try{ ConverterInfo ci = pluginFactory.getConverterInfo(); String newhRef ="jar:"+ci.getJarName()+"!/"+href; - //System.out.println("\n Looking For "+ newhRef); StreamSource sheetFile= new StreamSource(newhRef); return sheetFile; } @@ -235,9 +233,7 @@ public final class DocumentSerializerImpl private ByteArrayOutputStream transform(org.w3c.dom.Document domDoc) throws TransformerException,TransformerConfigurationException , FileNotFoundException,IOException{ - //System.out.println("\nTransforming..."); ConverterInfo ci = pluginFactory.getConverterInfo(); - //DOMResult xmlDomResult = new DOMResult(); ByteArrayOutputStream baos= new ByteArrayOutputStream(); try{ @@ -256,7 +252,6 @@ public final class DocumentSerializerImpl } else{ - //System.out.println(ci.getJarName()+"!/"+ci.getXsltSerial()); xslDoc = dBuilder.parse( "jar:"+ci.getJarName()+"!/"+ci.getXsltSerial()); } @@ -270,21 +265,6 @@ public final class DocumentSerializerImpl Transformer transformer = tFactory.newTransformer(xslDomSource); transformer.transform(xmlDomSource, new StreamResult(baos)); - - /* - transformer.transform(xmlDomSource, xmlDomResult); //Removed this impl because the DocType was not being written out - - // Serialize for output to standard out - Serializer serializer = SerializerFactory.getSerializer - (OutputProperties.getDefaultMethodProperties("xml")); - //serializer.setOutputStream(System.out); - serializer.setOutputStream(baos); - serializer.asDOMSerializer().serialize(xmlDomResult.getNode()); - //serializer.asDOMSerializer().serialize(xmlDomSource.getNode()); - - - //System.out.println("\n** Transform Complete ***"); - */ } catch(Exception e){ System.out.println("An error occurred in the transformation : "+e); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java index 36872751e999..80ddaa1909dc 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java @@ -35,8 +35,6 @@ import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.DocumentDeserializerFactory; import org.openoffice.xmerge.PluginFactory; import org.openoffice.xmerge.converter.dom.DOMDocument; -//import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; -//import org.openoffice.xmerge.converter.xml.OfficeDocument; import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument; import org.openoffice.xmerge.util.registry.ConverterInfo; import org.openoffice.xmerge.DocumentMerger; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java index 9026303ca3d3..f721fce62258 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java @@ -63,16 +63,10 @@ public class CharArrayLCSAlgorithm { // in those 2 sequences diffTable = createDiffTable(orgSeq, modSeq); - // debug purpose... - // printDiffTable(diffTable); - Vector diffResult = new Vector(); generateResult(diffTable, orgSeqlen, modSeqlen, diffResult); - // don't need anymore if Difference do not contain content information - /* fillInDiffContent(diffResult, orgSeq, modSeq); */ - Difference[] diffArray = new Difference[0]; // convert the vector to array, it has to do in here as diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java index 238fd59f9608..b254e6873edd 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java @@ -232,9 +232,6 @@ public class ConverterInfoReader { desc, version, vendor,classImpl, xsltSerial,xsltDeserial); } - /*ConverterInfo converterInfo = new ConverterInfo(jarfilename, - officeMime, deviceMime, name, desc, version, vendor, - classImpl);*/ converterInfoList.add(converterInfo); } |