pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

DataFormatter - typo in javadoc and possible NPE

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1907543 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2023-02-09 15:22:21 +00:00
parent c4e2eebbaf
commit c2d2ec0eaf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
View File

@ -99,7 +99,7 @@ import org.apache.poi.util.StringUtil;
* The trailing underscore and space ("_ ") in the format adds a space to the end and Excel formats this cell as {@code "12.34 "},
* but {@code DataFormatter} trims the formatted value and returns {@code "12.34"}.
* </p>
* You can enable spaces by passing the {@code emulateCSV=true} flag in the {@code DateFormatter} cosntructor.
* You can enable spaces by passing the {@code emulateCSV=true} flag in the {@code DateFormatter} constructor.
* If set to true, then the output tries to conform to what you get when you take an xls or xlsx in Excel and Save As CSV file:
* <ul>
* <li>returned values are not trimmed</li>
@ -496,7 +496,11 @@ public class DataFormatter {
return generalNumberFormat;
}
if(DateUtil.isADateFormat(formatIndex,formatStr) &&
if (formatStr == null) {
return null;
}
if(DateUtil.isADateFormat(formatIndex, formatStr) &&
DateUtil.isValidExcelDate(cellValue)) {
return createDateFormat(formatStr, cellValue);
}