summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2014-02-05 07:39:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-05 09:15:54 +0000
commit2dc383cd014bad144bdaa208fed309f48ad95ba7 (patch)
tree3749defb44ee5d7d9162b69a65fd445889c1f45d
parent7a3cac33e82a65cabae81e5bf8969c5c5853b3b2 (diff)
fdo#69873 FixedText (label) is implemented as no value
And the actual label is put as *body* of the cell. I'd prefer that the value be put as string-value attribute of the cell, but since in the report definition the label is as body (as opposed to as an attribute), it is easier that way. We could move (actually *copy* for backwards compatibility reasons) the label to an attribute of the rpt:fixed-content element (similar to the rpt:formula attribute of rpt:formatted-text) but it is not obvious this is completely desirable: Indeed it would keep us from putting anything more complex than a string there (which we don't do anyway now, but thinking of future extensibility here); I'll leave the exploration of that idea to the indefinite future. Change-Id: Ia0f7460718ee35a971117e2f79c0997e17e1095e Reviewed-on: https://gerrit.libreoffice.org/7866 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 6883482a8c12..a9e0ef058b38 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -74,11 +74,12 @@ public class TableCellLayoutController extends SectionLayoutController
FormatValueUtility.applyValueForCell(value.getValue(), attributeMap, valueType);
}
// #i114108#: except on form elements, the only value-type that can
- // occur without an accompanying value attribute is "string"
+ // occur without an accompanying value attribute is "string";
+ // the content is then in the body.
else if (!"string".equals(valueType))
{
attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
- FormatValueUtility.VALUE_TYPE, "void");
+ FormatValueUtility.VALUE_TYPE, "string");
}
}
catch (Exception e)