Kaydet (Commit) bc1b0fca authored tarafından Alexander Wilms's avatar Alexander Wilms Kaydeden (comit) Caolán McNamara

Remove visual noise from reportbuilder

Change-Id: I4063ea1ea95ddd1a3c220ca0da89cdcd78f62410
Reviewed-on: https://gerrit.libreoffice.org/8294Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 613d5363
...@@ -219,7 +219,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget ...@@ -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. // All styles have to be processed or you will loose the paragraph-styles and inline text-styles.
// ..
performStyleProcessing(attrs); performStyleProcessing(attrs);
final AttributeList attrList = buildAttributeList(attrs); final AttributeList attrList = buildAttributeList(attrs);
...@@ -227,7 +227,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget ...@@ -227,7 +227,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
xmlWriter.writeTag(namespace, elementType, attrList, XmlWriter.OPEN); xmlWriter.writeTag(namespace, elementType, attrList, XmlWriter.OPEN);
++closeTags; ++closeTags;
} }
// /////////////////////////////////////////////////////////////////////////
public void processText(final String text) throws DataSourceException, ReportProcessingException public void processText(final String text) throws DataSourceException, ReportProcessingException
{ {
......
...@@ -455,7 +455,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget ...@@ -455,7 +455,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
// // System.out.print(cbs[i].getBoundary() + " "); // // System.out.print(cbs[i].getBoundary() + " ");
// // } // // }
// // System.out.println(); // // System.out.println();
//
// LOGGER.error("A cell cannot span less than the declared columns: Declared=" + initialColumnSpan + " Computed=" // LOGGER.error("A cell cannot span less than the declared columns: Declared=" + initialColumnSpan + " Computed="
// + span); // + span);
// } // }
...@@ -471,7 +471,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget ...@@ -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. // All styles have to be processed or you will loose the paragraph-styles and inline text-styles.
// ..
performStyleProcessing(attrs); performStyleProcessing(attrs);
final AttributeList attrList = buildAttributeList(attrs); final AttributeList attrList = buildAttributeList(attrs);
...@@ -557,7 +557,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget ...@@ -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 // at this point we need to generate the table-columns section based on our boundary table
// <table:shapes> // <table:shapes>
// <draw:frame /> // <draw:frame />
// ..
// </table:shapes> // </table:shapes>
xmlWriter.writeTag(OfficeNamespaces.TABLE_NS, OfficeToken.SHAPES, null, XmlWriterSupport.OPEN); xmlWriter.writeTag(OfficeNamespaces.TABLE_NS, OfficeToken.SHAPES, null, XmlWriterSupport.OPEN);
...@@ -589,7 +589,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget ...@@ -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 // at this point we need to generate the table-columns section based on our boundary table
// <table-columns> // <table-columns>
// <table-column style-name="coX"/> // <table-column style-name="coX"/>
// ..
// </table-columns> // </table-columns>
// the first boundary is '0' which is a placeholder so we will ignore it // 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); xmlWriter.writeTag(OfficeNamespaces.TABLE_NS, OfficeToken.TABLE_COLUMNS, null, XmlWriterSupport.OPEN);
...@@ -710,7 +710,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget ...@@ -710,7 +710,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
return "raw/" + PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET; return "raw/" + PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET;
} }
// /////////////////////////////////////////////////////////////////////////
public void processText(final String text) throws DataSourceException, ReportProcessingException public void processText(final String text) throws DataSourceException, ReportProcessingException
{ {
if (!(isRepeatingSection() || isElementBoundaryCollectionPass())) if (!(isRepeatingSection() || isElementBoundaryCollectionPass()))
......
...@@ -724,17 +724,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget ...@@ -724,17 +724,6 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
// LOGGER.debug("Adding row-Style: " + rowStyle + " " + rowHeight); // LOGGER.debug("Adding row-Style: " + rowStyle + " " + rowHeight);
sectionHeight.add(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 // process the styles as usual
performStyleProcessing(attrs); performStyleProcessing(attrs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment