Merge pull request #48 from jake-codes-at-5-am/xssfcolumn

Xssfcolumn
jake-codes-at-5-am · Jul 3, 2023 · 60ae6d9 · 60ae6d9
2 parents 6d1986c + 4d020f4
commit 60ae6d9
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 13 deletions.
diff --git a/ooxml/XSSF/UserModel/XSSFSheet.cs b/ooxml/XSSF/UserModel/XSSFSheet.cs
@@ -5077,23 +5077,17 @@ private void RemoveOverwrittenColumns(int startColumn, int endColumn, int n)
                 throw new RuntimeException("There is no columns in XML part");
             }
 
-            for (int i = startColumn + n; i <= endColumn + n; i++)
-            {
-                _ = GetColumn(i) ?? CreateColumn(i);
-            }
-
             List<IColumn> columnsToRemove = new List<IColumn>();
 
             // first remove all columns which will be overwritten
-            foreach (KeyValuePair<int, XSSFColumn> columnDict in _columns)
+            for (int i = startColumn + n; i <= endColumn + n; i++)
             {
-                XSSFColumn column = columnDict.Value;
-                int columnNum = column.ColumnNum;
-
                 // check if we should remove this column as it will be overwritten
                 // by the data later
-                if (ShouldRemoveAtIndex(startColumn, endColumn, n, columnNum))
+                if (ShouldRemoveAtIndex(startColumn, endColumn, n, i))
                 {
+                    IColumn column = GetColumn(i, true);
+
                     columnsToRemove.Add(column);
                 }
             }

diff --git a/testcases/main/HSSF/Extractor/TestOldExcelExtractor.cs b/testcases/main/HSSF/Extractor/TestOldExcelExtractor.cs
@@ -27,6 +27,7 @@ namespace TestCases.HSSF.Extractor
     using NPOI.POIFS.FileSystem;
     using NPOI.Util;
     using System.Text;
