Kaydet (Commit) 4b9c5b1b authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane Kaydeden (comit) Andras Timar

tdf#92654 a "Date" can contain a Time, so don't loose date by default

also fix DATEVALUE() function that was relying on this dataloss

Change-Id: I6030505a762df3ecbfe9a8331267846d3de817e8
Reviewed-on: https://gerrit.libreoffice.org/17049Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 7c50bdb2
......@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\
$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\
external/jfreereport/patches/flow-engine.patch \
external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 \
))
# vim: set noet sw=4 ts=4:
......@@ -19,6 +19,7 @@ $(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 \
external/jfreereport/patches/libformula-datevalue_truncation.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff -ur jfreereport_flow_engine.org/source/org/jfree/report/expressions/ReportFormulaContext.java jfreereport_flow_engine/source/org/jfree/report/expressions/ReportFormulaContext.java
--- jfreereport_flow_engine.org/source/org/jfree/report/expressions/ReportFormulaContext.java 2015-07-14 17:24:51.924156060 +0200
+++ jfreereport_flow_engine/source/org/jfree/report/expressions/ReportFormulaContext.java 2015-07-14 17:27:56.669270298 +0200
@@ -120,7 +120,7 @@
{
if (flags.isDate())
{
- return DateTimeType.DATE_TYPE;
+ return DateTimeType.DATETIME_TYPE;
}
if (flags.isNumeric())
{
Only in jfreereport_flow_engine/source/org/jfree/report/expressions: ReportFormulaContext.java~
diff -ur jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java
--- jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java 2010-06-01 17:15:50.000000000 +0200
+++ jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java 2015-07-14 17:24:42.503895240 +0200
@@ -18,6 +18,7 @@
package org.pentaho.reporting.libraries.formula.function.datetime;
import java.util.Date;
+import java.util.Calendar;
import org.pentaho.reporting.libraries.formula.EvaluationException;
import org.pentaho.reporting.libraries.formula.FormulaContext;
@@ -28,6 +29,7 @@
import org.pentaho.reporting.libraries.formula.typing.Type;
import org.pentaho.reporting.libraries.formula.typing.TypeRegistry;
import org.pentaho.reporting.libraries.formula.typing.coretypes.DateTimeType;
+import org.pentaho.reporting.libraries.formula.util.DateUtil;
/**
* This function returns
@@ -61,7 +63,8 @@
final Object value = parameters.getValue(0);
final Date date1 = typeRegistry.convertToDate(type, value);
- return new TypeValuePair(DateTimeType.DATE_TYPE, date1);
+ final Date date = DateUtil.normalizeDate(date1, DateTimeType.DATE_TYPE);
+ return new TypeValuePair(DateTimeType.DATE_TYPE, date);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment