use CellValue instead of InnerText

skbkontur · Apr 29, 2022 · 5602541 · 5602541
1 parent 69b22f4
commit 5602541
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Excel.TemplateEngine/ObjectPrinting/LazyParse/LazyRowReader.cs b/Excel.TemplateEngine/ObjectPrinting/LazyParse/LazyRowReader.cs
@@ -69,14 +69,14 @@ public SimpleCell TryReadCell([NotNull] ICellPosition cellPosition)
         private SimpleCell ToSimpleCell([NotNull] Cell cell)
         {
             var cellIndex = new CellPosition(cell.CellReference);
-            var cellString = cell.InnerText;
-            if (cell.DataType?.Value == CellValues.SharedString)
+            var cellValue = cell.CellValue?.InnerText;
+            if (cell.DataType?.Value == CellValues.SharedString && cellValue != null)
             {
-                var i = int.Parse(cell.InnerText);
-                cellString = sharedStrings[i];
+                var i = int.Parse(cellValue);
+                cellValue = sharedStrings[i];
             }
 
-            return new SimpleCell(cellIndex, cellString);
+            return new SimpleCell(cellIndex, cellValue);
         }
 
         public void Dispose()

diff --git a/Excel.TemplateEngine/ObjectPrinting/LazyParse/SimpleCell.cs b/Excel.TemplateEngine/ObjectPrinting/LazyParse/SimpleCell.cs
@@ -6,7 +6,7 @@ namespace SkbKontur.Excel.TemplateEngine.ObjectPrinting.LazyParse
 {
     public class SimpleCell
     {
-        public SimpleCell([NotNull] ICellPosition cellPosition, [NotNull] string cellValue)
+        public SimpleCell([NotNull] ICellPosition cellPosition, [CanBeNull] string cellValue)
         {
             CellPosition = cellPosition;
             CellValue = cellValue;
@@ -15,7 +15,7 @@ public SimpleCell([NotNull] ICellPosition cellPosition, [NotNull] string cellVal
         [NotNull]
         public ICellPosition CellPosition { get; }
 
-        [NotNull]
+        [CanBeNull]
         public string CellValue { get; }
     }
 }