Upgrade NPOI from 2.5.6 to 2.7.3 to fix issues opening Excel files with PivotTables

Author: claudiamurialdo

dotnet/src/dotnetcore/GxOffice/GxOffice.csproj

@@ -41,7 +41,7 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="NPOI" Version="2.5.6" />
+		<PackageReference Include="NPOI" Version="2.7.3" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
 	</ItemGroup>
 

dotnet/src/dotnetframework/GxOffice/GxOffice.csproj

@@ -8,7 +8,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="EPPlus" Version="4.5.3.2" />
-		<PackageReference Include="NPOI" Version="2.6.0" />
+		<PackageReference Include="NPOI" Version="2.7.3" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
 	</ItemGroup>
 

dotnet/src/dotnetframework/GxOffice/poi/hssf/ExcelCells.cs

@@ -213,16 +213,14 @@ public string GetHyperlink()
 
 		public DateTime GetDate()
 		{
-			DateTime returnValue = DateTimeUtil.NullDate();
 			try
 			{
-				returnValue = pCells[1].DateCellValue;
+				return pCells[1].DateCellValue ?? DateTimeUtil.NullDate();
 			}
 			catch (Exception)
 			{
 				throw new ExcelException(7, "Invalid cell value");
 			}
-			return returnValue;
 		}
 
 		public bool SetTextImpl(string value)
@@ -395,7 +393,7 @@ private string GetFormulaType()
 			{
 				try
 				{
-					DateTime dVal = pCells[1].DateCellValue;
+					DateTime dVal = pCells[1].DateCellValue ?? DateTime.MinValue; 
 					if (dVal != DateTime.MinValue)
 					{
 						return "D";
@@ -832,7 +830,7 @@ private void FitColumnWidth(int i, int data)
 		{
 			if (fitColumnWidth)
 			{
-				int colW = pSelectedSheet.GetColumnWidth((int)(i + colStartIdx - 1));
+				double colW = pSelectedSheet.GetColumnWidth((int)(i + colStartIdx - 1));
 				if ((256 * data) > colW)
 				{
 					colW = (short)(256 * data);

dotnet/src/dotnetframework/GxOffice/poi/hssf/ExcelWorksheet.cs

@@ -35,7 +35,7 @@ public bool Hidden
 				if (_sheet != null)
 				{
 					HSSFWorkbook wb = (HSSFWorkbook)_sheet.Workbook;
-					wb.SetSheetHidden(SheetIndex(wb), value ? NPOI.SS.UserModel.SheetState.Hidden : NPOI.SS.UserModel.SheetState.Visible);
+					wb.SetSheetVisibility(SheetIndex(wb), value ? NPOI.SS.UserModel.SheetVisibility.Hidden : NPOI.SS.UserModel.SheetVisibility.Visible);
 				}
 			}
 		}

dotnet/src/dotnetframework/GxOffice/poi/xssf/ExcelCells.cs

@@ -215,16 +215,14 @@ public string GetHyperlink()
 
 		public DateTime GetDate()
 		{
-			DateTime returnValue = DateTimeUtil.NullDate();
 			try
 			{
-				returnValue = pCells[1].DateCellValue;
+				return pCells[1].DateCellValue ?? DateTimeUtil.NullDate();
 			}
 			catch (Exception)
 			{
 				throw new ExcelException(7, "Invalid cell value");
 			}
-			return returnValue;
 		}
 
 		public bool SetTextImpl(string value)
@@ -397,7 +395,7 @@ private string GetFormulaType()
 			{
 				try
 				{
-					DateTime dVal = pCells[1].DateCellValue;
+					DateTime dVal = pCells[1].DateCellValue ?? DateTime.MinValue;
 					if (dVal != DateTime.MinValue)
 					{
 						return "D";
@@ -868,7 +866,7 @@ private void FitColumnWidth(int i, int data)
 		{
 			if (fitColumnWidth)
 			{
-				int colW = pSelectedSheet.GetColumnWidth((int)(i + colStartIdx - 1));
+				double colW = pSelectedSheet.GetColumnWidth((int)(i + colStartIdx - 1));
 				if ((256 * data) > colW)
 				{
 					colW = (short)(256 * data);

dotnet/src/dotnetframework/GxOffice/poi/xssf/ExcelWorksheet.cs

@@ -35,7 +35,7 @@ public bool Hidden
 				if (_sheet != null)
 				{
 					XSSFWorkbook wb = (XSSFWorkbook)_sheet.Workbook;
-					wb.SetSheetHidden(SheetIndex(wb), value ? NPOI.SS.UserModel.SheetState.Hidden : NPOI.SS.UserModel.SheetState.Visible);
+					wb.SetSheetVisibility(SheetIndex(wb), value ? NPOI.SS.UserModel.SheetVisibility.Hidden: NPOI.SS.UserModel.SheetVisibility.Visible);
 				}
 			}
 		}