Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

forbidden-apis-check issues 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1877801 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2020-05-16 08:17:32 +00:00
parent af8137a6e4
commit 5bad296845
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/org/apache/poi/ss/formula/functions/DateValue.java
View File

@ -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.OperandResolver;
import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.ss.usermodel.DateUtil;
import org.apache.poi.util.LocaleUtil;
/** /**
* Implementation for the DATEVALUE() Excel function.<p> * Implementation for the DATEVALUE() Excel function.<p>
@ -101,7 +102,7 @@ public class DateValue extends Fixed1ArgFunction {
} }
int year = format.hasYear int year = format.hasYear
? Integer.valueOf(groups.get(format.yearIndex)) ? Integer.valueOf(groups.get(format.yearIndex))
: LocalDate.now().getYear(); : LocalDate.now(LocaleUtil.getUserTimeZone().toZoneId()).getYear();
int month = parseMonth(groups.get(format.monthIndex)); int month = parseMonth(groups.get(format.monthIndex));
int day = Integer.valueOf(groups.get(format.dayIndex)); int day = Integer.valueOf(groups.get(format.dayIndex));
return new NumberEval(DateUtil.getExcelDate(LocalDate.of(year, month, day))); 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) { 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; return month + 1;
} }
} }