From 5bad2968456a16f395311161543f40b47ae03f5e Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 16 May 2020 08:17:32 +0000 Subject: [PATCH] forbidden-apis-check issues git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1877801 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/ss/formula/functions/DateValue.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/poi/ss/formula/functions/DateValue.java b/src/java/org/apache/poi/ss/formula/functions/DateValue.java index 77efed657e..f513237abe 100644 --- a/src/java/org/apache/poi/ss/formula/functions/DateValue.java +++ b/src/java/org/apache/poi/ss/formula/functions/DateValue.java @@ -33,6 +33,7 @@ import org.apache.poi.ss.formula.eval.NumberEval; import org.apache.poi.ss.formula.eval.OperandResolver; import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.util.LocaleUtil; /** * Implementation for the DATEVALUE() Excel function.

@@ -101,7 +102,7 @@ public class DateValue extends Fixed1ArgFunction { } int year = format.hasYear ? Integer.valueOf(groups.get(format.yearIndex)) - : LocalDate.now().getYear(); + : LocalDate.now(LocaleUtil.getUserTimeZone().toZoneId()).getYear(); int month = parseMonth(groups.get(format.monthIndex)); int day = Integer.valueOf(groups.get(format.dayIndex)); return new NumberEval(DateUtil.getExcelDate(LocalDate.of(year, month, day))); @@ -124,9 +125,9 @@ public class DateValue extends Fixed1ArgFunction { } - String[] months = new DateFormatSymbols().getMonths(); + String[] months = DateFormatSymbols.getInstance(LocaleUtil.getUserLocale()).getMonths(); for (int month = 0; month < months.length; ++month) { - if (months[month].toLowerCase().startsWith(monthPart.toLowerCase())) { + if (months[month].toLowerCase(LocaleUtil.getUserLocale()).startsWith(monthPart.toLowerCase(LocaleUtil.getUserLocale()))) { return month + 1; } }