#235

warning-explosive · Dec 1, 2023 · 0cab31c · 0cab31c
1 parent e6a029b
commit 0cab31c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/Modules/DataExport/DataExport.csproj b/src/Modules/DataExport/DataExport.csproj
@@ -15,7 +15,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
+        <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\Common\Basics\Basics.csproj"/>

diff --git a/src/Modules/DataImport/DataImport.csproj b/src/Modules/DataImport/DataImport.csproj
@@ -15,7 +15,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
+        <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\Common\Basics\Basics.csproj"/>

diff --git a/src/Modules/DataImport/Excel/ExcelCellValueExtractor.cs b/src/Modules/DataImport/Excel/ExcelCellValueExtractor.cs
@@ -30,19 +30,21 @@ public ExcelCellValue ExtractCellValue(
 
             string? value;
 
-            switch (cell.DataType?.Value ?? CellValues.String)
+            var cellValue = cell.DataType?.Value ?? CellValues.String;
+
+            if (cellValue.Equals(CellValues.InlineString))
+            {
+                value = cell.InnerText;
+            }
+            else if (cellValue.Equals(CellValues.SharedString))
+            {
+                value = cell.CellValue != null
+                    ? sharedStrings[int.Parse(cell.CellValue.Text, CultureInfo.InvariantCulture)]
+                    : null;
+            }
+            else
             {
-                case CellValues.InlineString:
-                    value = cell.InnerText;
-                    break;
-                case CellValues.SharedString:
-                    value = cell.CellValue != null
-                        ? sharedStrings[int.Parse(cell.CellValue.Text, CultureInfo.InvariantCulture)]
-                        : null;
-                    break;
-                default:
-                    value = cell.CellValue?.Text;
-                    break;
+                value = cell.CellValue?.Text;
             }
 
             if (value != null)