[Libreoffice-commits] core.git: 2 commits - reportbuilder/java

[Lionel Elie Mamane]

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

New commits:
commit b0e3c6b8fa548defd5a3af2b8bf88b0b49589753
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Feb 5 07:40:21 2014 +0100

    typo in comment
    
    Change-Id: I900a8956fd9eae330bf12829bc94c8b18b1c6513

diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index 1841122..603f821 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -106,7 +106,7 @@ public class FormattedTextLayoutController
         // 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" us never done...
+        //  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
commit 7ce47d69b3565cbb9e80294127e00648c24955dc
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

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)