From f6739073edc1b593035f25becbd0e9d6d536ef0c Mon Sep 17 00:00:00 2001 From: Jose Guilherme Vanz Date: Mon, 8 Oct 2012 21:22:03 -0300 Subject: Remove commented code and empty methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch removes commented code and some empty private methods Change-Id: I4a79e521399a07873030f021a97c01cf8d2e81d7 Signed-off-by: José Guilherme Vanz Reviewed-on: https://gerrit.libreoffice.org/844 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- reportbuilder/java/com/sun/star/report/SDBCReportData.java | 11 ----------- reportbuilder/java/com/sun/star/report/SOImageService.java | 1 - .../java/com/sun/star/report/pentaho/SOFormulaParser.java | 5 ----- .../report/pentaho/layoutprocessor/FormatValueUtility.java | 1 - .../layoutprocessor/FormattedTextLayoutController.java | 1 - .../pentaho/layoutprocessor/ImageElementLayoutController.java | 5 ----- 6 files changed, 24 deletions(-) (limited to 'reportbuilder') diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java index 0faf94c69e2f..7f8fae13a16f 100644 --- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java +++ b/reportbuilder/java/com/sun/star/report/SDBCReportData.java @@ -179,17 +179,6 @@ public class SDBCReportData implements DataSource { } -// public int getCurrentRow() throws DataSourceException -// { -// try -// { -// return rowSet.getRow(); -// } -// catch (SQLException e) -// { -// throw new DataSourceException(e.getMessage(), e); -// } -// } static private java.sql.Date getDate(final Object obj) { final java.sql.Date date; diff --git a/reportbuilder/java/com/sun/star/report/SOImageService.java b/reportbuilder/java/com/sun/star/report/SOImageService.java index e9c073984ba1..78f4e45e5ebe 100644 --- a/reportbuilder/java/com/sun/star/report/SOImageService.java +++ b/reportbuilder/java/com/sun/star/report/SOImageService.java @@ -81,7 +81,6 @@ public class SOImageService implements ImageService { new PropertyValue() }; - // value[0] = new PropertyValue(); value[0].Name = "InputStream"; value[0].Value = image; diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java index de35978d8573..a9b236d6fe10 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java @@ -309,11 +309,6 @@ public final class SOFormulaParser extends ComponentBase public void setOpCodeMap(com.sun.star.sheet.FormulaOpCodeMapEntry[] the_value) { -// m_prophlp.prepareSet("OpCodeMap", null); -// synchronized (this) -// { -// m_OpCodeMap.clear(); -// } } public String getImplementationName() diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java index 3936079c32a6..ad653a70ead0 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java @@ -179,7 +179,6 @@ public class FormatValueUtility if (!"string".equals(valueType)) { variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "string"); - //variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, String.valueOf(value)); } variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, STRING_VALUE, String.valueOf(value)); } diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java index 1607b696aad9..3362b266b410 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java @@ -111,7 +111,6 @@ public class FormattedTextLayoutController variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.TEXT_NS); variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, "name", name); - //variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, "display", "value"); final String dataStyleName = computeValueStyle(); if (dataStyleName != null) diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java index 1b6f8e4b8f18..0b4ffb3b33ae 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java @@ -198,11 +198,6 @@ public class ImageElementLayoutController continue; } final Element child = (Element) node; - /* - if (! OfficeToken.COVERED_TABLE_CELL.equals(child.getType()) && - (ObjectUtilities.equal(child.getNamespace(), namespace) == false || - ObjectUtilities.equal(child.getType(), type) == false)) - */ if (!ObjectUtilities.equal(child.getNamespace(), namespace) || (!ObjectUtilities.equal(child.getType(), type) && (secondType == null || !ObjectUtilities.equal(child.getType(), secondType)))) { continue; -- cgit