diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml index a641b9f4d..ff277d20d 100644 --- a/src/documentation/content/xdocs/changes.xml +++ b/src/documentation/content/xdocs/changes.xml @@ -37,6 +37,7 @@ + 46184 - More odd escaped date formats Include the sheet number in the output of XLS2CSVmra 46043 - correctly write out HPSF properties with HWPF 45973 - added CreationHelper.createFormulaEvaluator(), implemeted both for HSSF and XSSF diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 803d9cd6e..18922b442 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 46184 - More odd escaped date formats Include the sheet number in the output of XLS2CSVmra 46043 - correctly write out HPSF properties with HWPF 45973 - added CreationHelper.createFormulaEvaluator(), implemeted both for HSSF and XSSF diff --git a/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/src/java/org/apache/poi/ss/usermodel/DateUtil.java index aeeaa3461..90a7a5b50 100644 --- a/src/java/org/apache/poi/ss/usermodel/DateUtil.java +++ b/src/java/org/apache/poi/ss/usermodel/DateUtil.java @@ -211,6 +211,8 @@ public class DateUtil { fs = fs.replaceAll("\\\\-","-"); // And \, into , fs = fs.replaceAll("\\\\,",","); + // And \. into . + fs = fs.replaceAll("\\\\.","."); // And '\ ' into ' ' fs = fs.replaceAll("\\\\ "," "); diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java index 9e451ee05..1d3941a02 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java @@ -239,6 +239,7 @@ public final class TestHSSFDateUtil extends TestCase { "dd-mm-yy", "dd-mm-yyyy", "DD-MM-YY", "DD-mm-YYYY", "dd\\-mm\\-yy", // Sometimes escaped + "dd.mm.yyyy", "dd\\.mm\\.yyyy", // These crazy ones are valid "yyyy-mm-dd;@", "yyyy/mm/dd;@",