diff --git a/source/java/org/openoffice/da/comp/w2lcommon/helper/FilePicker.java b/source/java/org/openoffice/da/comp/w2lcommon/helper/FilePicker.java index 42fd0c3..737f6e5 100644 --- a/source/java/org/openoffice/da/comp/w2lcommon/helper/FilePicker.java +++ b/source/java/org/openoffice/da/comp/w2lcommon/helper/FilePicker.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2011 by Henrik Just + * Copyright: 2002-2014 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2010-06-11) + * Version 1.4 (2014-09-24) * */ @@ -109,7 +109,6 @@ public class FilePicker { sPaths = new String[nCount-1]; for (int i=1; i could be a LaTeX document - System.out.println("** Found "+token.toString()); + //System.out.println("** Found "+token.toString()); mouth.getToken(); skipSpaces(); // Skip options, if any @@ -99,12 +99,12 @@ public class DeTeXtive { if (token.getType()==TokenType.BEGIN_GROUP) { // Get class name String sClassName = parseArgumentAsString(); - System.out.println("** Found the class name "+sClassName); + //System.out.println("** Found the class name "+sClassName); // Accept any class name of one or more characters if (sClassName.length()>0) { return true; } } } - System.out.println("** Doesn't look like LaTeX; failed to get class name"); + //System.out.println("** Doesn't look like LaTeX; failed to get class name"); return false; } @@ -122,7 +122,7 @@ public class DeTeXtive { skipSpaces(); } String sName = parseArgumentAsString(); - System.out.println("** Found package "+sName); + //System.out.println("** Found package "+sName); packages.add(sName); } else if (token.getType()==TokenType.BEGIN_GROUP) { @@ -134,7 +134,7 @@ public class DeTeXtive { mouth.getToken(); skipSpaces(); if ("document".equals(parseArgumentAsString())) { - System.out.println("Found \\begin{document}"); + //System.out.println("Found \\begin{document}"); return true; } } @@ -143,7 +143,7 @@ public class DeTeXtive { mouth.getToken(); } } - System.out.println("** Doesn't look like LaTeX; failed to find \\begin{document}"); + //System.out.println("** Doesn't look like LaTeX; failed to find \\begin{document}"); return false; } diff --git a/source/java/org/openoffice/da/comp/writer4latex/StreamGobbler.java b/source/java/org/openoffice/da/comp/writer4latex/StreamGobbler.java index 3a1367a..d4fa444 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/StreamGobbler.java +++ b/source/java/org/openoffice/da/comp/writer4latex/StreamGobbler.java @@ -45,7 +45,6 @@ class StreamGobbler extends Thread { //while ( (line = br.readLine()) != null) { while ( br.readLine() != null) { // Do nothing... - //System.out.println(type + ">" + line); } } catch (IOException ioe) { diff --git a/source/java/org/openoffice/da/comp/writer4latex/TeXDetectService.java b/source/java/org/openoffice/da/comp/writer4latex/TeXDetectService.java index 2c98120..291e40a 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/TeXDetectService.java +++ b/source/java/org/openoffice/da/comp/writer4latex/TeXDetectService.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2014 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-06-19) + * Version 1.4 (2014-09-24) * */ @@ -113,11 +113,9 @@ private final XComponentContext m_xContext; // If there's no URL, we cannot verify the type (this should never happen on proper use of the service) if (sURL==null) { - System.out.println("No URL given!"); return ""; } - System.out.println("Asked to verify the type "+sTypeName); // Also, we can only verify LaTeX and XeLaTeX if (sTypeName==null || !(sTypeName.equals(LATEX_FILE) || sTypeName.equals(XELATEX_FILE))) { return ""; @@ -132,7 +130,6 @@ private final XComponentContext m_xContext; } catch (com.sun.star.uno.Exception e) { // failed to get SimpleFileAccess service (should not happen) - System.out.println("Failed to get SFA service"); return ""; } @@ -144,12 +141,10 @@ private final XComponentContext m_xContext; } catch (com.sun.star.ucb.CommandAbortedException e) { // Failed to create input stream, cannot verify the type - System.out.println("Failed to get input stream"); return ""; } catch (com.sun.star.uno.Exception e) { // Failed to create input stream, cannot verify the type - System.out.println("Failed to get input stream"); return ""; } @@ -157,7 +152,6 @@ private final XComponentContext m_xContext; DeTeXtive deTeXtive = new DeTeXtive(); try { String sType = deTeXtive.deTeXt(is); - System.out.println("The DeTeXtive returned the type "+sType); if ("LaTeX".equals(sType)) { return LATEX_FILE; } @@ -170,7 +164,6 @@ private final XComponentContext m_xContext; } catch (IOException e) { // Failed to read the stream, cannot verify the type - System.out.println("Failed to read the input stream"); return ""; } diff --git a/source/java/org/openoffice/da/comp/writer4latex/TeXImportFilter.java b/source/java/org/openoffice/da/comp/writer4latex/TeXImportFilter.java index 2dfaa38..cba2e46 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/TeXImportFilter.java +++ b/source/java/org/openoffice/da/comp/writer4latex/TeXImportFilter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2010 by Henrik Just + * Copyright: 2002-2014 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2011-01-25) + * Version 1.4 (2014-09-24) * */ @@ -289,8 +289,6 @@ public class TeXImportFilter extends WeakBase implements XInitialization, XNamed sCommand = "ooxelatex"; } - System.out.println("Executing tex4ht with command "+sCommand+" on file "+file.getName()); - externalApps.execute(ExternalApps.MK4HT, sCommand, file.getName(), file.getParentFile(), null, true); if (xStatus!=null) { nStep+=5; xStatus.setValue(nStep); } diff --git a/source/java/writer2latex/Application.java b/source/java/writer2latex/Application.java index 525747b..dbf3b1a 100644 --- a/source/java/writer2latex/Application.java +++ b/source/java/writer2latex/Application.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-08-13) + * Version 1.4 (2014-08-25) * */ @@ -87,11 +87,11 @@ public final class Application { */ public static final void main (String[] args){ try { - long time = System.currentTimeMillis(); + //long time = System.currentTimeMillis(); Application app = new Application(); app.parseCommandLine(args); app.doConversion(); - System.out.println("Total conversion time was "+(System.currentTimeMillis()-time)+" miliseconds"); + //System.out.println("Total conversion time was "+(System.currentTimeMillis()-time)+" miliseconds"); } catch (IllegalArgumentException ex) { String msg = ex.getMessage(); showUsage(msg); diff --git a/source/java/writer2latex/epub/EPUBConverter.java b/source/java/writer2latex/epub/EPUBConverter.java index a3f4950..e9a1a31 100644 --- a/source/java/writer2latex/epub/EPUBConverter.java +++ b/source/java/writer2latex/epub/EPUBConverter.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * version 1.4 (2014-09-06) + * version 1.4 (2014-09-24) * */ @@ -41,7 +41,6 @@ public final class EPUBConverter extends Xhtml11Converter { // Constructor public EPUBConverter() { super(); - System.out.println("Creating epub converter"); } @Override public ConverterResult convert(InputStream is, String sTargetFileName) throws IOException { diff --git a/source/java/writer2latex/latex/DrawConverter.java b/source/java/writer2latex/latex/DrawConverter.java index ec7c153..99b529d 100644 --- a/source/java/writer2latex/latex/DrawConverter.java +++ b/source/java/writer2latex/latex/DrawConverter.java @@ -166,7 +166,6 @@ public class DrawConverter extends ConverterHelper { } } else { // unsupported object - //System.out.println("Unsupported "+sHref); boolean bIgnore = true; if (ofr.isOpenDocument()) { // look for replacement image Element replacementImage = Misc.getChildByTagName(getFrame(node),XMLString.DRAW_IMAGE); diff --git a/source/java/writer2latex/latex/i18n/ReplacementTrieNode.java b/source/java/writer2latex/latex/i18n/ReplacementTrieNode.java index 695bcf1..bd5f127 100644 --- a/source/java/writer2latex/latex/i18n/ReplacementTrieNode.java +++ b/source/java/writer2latex/latex/i18n/ReplacementTrieNode.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2014 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-09-20) + * Version 1.4 (2014-09-24) * */ @@ -122,7 +122,6 @@ public class ReplacementTrieNode { while (child!=null) { if (child.getLaTeXCode()!=null) { strings.add(sPrefix+child.getLetter()); - System.out.println("Found "+sPrefix+child.getLetter()); } child.collectStrings(strings, sPrefix+child.getLetter()); child = child.getNextSibling(); diff --git a/source/java/writer2latex/util/SimpleXMLParser.java b/source/java/writer2latex/util/SimpleXMLParser.java index 69bfdf8..36018f0 100644 --- a/source/java/writer2latex/util/SimpleXMLParser.java +++ b/source/java/writer2latex/util/SimpleXMLParser.java @@ -78,7 +78,6 @@ public class SimpleXMLParser extends DefaultHandler { // We don't need - and in fact should avoid - any external entities @Override public InputSource resolveEntity(String publicID, String systemID) throws SAXException { - //System.out.println("resolveEntity "+publicID+" "+systemID); return new InputSource(new StringReader("")); } diff --git a/source/java/writer2latex/xhtml/DrawConverter.java b/source/java/writer2latex/xhtml/DrawConverter.java index 8773d0e..ae7dd19 100644 --- a/source/java/writer2latex/xhtml/DrawConverter.java +++ b/source/java/writer2latex/xhtml/DrawConverter.java @@ -507,16 +507,11 @@ public class DrawConverter extends ConverterHelper { // Store in cache in case we need to recycle svgImages.put(bgd.getFileName(), imageElement); } - else { - System.out.println("Failed to parse SVG"); - } + // Else fail silently } catch (IOException e) { // Will not happen with a byte array - System.out.println("IOException parsing SVG"); - e.printStackTrace(); } catch (SAXException e) { - e.printStackTrace(); - System.out.println("SAXException parsing SVG"); + // Fail silently } } }