[Libreoffice-commits] core.git: reportbuilder/java
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 07:17:37 PST 2014
reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java | 4 +--
reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java | 10 ++++-----
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java | 11 ----------
3 files changed, 7 insertions(+), 18 deletions(-)
New commits:
commit bc1b0fca47dff0b6301988b831147ac89a0de375
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 19:48:56 2014 +0100
Remove visual noise from reportbuilder
Change-Id: I4063ea1ea95ddd1a3c220ca0da89cdcd78f62410
Reviewed-on: https://gerrit.libreoffice.org/8294
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
index 7b0a281..f8ad55f 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -219,7 +219,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
}
// All styles have to be processed or you will loose the paragraph-styles and inline text-styles.
- // ..
+
performStyleProcessing(attrs);
final AttributeList attrList = buildAttributeList(attrs);
@@ -227,7 +227,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
xmlWriter.writeTag(namespace, elementType, attrList, XmlWriter.OPEN);
++closeTags;
}
- // /////////////////////////////////////////////////////////////////////////
+
public void processText(final String text) throws DataSourceException, ReportProcessingException
{
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 d8f7cd8..a6bf1e8 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -455,7 +455,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
// // System.out.print(cbs[i].getBoundary() + " ");
// // }
// // System.out.println();
- //
+
// LOGGER.error("A cell cannot span less than the declared columns: Declared=" + initialColumnSpan + " Computed="
// + span);
// }
@@ -471,7 +471,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
}
// All styles have to be processed or you will loose the paragraph-styles and inline text-styles.
- // ..
+
performStyleProcessing(attrs);
final AttributeList attrList = buildAttributeList(attrs);
@@ -557,7 +557,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
// at this point we need to generate the table-columns section based on our boundary table
// <table:shapes>
// <draw:frame />
- // ..
+
// </table:shapes>
xmlWriter.writeTag(OfficeNamespaces.TABLE_NS, OfficeToken.SHAPES, null, XmlWriterSupport.OPEN);
@@ -589,7 +589,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
// at this point we need to generate the table-columns section based on our boundary table
// <table-columns>
// <table-column style-name="coX"/>
- // ..
+
// </table-columns>
// the first boundary is '0' which is a placeholder so we will ignore it
xmlWriter.writeTag(OfficeNamespaces.TABLE_NS, OfficeToken.TABLE_COLUMNS, null, XmlWriterSupport.OPEN);
@@ -710,7 +710,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
return "raw/" + PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET;
}
- // /////////////////////////////////////////////////////////////////////////
+
public void processText(final String text) throws DataSourceException, ReportProcessingException
{
if (!(isRepeatingSection() || isElementBoundaryCollectionPass()))
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
index f34b54e..b24b2cf 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
@@ -724,17 +724,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
// LOGGER.debug("Adding row-Style: " + rowStyle + " " + rowHeight);
sectionHeight.add(rowHeight);
-// if (expectedTableRowCount > 0)
-// {
-// // Some other row. Create a keep-together
-//
-// }
-// else
-// {
-// // This is the last row before the section will end.
-// // or (in some weird cases) There is no information when the row will end.
-// // Anyway, if we are here, we do not create a keep-together style on the table-row ..
-// }
// process the styles as usual
performStyleProcessing(attrs);
More information about the Libreoffice-commits
mailing list