diff options
| -rw-r--r-- | poi-scratchpad/src/main/java/org/apache/poi/hslf/util/LocaleDateFormat.java | 6 | ||||
| -rw-r--r-- | poi/src/main/java9/module-info.class | bin | 3421 -> 3385 bytes |
2 files changed, 5 insertions, 1 deletions
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/util/LocaleDateFormat.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/util/LocaleDateFormat.java index cad2d0541a..eb156e0177 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/util/LocaleDateFormat.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/util/LocaleDateFormat.java @@ -281,7 +281,7 @@ public final class LocaleDateFormat { /** * 10 - MMM-yy */ - ABBREVIATED_MONTH_AND_YEAR("LLL-yy", null, null), + ABBREVIATED_MONTH_AND_YEAR(isOldFmt () ? "MMM-yy" : "LLL-yy", null, null), /** * 11 - Base short date followed by a space, followed by base time with seconds removed. * Seconds are removed by removing all "s" symbols and any symbol that directly precedes an @@ -361,4 +361,8 @@ public final class LocaleDateFormat { return MapFormatBase.mapFormatId(loc, (Integer)mappedFormat); } } + + private static boolean isOldFmt() { + return System.getProperty("java.version").startsWith("1.8"); + } } diff --git a/poi/src/main/java9/module-info.class b/poi/src/main/java9/module-info.class Binary files differindex 7ca4ecd882..a27868cdf4 100644 --- a/poi/src/main/java9/module-info.class +++ b/poi/src/main/java9/module-info.class |