diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:08:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:08:43 +0000 |
| commit | 78f1171c5f104e850b3f22c880096db8219f1d02 (patch) | |
| tree | d36ad64d94293201431b7886f3fe5e4936c1c1f3 /reportdesign/java | |
| parent | 043917166ac8bdd89cbda28341d86ac4fce13908 (diff) | |
INTEGRATION: CWS rptchart02 (1.3.4); FILE MERGED
2008/05/20 08:15:46 oj 1.3.4.5: #i84290# handle statements which can not be parsed
2008/04/22 11:08:46 oj 1.3.4.4: #i87576# write date as formula
2008/04/16 07:01:26 oj 1.3.4.3: header change
2008/04/03 11:59:19 oj 1.3.4.2: export frames of ole object with special style
2008/03/12 09:42:45 oj 1.3.4.1: impl chart handling and some code refactoring
Diffstat (limited to 'reportdesign/java')
| -rwxr-xr-x | reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java index eeb590fd6bc1..9aeb6df43cb2 100755 --- a/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java +++ b/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FormatValueUtility.java,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -62,12 +62,14 @@ public class FormatValueUtility { } - public static void applyValueForVariable(final Object value, final AttributeMap variableSection) + public static String applyValueForVariable(final Object value, final AttributeMap variableSection) { + String ret = null; if (value instanceof Date) { variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "date"); - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate((Date) value)); + ret = formatDate((Date) value); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", ret); } else if (value instanceof Number) { @@ -96,6 +98,7 @@ public class FormatValueUtility variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "string"); variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,STRING_VALUE, ""); } + return ret; } public static void applyValueForCell(final Object value, final AttributeMap variableSection) @@ -149,7 +152,7 @@ public class FormatValueUtility if (result == null) { // ignore it. Ignoring it is much better than printing 'null'. - Log.debug("Formula '" + formulaExpression.getFormula() + "' evaluated to null."); + // Log.debug("Formula '" + formulaExpression.getFormula() + "' evaluated to null."); return null; } else if (result instanceof DataFlags) |