User: rt Date: 2008-06-16 13:08:46+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
Log: 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 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: FormatValueUtility.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java?r1=1.4&r2=1.5 Delta lines: +6 -3 ------------------- --- FormatValueUtility.java 2008-05-05 13:48:10+0000 1.4 +++ FormatValueUtility.java 2008-06-16 13:08:43+0000 1.5 @@ -62,12 +62,14 @@ { } - 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 @@ 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 @@ 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) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
