Fix some Forbidden APIs errors

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1700651 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/formula/functions/Complex.java b/src/java/org/apache/poi/ss/formula/functions/Complex.java
index f63894e36dfa4bda35672e2fe891b962654364ae..628a2670ff2c51a75871ae80dcacd1e9e0fa70f6 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/functions/Complex.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Complex.java
@@ -17,6 +17,8 @@
 \r
 package org.apache.poi.ss.formula.functions;\r
 \r
+import java.util.Locale;\r
+\r
 import org.apache.poi.ss.formula.OperationEvaluationContext;\r
 import org.apache.poi.ss.formula.eval.ErrorEval;\r
 import org.apache.poi.ss.formula.eval.EvaluationException;\r
@@ -94,7 +96,8 @@ public class Complex extends Var2or3ArgFunction implements FreeRefFunction {
         if (suffixValue.length() == 0) {\r
             suffixValue = DEFAULT_SUFFIX;\r
         }\r
-        if (suffixValue.equals(DEFAULT_SUFFIX.toUpperCase()) || suffixValue.equals(SUPPORTED_SUFFIX.toUpperCase())) {\r
+        if (suffixValue.equals(DEFAULT_SUFFIX.toUpperCase(Locale.ROOT)) || \r
+                suffixValue.equals(SUPPORTED_SUFFIX.toUpperCase(Locale.ROOT))) {\r
             return ErrorEval.VALUE_INVALID;\r
         }\r
         if (!(suffixValue.equals(DEFAULT_SUFFIX) || suffixValue.equals(SUPPORTED_SUFFIX))) {\r

diff --git a/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/src/java/org/apache/poi/ss/usermodel/DateUtil.java
index ff8ab4db2eb436cb106387efdcb5e1af77cd66d6..d202544d19063f37102d34e72e3d734d1f9754ab 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/DateUtil.java
+++ b/src/java/org/apache/poi/ss/usermodel/DateUtil.java
@@ -27,14 +27,6 @@ import java.util.regex.Pattern;
 
 /**
  * Contains methods for dealing with Excel dates.
- *
- * @author  Michael Harhen
- * @author  Glen Stampoultzis (glens at apache.org)
- * @author  Dan Sherman (dsherman at isisph.com)
- * @author  Hack Kampbjorn (hak at 2mba.dk)
- * @author  Alex Jacoby (ajacoby at gmail.com)
- * @author  Pavel Krupets (pkrupets at palmtreebusiness dot com)
- * @author  Thies Wellpott
  */
 public class DateUtil {
     protected DateUtil() {
@@ -669,7 +661,8 @@ public class DateUtil {
         int month = parseInt(monthStr, "month", 1, 12);
         int day = parseInt(dayStr, "day", 1, 31);
 
-        Calendar cal = new GregorianCalendar(year, month-1, day, 0, 0, 0);
+        Calendar cal = new GregorianCalendar(TIMEZONE_UTC, Locale.ROOT);
+        cal.set(year, month-1, day, 0, 0, 0);
         cal.set(Calendar.MILLISECOND, 0);
         return cal.getTime();
     }