[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - reportbuilder/java

[Lionel Elie Mamane]

 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2dc383cd014bad144bdaa208fed309f48ad95ba7
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Feb 5 07:39:31 2014 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 6883482..a9e0ef0 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)