diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-12-12 17:32:46 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-12-12 18:04:39 +0100 |
commit | d6ce95ae2288859fe74d601f1bdaf616ab1ee7f0 (patch) | |
tree | ba225ec528552554673bd01536815279209dc409 /reportbuilder | |
parent | 458f22c338f39ad777ad3f34b45a81b4eb8dfe8e (diff) |
fdo#87044: reportbuilder: Revert "fdo#67930 don't use variables ...
... for formattedtext in header/footer"
This reverts commit b0e3c6b8fa548defd5a3af2b8bf88b0b49589753.
This reverts commit fc92c1abebcfe9b18649d35b76bf22e001e332da.
The other fix from the libreoffice-4-1 branch seems to work better.
Change-Id: Idc5d7543c11dff74977729dab5afd978197dab6a
Diffstat (limited to 'reportbuilder')
-rw-r--r-- | reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java | 57 |
1 files changed, 24 insertions, 33 deletions
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java index 8c1f619c8240..afd8a59e6978 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java @@ -99,39 +99,30 @@ public class FormattedTextLayoutController DataSourceException { final FormattedTextElement element = (FormattedTextElement) getNode(); - // LEM 20130812 I have absolutely no clue why it wants to go via - // a variable like that. It complicates things, is fragile - // (because the variable-set is done in *every* detail section - // again and again. This in itself is not that bad, but when - // the detail section is of height zero, the "set" is never done... - // and this whole schema fails). For now, keep the code in case - // something break. If we survive the 4.2 cycle (in its entirety) - // without regression traced to this, then remove it (for 4.4 or - // something like that). - // final VariablesCollection vc = getVariablesCollection(); - // if (vc != null) - // { - // final String name = vc.addVariable(element); - // final AttributeMap variablesGet = new AttributeMap(); - // variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, - // Element.TYPE_ATTRIBUTE, "variable-get"); - // variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, - // Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.TEXT_NS); - // variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, "name", name); - - // final String dataStyleName = computeValueStyle(); - // if (dataStyleName != null) - // { - // variablesGet.setAttribute(OfficeNamespaces.STYLE_NS, "data-style-name", dataStyleName); - // } - - // final String valueType = computeValueType(); - // variablesGet.setAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE, valueType); - // target.startElement(variablesGet); - - // target.endElement(variablesGet); - // } - // else + final VariablesCollection vc = getVariablesCollection(); + if (vc != null) + { + final String name = vc.addVariable(element); + final AttributeMap variablesGet = new AttributeMap(); + variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, + Element.TYPE_ATTRIBUTE, "variable-get"); + variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, + Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.TEXT_NS); + variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, "name", name); + + final String dataStyleName = computeValueStyle(); + if (dataStyleName != null) + { + variablesGet.setAttribute(OfficeNamespaces.STYLE_NS, "data-style-name", dataStyleName); + } + + final String valueType = computeValueType(); + variablesGet.setAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE, valueType); + target.startElement(variablesGet); + + target.endElement(variablesGet); + } + else { final DataFlags df = FormatValueUtility.computeDataFlag(element, getFlowController()); if (df != null) |