From 0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 5 Aug 2014 09:54:58 +0200 Subject: java: remove commented out code Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36 --- .../org/libreoffice/report/SDBCReportDataFactory.java | 1 - .../libreoffice/report/pentaho/model/OfficeStyle.java | 4 ---- .../pentaho/output/OfficeDocumentReportTarget.java | 8 -------- .../report/pentaho/output/StyleUtilities.java | 13 ------------- .../output/spreadsheet/SpreadsheetRawReportTarget.java | 18 ------------------ .../report/pentaho/parser/rpt/ImageReadHandler.java | 1 - .../pentaho/parser/style/OfficeStyleReadHandler.java | 3 --- .../parser/text/NoCDATATextContentReadHandler.java | 1 - .../report/pentaho/styles/LengthCalculator.java | 1 - 9 files changed, 50 deletions(-) (limited to 'reportbuilder') diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index 4a08c4835939..b7508a038b2a 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -482,7 +482,6 @@ public class SDBCReportDataFactory implements DataSourceFactory final String detail = (String) it.next(); if (!handledColumns.contains(detail)) { - //String master = (String) masterIt.next(); oldFilter.append(quote); oldFilter.append(detail); oldFilter.append(quote); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle.java index c70b9ee30878..cadafa0338a5 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle.java @@ -74,10 +74,6 @@ public class OfficeStyle extends Section setAttribute(OfficeNamespaces.STYLE_NS, "family", family); } -// public String getMasterPageName() -// { -// return (String) getAttribute(OfficeNamespaces.STYLE_NS, "master-page-name"); -// } public Element getParagraphProperties() { return findFirstChild(OfficeNamespaces.STYLE_NS, "paragraph-properties"); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index d1c5b41aa122..41b8458e0c22 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -724,11 +724,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget LOGGER.error("ReportProcessing failed", ioe); throw new ReportProcessingException("Failed to write content", ioe); } -// finally -// { -// LOGGER.debug ("Started " + getNamespaceFromAttribute(attrs) + ":" + -// getElemenTypeFromAttribute(attrs) + " -> " + getCurrentState()); -// } } protected GroupContext getGroupContext() @@ -929,7 +924,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget throws DataSourceException, ReportProcessingException { final AttributeMap attrs = new LazyAttributeMap(roAttrs); - // final int oldState = getCurrentState(); try { @@ -1153,8 +1147,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget new MemoryByteArrayOutputStream(INITIAL_BUFFER_SIZE, 256 * INITIAL_BUFFER_SIZE); final DeflaterOutputStream deflateOut = new DeflaterOutputStream(out); final OutputStreamWriter xmlBuffer = new OutputStreamWriter(deflateOut, "UTF-16"); - // final StringWriter xmlBuffer = new StringWriter - // (OfficeDocumentReportTarget.INITIAL_BUFFER_SIZE); final XmlWriter contentXmlWriter = new XmlWriter(xmlBuffer, createTagDescription()); contentXmlWriter.copyNamespaces(currentWriter); if (indent) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java index da568078afb5..53b51f026ba1 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java @@ -381,19 +381,6 @@ public class StyleUtilities return derivedStyle; } -// final OfficeStyle commonAuto = -// commonCollection.getAutomaticStyles().getStyle(styleFamily, -// styleName); -// if (commonAuto != null) -// { -// // handle an automatic style .. -// final OfficeStyle derivedStyle = -// deriveAutomaticStyle(commonAuto, styleFamily, styleName, -// generator, commonCollection, predefCollection); -// stylesCollection.getAutomaticStyles().addStyle(derivedStyle); -// return derivedStyle; -// } - final OfficeStyle commonCommon = commonCollection.getCommonStyles().getStyle(styleFamily, styleName); if (commonCommon != null) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java index e2434b7aeb6c..09dcb4cbb5dc 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java @@ -252,7 +252,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget collectBoundaryForElement(attrs); } else - // if (!isElementBoundaryCollectionPass()) { try { @@ -425,7 +424,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget if (TRANSPARENT.equals(raw)) { props.setAttribute(OfficeNamespaces.FO_NS, OfficeToken.BACKGROUND_COLOR, null); - // cellStyle.removeNode(props); } } } @@ -446,19 +444,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget columnCounter += initialColumnSpan - 1; } - // if (span < initialColumnSpan) - // { - // // ColumnBoundary cbs[] = getBoundariesForTable(tableCounter); - // // for (int i = 0; i < cbs.length; i++) - // // { - // // System.out.print(cbs[i].getBoundary() + " "); - // // } - // // System.out.println(); - - // LOGGER.error("A cell cannot span less than the declared columns: Declared=" + initialColumnSpan + " Computed=" - // + span); - // } - // there's no point to create number-columns-spanned attributes if we only span 1 column if (span > 1) { @@ -474,7 +459,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget final AttributeList attrList = buildAttributeList(attrs); xmlWriter.writeTag(namespace, elementType, attrList, XmlWriter.OPEN); - // System.out.println("elementType = " + elementType); } private void collectBoundaryForElement(final AttributeMap attrs) @@ -941,8 +925,6 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget { return 1; } - // System.out.println("table = " + table + " col = " + col + " rowBoundaries.length = " + tableBoundaries.length + " - // cellWidth = " + cellWidth + " span = " + span); return span; } diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java index 39f0d82326e6..2f3d9a1cc433 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java @@ -58,7 +58,6 @@ public class ImageReadHandler extends ElementReadHandler { super.startParsing(attrs); final String formula = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "formula"); -// final String preserveIRI = attrs.getValue(OfficeNamespaces.OOREPORT_NS, OfficeToken.PRESERVE_IRI); if (formula != null && formula.length() != 0) { // now, the evaulated content ends up in the 'content' attribute of the diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java index ed6b9ddeaa23..d6689b179531 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java @@ -61,9 +61,6 @@ public class OfficeStyleReadHandler extends ElementReadHandler final Attributes atts) throws SAXException { -// if (OfficeParserUtil.getInstance().isValidStyleElement(uri, tagName)) -// { -// } final StyleDefinitionReadHandler readHandler = new StyleDefinitionReadHandler(); children.add(readHandler); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java index fd05be68a572..dc6464e7a961 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java @@ -122,7 +122,6 @@ public class NoCDATATextContentReadHandler extends ElementReadHandler if ("sub-document".equals(tagName)) { final SubDocumentReadHandler subDocReadHandler = new SubDocumentReadHandler(section); - // children.add(subDocReadHandler); return subDocReadHandler; } } diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/LengthCalculator.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/LengthCalculator.java index d8ade2708f94..da263ee56d6c 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/LengthCalculator.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/LengthCalculator.java @@ -72,7 +72,6 @@ public class LengthCalculator { pixel += value.getValue(); } - // LOGGER.debug ("Adding " + value + " [mm: " + millimeter + "] [pt: " + point + "] px: [" + pixel + "]"); } public CSSNumericValue getResult() -- cgit