+    using System.Threading;
 
     /**
      * Unit tests for the Excel 5/95 and Excel 4 (and older) text 
@@ -42,6 +43,11 @@ private static OldExcelExtractor CreateExtractor(String sampleFileName)
             return new OldExcelExtractor(file);
         }
 
+        public TestOldExcelExtractor()
+        {
+            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
+        }
+
         [Test]
         public void TestSimpleExcel3()
         {

diff --git a/testcases/main/SS/Formula/Atp/TestNetworkdaysFunction.cs b/testcases/main/SS/Formula/Atp/TestNetworkdaysFunction.cs
@@ -47,6 +47,12 @@ public class TestNetworkdaysFunction
         private static String THIRD_HOLIDAY = formatter.Format(new DateTime(2009, JANUARY, 21), CultureInfo.CurrentCulture);
 
         private static OperationEvaluationContext EC = new OperationEvaluationContext(null, null, 1, 1, 1, null);
+
+        public TestNetworkdaysFunction()
+        {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
+        }
+
         [Test]
         public void TestFailWhenNoArguments()
         {

diff --git a/testcases/main/SS/Formula/Functions/TestBesselJ.cs b/testcases/main/SS/Formula/Functions/TestBesselJ.cs
@@ -24,13 +24,15 @@ public void TestInvalid()
         [Test]
         public void TestNumError()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmNumError("22.5", "-40");
         }
 
         //https://support.microsoft.com/en-us/office/besselj-function-839cb181-48de-408b-9d80-bd02982d94f7
         [Test]
         public void TestMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             ISheet sheet = wb.CreateSheet();
             IRow row = sheet.CreateRow(0);

diff --git a/testcases/main/SS/Formula/Functions/TestComplex.cs b/testcases/main/SS/Formula/Functions/TestComplex.cs
@@ -52,6 +52,7 @@ private static void ConfirmValueError(String msg, String real_num, String i_num,
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             ConfirmValue("Complex number with 3 and 4 as the real and imaginary coefficients (3 + 4i)", "3", "4", "", "3+4i");
             ConfirmValue("Complex number with 3 and 4 as the real and imaginary coefficients, and j as the suffix (3 + 4j)", "3", "4", "j", "3+4j");
 

diff --git a/testcases/main/SS/Formula/Functions/TestDec2Bin.cs b/testcases/main/SS/Formula/Functions/TestDec2Bin.cs
@@ -33,6 +33,10 @@ namespace TestCases.SS.Formula.Functions
     [TestFixture]
     public class TestDec2Bin
     {
+        public TestDec2Bin()
+        {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
+        }
 
         private static ValueEval invokeValue(String number1)
         {

diff --git a/testcases/main/SS/Formula/Functions/TestDec2Hex.cs b/testcases/main/SS/Formula/Functions/TestDec2Hex.cs
@@ -33,6 +33,10 @@ namespace TestCases.SS.Formula.Functions
     [TestFixture]
     public class TestDec2Hex
     {
+        public TestDec2Hex()
+        {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
+        }
 
         private static ValueEval invokeValue(String number1, String number2)
         {

diff --git a/testcases/main/SS/Formula/Functions/TestDelta.cs b/testcases/main/SS/Formula/Functions/TestDelta.cs
@@ -52,6 +52,7 @@ private static void ConfirmValueError(String number1, String number2)
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             ConfirmValue("5", "4", 0); // Checks whether 5 Equals 4 (0)
             ConfirmValue("5", "5", 1); // Checks whether 5 Equals 5 (1)
 

diff --git a/testcases/main/SS/Formula/Functions/TestDollarDe.cs b/testcases/main/SS/Formula/Functions/TestDollarDe.cs
@@ -23,12 +23,14 @@ public void TestInvalid()
         [Test]
         public void TestNumError()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmNumError("22.5", "-40");
         }
 
         [Test]
         public void TestDiv0()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmDiv0("22.5", "0");
             confirmDiv0("22.5", "0.9");
             confirmDiv0("22.5", "-0.9");
@@ -38,6 +40,7 @@ public void TestDiv0()
         [Test]
         public void TestMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             var sheet = wb.CreateSheet();
             var row = sheet.CreateRow(0);

diff --git a/testcases/main/SS/Formula/Functions/TestDollarFr.cs b/testcases/main/SS/Formula/Functions/TestDollarFr.cs
@@ -23,12 +23,14 @@ public void TestInvalid()
         [Test]
         public void TestNumError()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmNumError("22.5", "-40");
         }
 
         [Test]
         public void TestDiv0()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmDiv0("22.5", "0");
             confirmDiv0("22.5", "0.9");
             confirmDiv0("22.5", "-0.9");
@@ -38,6 +40,7 @@ public void TestDiv0()
         [Test]
         public void TestMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             var sheet = wb.CreateSheet();
             var row = sheet.CreateRow(0);

diff --git a/testcases/main/SS/Formula/Functions/TestFixed.cs b/testcases/main/SS/Formula/Functions/TestFixed.cs
@@ -51,6 +51,7 @@ public void SetUp()
         [Test]
         public void TestValid()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             // thousands separator
             Confirm("FIXED(1234.56789,2,TRUE)", "1234.57");
             Confirm("FIXED(1234.56789,2,FALSE)", "1,234.57");
@@ -88,6 +89,7 @@ public void TestValid()
         [Test]
         public void TestOptionalParams()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             Fixed fixedFunc = new Fixed();
             ValueEval Evaluate = fixedFunc.Evaluate(0, 0, new NumberEval(1234.56789));
             Assert.IsTrue(Evaluate is StringEval);

diff --git a/testcases/main/SS/Formula/Functions/TestNormDist.cs b/testcases/main/SS/Formula/Functions/TestNormDist.cs
@@ -17,6 +17,7 @@ public class TestNormDist
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmValue("42", "40", "1.5", true, 0.908788780274132);
             confirmValue("42", "40", "1.5", false, 0.109340049783996);
         }
@@ -29,6 +30,7 @@ public void TestInvalid()
         [Test]
         public void TestNumError()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmNumError("42", "40", "0", false);
             confirmNumError("42", "40", "0", true);
             confirmNumError("42", "40", "-0.1", false);
@@ -40,6 +42,7 @@ public void TestNumError()
         [Test]
         public void TestMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             ISheet sheet = wb.CreateSheet();
             SS.Util.Utils.AddRow(sheet, 0, "Data", "Description");

diff --git a/testcases/main/SS/Formula/Functions/TestNormInv.cs b/testcases/main/SS/Formula/Functions/TestNormInv.cs
@@ -18,6 +18,7 @@ public class TestNormInv
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmValue("0.908789", "40", "1.5", 42.000002);
         }
 
@@ -30,6 +31,7 @@ public void TestInvalid()
         [Test]
         public void TestNumError()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmNumError("0.5", "40", "0");
             confirmNumError("0.5", "40", "-0.1");
             confirmNumError("-0.5", "40", "0.1");
@@ -42,6 +44,7 @@ public void TestNumError()
         [Test]
         public void TestMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             ISheet sheet = wb.CreateSheet();
             SS.Util.Utils.AddRow(sheet, 0, "Data", "Description");

diff --git a/testcases/main/SS/Formula/Functions/TestNormSDist.cs b/testcases/main/SS/Formula/Functions/TestNormSDist.cs
@@ -17,6 +17,7 @@ public class TestNormSDist
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmValue("1.333333", 0.908788726);
         }
 
@@ -28,6 +29,7 @@ public void TestInvalid()
         [Test]
         public void TestMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             ISheet sheet = wb.CreateSheet();
             IRow row = sheet.CreateRow(0);

diff --git a/testcases/main/SS/Formula/Functions/TestNormSInv.cs b/testcases/main/SS/Formula/Functions/TestNormSInv.cs
@@ -17,6 +17,7 @@ public class TestNormSInv
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmValue("0.9088", 1.3334);
         }
 

diff --git a/testcases/main/SS/Formula/Functions/TestNumberValue.cs b/testcases/main/SS/Formula/Functions/TestNumberValue.cs
@@ -12,6 +12,7 @@ public class TestNumberValue
         [Test]
         public void TestMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             var sheet = wb.CreateSheet();
             var row = sheet.CreateRow(0);
@@ -23,6 +24,7 @@ public void TestMicrosoftExample1()
         [Test]
         public void TestMicrosoftExample2()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             var sheet = wb.CreateSheet();
             var row = sheet.CreateRow(0);

diff --git a/testcases/main/SS/Formula/Functions/TestNumericFunction.cs b/testcases/main/SS/Formula/Functions/TestNumericFunction.cs
@@ -41,6 +41,7 @@ public void TestSIGN()
         [Test]
         public void TestDOLLAR()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             ICell cell = wb.CreateSheet().CreateRow(0).CreateCell(0);
             HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);

diff --git a/testcases/main/SS/Formula/Functions/TestQuotient.cs b/testcases/main/SS/Formula/Functions/TestQuotient.cs
@@ -54,6 +54,7 @@ private static void ConfirmValueError(String msg, String numerator, String denom
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             ConfirmValue("int portion of 5/2 (2)", "5", "2", "2");
             ConfirmValue("int portion of 4.5/3.1 (1)", "4.5", "3.1", "1");
 
@@ -65,6 +66,7 @@ public void TestBasic()
         [Test]
         public void TestErrors()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             ConfirmValueError("numerator is nonnumeric", "ABCD", "", ErrorEval.VALUE_INVALID);
             ConfirmValueError("denominator is nonnumeric", "", "ABCD", ErrorEval.VALUE_INVALID);
 

diff --git a/testcases/main/SS/Formula/Functions/TestStandardize.cs b/testcases/main/SS/Formula/Functions/TestStandardize.cs
@@ -17,6 +17,7 @@ public class TestStandardize
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmValue("42", "40", "1.5", 1.33333333);
         }
 
@@ -29,13 +30,15 @@ public void TestInvalid()
         [Test]
         public void TestNumError()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmNumError("42", "40", "0");
             confirmNumError("42", "40", "-0.1");
         }
         //https://support.microsoft.com/en-us/office/standardize-function-81d66554-2d54-40ec-ba83-6437108ee775
         [Test]
         public void TestMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             ISheet sheet = wb.CreateSheet();
             SS.Util.Utils.AddRow(sheet, 0, "Data", "Description");

diff --git a/testcases/main/SS/Formula/Functions/TestTDist.cs b/testcases/main/SS/Formula/Functions/TestTDist.cs
@@ -16,6 +16,7 @@ public class TestTDist
         [Test]
         public void TestBasic()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmValue("5.968191467", "8", "1", 0.00016754180265310392);
             confirmValue("5.968191467", "8", "2", 0.00033508360530620784);
             confirmValue("5.968191467", "8.2", "2.2", 0.00033508360530620784);
@@ -34,6 +35,7 @@ public void TestInvalid()
         [Test]
         public void TestNumError()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             confirmNumError("5.968191467", "8", "0");
             confirmNumError("-5.968191467", "8", "2");
         }
@@ -42,6 +44,7 @@ public void TestNumError()
         [Test]
         public void testMicrosoftExample1()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             HSSFWorkbook wb = new HSSFWorkbook();
             ISheet sheet = wb.CreateSheet();
             SS.Util.Utils.AddRow(sheet, 0, "Data", "Description");

diff --git a/testcases/main/SS/Formula/Functions/TestText.cs b/testcases/main/SS/Formula/Functions/TestText.cs
@@ -47,6 +47,7 @@ public void TestTextWithStringFirstArg()
         [Test]
         public void TestTextWithDeciamlFormatSecondArg()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             ValueEval numArg = new NumberEval(321321.321);
             ValueEval formatArg = new StringEval("#,###.00000");
             ValueEval[] args = { numArg, formatArg };
@@ -77,7 +78,7 @@ public void TestTextWithDeciamlFormatSecondArg()
         [Test]
         public void TestTextWithFractionFormatSecondArg()
         {
-
+            System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             ValueEval numArg = new NumberEval(321.321);
             ValueEval formatArg = new StringEval("# #/#");
             ValueEval[] args = { numArg, formatArg };

diff --git a/testcases/main/SS/UserModel/TestFractionFormat.cs b/testcases/main/SS/UserModel/TestFractionFormat.cs
@@ -21,6 +21,8 @@ limitations under the License.
 using NUnit.Framework;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Threading;
+
 namespace TestCases.SS.UserModel
 {
 
@@ -34,6 +36,7 @@ public class TestFractionFormat
         [Test]
         public void TestSingle()
         {
+            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             FractionFormat f = new FractionFormat("", "##");
             string val = "321.321";
             String ret = f.Format(val);

diff --git a/testcases/main/Util/TestStringUtil.cs b/testcases/main/Util/TestStringUtil.cs
@@ -20,7 +20,7 @@ namespace TestCases.Util
 {
     using System;
     using System.Text;
-
+    using System.Threading;
     using NPOI.Util;
     using NUnit.Framework;
     /**
@@ -248,6 +248,7 @@ public void TestPutUncompressedUnicode()
         [Test]
         public void Join()
         {
+            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");
             Assert.AreEqual("", StringUtil.Join(",")); // degenerate case: nothing to join
             Assert.AreEqual("abc", StringUtil.Join(",", "abc")); // degenerate case: one thing to join, no trailing comma
             Assert.AreEqual("abc|def|ghi", StringUtil.Join("|", "abc", "def", "ghi"));