Merge pull request #27 from fahadadeel/main

Upgrade Open XML SDK to version 3.2.0
fileformat-cells · Jan 20, 2025 · 16ab6fa · 16ab6fa
2 parents 82364f4 + 49ea78b
commit 16ab6fa
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/CLA.md b/CLA.md
diff --git a/FileFormat.Cells/FileFormat.Cells.csproj b/FileFormat.Cells/FileFormat.Cells.csproj
@@ -22,6 +22,6 @@
 
 
 	<ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
   </ItemGroup>
 </Project>
diff --git a/FileFormat.Cells/Workbook.cs b/FileFormat.Cells/Workbook.cs
@@ -650,7 +650,7 @@ public void Save()
         public void Save(string filePath)
         {
             this.workbookpart.Workbook.Save();
-            this.spreadsheetDocument.Close();
+            this.spreadsheetDocument.Dispose();
 
             File.WriteAllBytes(filePath, this.ms.ToArray()); // Write the MemoryStream back to the file
         }
@@ -663,7 +663,7 @@ public void Save(Stream stream)
 
             var clonedDocument = this.spreadsheetDocument.Clone(stream);
             workbookpart.Workbook.Save();
-            spreadsheetDocument.Close();
+            spreadsheetDocument.Dispose();
             stream.Close();
 
         }

diff --git a/FileFormat.Cells/Worksheet.cs b/FileFormat.Cells/Worksheet.cs
@@ -827,18 +827,23 @@ private ValidationRule CreateValidationRuleFromDataValidation(DataValidation dat
 
         private ValidationType DetermineValidationType(DataValidationValues openXmlType)
         {
+            var values = Enum.GetNames(typeof(DataValidationValues));
+            Console.WriteLine("Available DataValidationValues:");
+            foreach (var value in values)
+            {
+                Console.WriteLine(value);
+            }
             // Map the OpenXML DataValidationValues to your ValidationType enum
             // This mapping depends on how closely your ValidationType enum aligns with OpenXML's types
             // Example mapping:
-            switch (openXmlType)
+            switch (openXmlType.ToString()) // If DataValidationValues is now a string enum
             {
-                case DataValidationValues.List:
+                case "List":
                     return ValidationType.List;
-                case DataValidationValues.Custom:
+                case "Custom":
                     return ValidationType.CustomFormula;
-                // Map other types...
                 default:
-                    throw new NotImplementedException("Validation type not supported.");
+                    throw new NotImplementedException($"Validation type '{openXmlType}' not supported.");
             }
         }
 

diff --git a/FileFormat.Cells_Tests/FileFormat.Cells_Tests.csproj b/FileFormat.Cells_Tests/FileFormat.Cells_Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.2.0" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Aspose Pty Ltd
+Copyright (c) 2025 Aspose Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal