diff options
| -rw-r--r-- | reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java | 10 | ||||
| -rw-r--r-- | reportbuilder/prj/build.lst | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java index ec20fc0..0aaded5 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java @@ -734,8 +734,11 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget final AttributeList attrList = buildAttributeList(attrs); xmlWriter.writeTag(namespace, elementType, attrList, XmlWriterSupport.OPEN); - if (ReportTargetUtil.isElementOfType(OfficeNamespaces.TEXT_NS, OfficeToken.P, attrs) && - tableLayoutConfig != TABLE_LAYOUT_VARIABLES_PARAGRAPH && variables != null) + if ( tableLayoutConfig != TABLE_LAYOUT_VARIABLES_PARAGRAPH + && variables != null + && !isRepeatingSection() + && ReportTargetUtil.isElementOfType(OfficeNamespaces.TEXT_NS, OfficeToken.P, attrs) + ) { //LOGGER.debug("Variables-Section in existing cell " + variables); xmlWriter.writeText(variables); @@ -1374,7 +1377,8 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget final XmlWriter xmlWriter = getXmlWriter(); if (tableLayoutConfig != TABLE_LAYOUT_VARIABLES_PARAGRAPH && - isTableNs && ObjectUtilities.equal(OfficeToken.TABLE_CELL, elementType)) + isTableNs && ObjectUtilities.equal(OfficeToken.TABLE_CELL, elementType) && + !isRepeatingSection() ) { if (variables != null) { diff --git a/reportbuilder/prj/build.lst b/reportbuilder/prj/build.lst index b09d054..8545295 100644 --- a/reportbuilder/prj/build.lst +++ b/reportbuilder/prj/build.lst @@ -12,5 +12,5 @@ rpb reportbuilder\registry\data\org\openoffice\Office nmake rpb reportbuilder\registry\data\org\openoffice\Office\UI nmake - all rpb_reg_data_ooo_ui rpb_reg_schema_ooo_ui NULL rpb reportbuilder\registry\data\org\openoffice\TypeDetection nmake - all rpb_reg_data_oot NULL rpb reportbuilder\template\en-US\wizard\report nmake - all rpb_template_en_us_wiz_rep NULL -rpb reportbuilder\util nmake - all rpb_util rpb_jreport_pe rpb_reg_data_ooo rpb_data_ooOffice rpb_reg_data_oot rpb_template_en_us_wiz_rep NULL +rpb reportbuilder\util nmake - all rpb_util rpb_jreport_pe rpb_reg_data_ooo rpb_data_ooOffice rpb_reg_data_oot rpb_template_en_us_wiz_rep rpb_reg_data_ooo_ui NULL |