reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
| 11 +++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit b8537fba16417aa5a2e940191f094b8671256ee5
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Fri Apr 12 19:03:07 2013 +0200
fdo#36858
1) No valueType (Format/Number/General) is like float valueType
(Format/Number/any other)
2) We use 1/1/1900 as startdate for number-from-date, stick to it more
consistently
Change-Id: Ib1008d1c30be602d8173457738c915087ed17391
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index f5f65db..4c1b8dd 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -126,9 +126,10 @@ public class FormatValueUtility
}
else if (value instanceof java.sql.Date)
{
- if ("float".equals(valueType))//@see
http://qa.openoffice.org/issues/show_bug.cgi?id=108954
+ if ("float".equals(valueType) || valueType == null)
{
- variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 2).toString());
+ // This is to work around fdo#63478
+ variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
}
else
{
@@ -137,8 +138,12 @@ public class FormatValueUtility
}
else if (value instanceof Date)
{
+ // This is what we *should* do, but see fdo#63478
+ // variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "date");
+ // variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
"date-value", formatDate((Date) value));
+ // so we do that instead to work around:
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, "float");
- variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
HSSFDateUtil.getExcelDate((Date) value, false, 2).toString());
+ variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
}
else if (value instanceof BigDecimal)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
