2.4.2

mustaddon · Feb 2, 2024 · fba3b53 · fba3b53
1 parent 0a6f811
commit fba3b53
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/ArrayToExcel/ArrayToExcel.csproj b/ArrayToExcel/ArrayToExcel.csproj
@@ -6,9 +6,9 @@
     <Nullable>enable</Nullable>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ArrayToExcel.snk</AssemblyOriginatorKeyFile>
-	<AssemblyVersion>2.4.1</AssemblyVersion>
-    <FileVersion>2.4.1</FileVersion>
-    <Version>2.4.1</Version>
+	<AssemblyVersion>2.4.2</AssemblyVersion>
+    <FileVersion>2.4.2</FileVersion>
+    <Version>2.4.2</Version>
 	<Company></Company>
     <Authors>Leonid Salavatov</Authors>
     <Copyright>Leonid Salavatov 2024</Copyright>

diff --git a/ArrayToExcel/CellDefault.cs b/ArrayToExcel/CellDefault.cs
@@ -8,7 +8,7 @@ namespace ArrayToExcel;
 
 public class CellDefault(object? value) : ICellValue
 {
-    public void Apply(Cell cell, uint row) => Apply(cell, value);
+    public virtual void Apply(Cell cell, uint row) => Apply(cell, value);
 
     internal static void Apply(Cell cell, object? value)
     {
@@ -17,7 +17,7 @@ internal static void Apply(Cell cell, object? value)
         cell.StyleIndex = cell.DataType == CellValues.Date ? 2 : 4u;
     }
 
-    internal static CellValue GetCellValue(object? value)
+    static CellValue GetCellValue(object? value)
     {
         if (value == null) return new();
 
@@ -50,7 +50,7 @@ internal static string NormCellText(string value)
         return RegularExpressions.InvalidXmlChars().Replace(value.Length > _maxCellText ? value.Substring(0, _maxCellText) : value, string.Empty);
     }
 
-    internal static CellValues GetCellType(object? value)
+    static CellValues GetCellType(object? value)
     {
         var type = value?.GetType() ?? typeof(object);
 

diff --git a/ArrayToExcel/CellFormula.cs b/ArrayToExcel/CellFormula.cs
@@ -8,7 +8,7 @@ public class CellFormula(Func<uint, string, string> cellText) : ICellValue
     public CellFormula(Func<uint, string> rowText) : this((row, cell) => rowText(row)) { }
     public CellFormula(string text) : this((row, col) => text) { }
 
-    public void Apply(Cell cell, uint row)
+    public virtual void Apply(Cell cell, uint row)
     {
         cell.CellFormula = new DocumentFormat.OpenXml.Spreadsheet.CellFormula(cellText(row, cell.CellReference!));
         cell.StyleIndex = 4;

diff --git a/ArrayToExcel/CellHyperlink.cs b/ArrayToExcel/CellHyperlink.cs
@@ -8,7 +8,7 @@ public class CellHyperlink(string link, string? text = null) : ICellValue
     public CellHyperlink(Uri link, string? text = null)
         : this(link.ToString(), text ?? link.OriginalString) { }
 
-    public void Apply(Cell cell, uint row)
+    public virtual void Apply(Cell cell, uint row)
     {
         cell.CellFormula = new DocumentFormat.OpenXml.Spreadsheet.CellFormula(_format.Value);
         cell.StyleIndex = 3;

diff --git a/ArrayToExcel/CellPercent.cs b/ArrayToExcel/CellPercent.cs
@@ -2,12 +2,11 @@
 
 namespace ArrayToExcel;
 
-public class CellPercent(object? value) : ICellValue
+public class CellPercent(object? value) : CellDefault(value)
 {
-    public void Apply(Cell cell, uint row)
+    public override void Apply(Cell cell, uint row)
     {
-        cell.CellValue = CellDefault.GetCellValue(value);
-        cell.DataType = CellDefault.GetCellType(value);
+        base.Apply(cell, row);
         cell.StyleIndex = 5;
     }
 }
diff --git a/ArrayToExcel/CellText.cs b/ArrayToExcel/CellText.cs
@@ -5,7 +5,7 @@ namespace ArrayToExcel;
 
 public class CellText(string? value, bool wrap = false) : ICellValue
 {
-    public void Apply(Cell cell, uint row) => Apply(cell, value, wrap);
+    public virtual void Apply(Cell cell, uint row) => Apply(cell, value, wrap);
 
     internal static void Apply(Cell cell, string? value, bool wrap)
     {