[Libreoffice-commits] core.git: external/jfreereport

[Julien Nabet]

 external/jfreereport/UnpackedTarball_jfreereport_libformula.mk     |    1 
 external/jfreereport/patches/libformula-minutes_truncation.patch.1 |   17 ++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 429280541ff1fbbbf3f0482211a659c96c3347d2
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Jul 13 16:03:15 2015 +0200

    tdf#92693: ReportBuilder: MINUTES() rounded to nearest for fractional minutes
    
    ... instead of the correct truncation.
    
    Thanks to Lionel for the idea of the fix and his patience for newbies like me!
    
    Change-Id: Iae9ec9251c0beb0c1856a6573f6ff7963d216256
    Reviewed-on: https://gerrit.libreoffice.org/17012
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
index 2bc3229..bb78966 100644
--- a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
+++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\
 $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\
 	external/jfreereport/patches/common_build.patch \
 	external/jfreereport/patches/libformula-time-notz.patch \
+	external/jfreereport/patches/libformula-minutes_truncation.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/patches/libformula-minutes_truncation.patch.1 b/external/jfreereport/patches/libformula-minutes_truncation.patch.1
new file mode 100644
index 0000000..0df98db
--- /dev/null
+++ b/external/jfreereport/patches/libformula-minutes_truncation.patch.1
@@ -0,0 +1,17 @@
+Seulement dans jfreereport_libformula: bin
+Seulement dans jfreereport_libformula: build.log
+Seulement dans jfreereport_libformula: dist
+diff -ur jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java
+--- jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java	2015-07-13 15:55:31.752539618 +0200
++++ jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java	2015-07-13 15:56:27.084394065 +0200
+@@ -74,7 +74,7 @@
+     
+     // Multiply the minutes with 60 to get the minutes as ints 
+     final BigDecimal minutes = minutesFraction.multiply(MINUTES);
+-    final BigDecimal minutesAsInt = minutes.setScale(0, BigDecimal.ROUND_HALF_UP);
++    final BigDecimal minutesAsInt = NumberUtil.performIntRounding(minutes);
+     return new TypeValuePair(NumberType.GENERIC_NUMBER, minutesAsInt);
+   }
+-}
+\ Pas de fin de ligne à la fin du fichier
++}