summaryrefslogtreecommitdiff
path: root/reportbuilder
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-10-26 17:41:29 +0100
committerMathias Bauer <mba@openoffice.org>2009-10-26 17:41:29 +0100
commit6d5a4bb1a26438149617c7bb8362b7b32b6abb2d (patch)
tree941c281166150c4c1744da3db4f80af62fda5cad /reportbuilder
parentd381760a0bdbc403426db365fcdd79c48805a1f9 (diff)
parent941f5abef98246d699d22ba4847c90690631be10 (diff)
merge commit for m62
Diffstat (limited to 'reportbuilder')
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java10
-rw-r--r--reportbuilder/prj/build.lst2
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 6ce89c5c0324..cdbb36abc337 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 b09d0541b7e7..854529595c65 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