[Libreoffice-commits] core.git: jfreereport/patches jfreereport/UnpackedTarball_jfreereport_libformula.mk

[Lionel Elie Mamane]

 jfreereport/UnpackedTarball_jfreereport_libformula.mk |    1 
 jfreereport/patches/libformula-time-notz.patch        |   22 ++++++++++++++++++
 2 files changed, 23 insertions(+)

New commits:
commit def99ae60119658d0b24667b08068162d2454694
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Aug 7 10:04:49 2013 +0200

    fdo#65354 don't slap a timezone on time values
    
    There is no way to guess a "right" timezone, since there is no date.
    So could be with summer (daylight saving) or winter, nobody known.
    
    Change-Id: I1617caa8a3e902d7cabbf25dcee67c9aed9b7dc7

diff --git a/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/jfreereport/UnpackedTarball_jfreereport_libformula.mk
index 4d55293..8dabfff 100644
--- a/jfreereport/UnpackedTarball_jfreereport_libformula.mk
+++ b/jfreereport/UnpackedTarball_jfreereport_libformula.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\
 	jfreereport/patches/common_build.patch \
+	jfreereport/patches/libformula-time-notz.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/jfreereport/patches/libformula-time-notz.patch b/jfreereport/patches/libformula-time-notz.patch
new file mode 100644
index 0000000..fec65b1
--- /dev/null
+++ b/jfreereport/patches/libformula-time-notz.patch
@@ -0,0 +1,22 @@
+--- a/jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/DefaultLocalizationContext.java	2010-06-01 17:15:52.000000000 +0200
++++ a/jfreereport_libformula.patched/source/org/pentaho/reporting/libraries/formula/DefaultLocalizationContext.java	2013-08-06 13:11:58.000000000 +0200
+@@ -162,11 +169,17 @@
+     final Locale activeLocale = getLocale();
+     datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, activeLocale));
+     dateFormats.add(DateFormat.getDateInstance(DateFormat.FULL, activeLocale));
+-    timeFormats.add(DateFormat.getTimeInstance(DateFormat.FULL, activeLocale));
++    // LEM: "FULL" does not really make sense for isolated times:
++    //      in the absence of a date, it cannot know whether it is meant in the winter-timezone
++    //      or in the summer (daylight saving time) timezone, and will always display the winter timezone.
++    // timeFormats.add(DateFormat.getTimeInstance(DateFormat.FULL, activeLocale));
+ 
+     datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, activeLocale));
+     dateFormats.add(DateFormat.getDateInstance(DateFormat.LONG, activeLocale));
+-    timeFormats.add(DateFormat.getTimeInstance(DateFormat.LONG, activeLocale));
++    // LEM: "LONG" does not really make sense for isolated times:
++    //      in the absence of a date, it cannot know whether it is meant in the winter-timezone
++    //      or in the summer (daylight saving time) timezone, and will always display the winter timezone.
++    // timeFormats.add(DateFormat.getTimeInstance(DateFormat.LONG, activeLocale));
+ 
+     datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, activeLocale));
+     dateFormats.add(DateFormat.getDateInstance(DateFormat.MEDIUM, activeLocale));