Code cleanup. Better comments, expression bodied properties...

ClosedXML · Sep 25, 2023 · ed21269 · ed21269
1 parent a35d338
commit ed21269
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/ClosedXML/Excel/CalcEngine/DependencyTree.cs b/ClosedXML/Excel/CalcEngine/DependencyTree.cs
@@ -84,8 +84,7 @@ internal static DependencyTree CreateFrom(XLWorkbook workbook)
                     }
                     else
                     {
-                        // TODO
-                        throw new NotSupportedException();
+                        // TODO: Implement other formulas. Don't throw on data table or shared formulas.
                     }
                 }
             }
@@ -142,7 +141,7 @@ internal void RemoveFormula(XLCellFormula formula)
             }
         }
 
-        public void AddSheetTree(IXLWorksheet sheet)
+        internal void AddSheetTree(IXLWorksheet sheet)
         {
             _sheetTrees.Add(sheet.Name, new SheetDependencyTree());
         }

diff --git a/ClosedXML/Excel/CalcEngine/XLCalculationChain.cs b/ClosedXML/Excel/CalcEngine/XLCalculationChain.cs
@@ -82,9 +82,9 @@ internal static XLCalculationChain CreateFrom(XLWorkbook wb)
             foreach (var sheet in wb.WorksheetsInternal)
             {
                 var formulaSlice = sheet.Internals.CellsCollection.FormulaSlice;
-                using var e = formulaSlice.GetEnumerator(XLSheetRange.Full);
+                using var e = formulaSlice.GetForwardEnumerator(XLSheetRange.Full);
                 while (e.MoveNext())
-                    chain.AddLast(new XLBookPoint(sheet.SheetId, e.Current));
+                    chain.AddLast(new XLBookPoint(sheet.SheetId, e.Point));
             }
 
             return chain;

diff --git a/ClosedXML/Excel/Cells/XLCell.cs b/ClosedXML/Excel/Cells/XLCell.cs
@@ -1061,19 +1061,7 @@ public IXLCell AddToNamed(string rangeName, XLScope scope, string comment)
         /// <summary>
         /// Flag indicating that previously calculated cell value may be not valid anymore and has to be re-evaluated.
         /// </summary>
-        public bool NeedsRecalculation
-        {
-            get
-            {
-                if (Formula is null)
-                {
-                    return false;
-                }
-
-                return Formula.IsDirty;
-//                return Formula.NeedsRecalculation(this);
-            }
-        }
+        public bool NeedsRecalculation => Formula is not null && Formula.IsDirty;
 
         public XLCellValue CachedValue => SliceCellValue;
 

diff --git a/ClosedXML/Excel/IXLWorksheet.cs b/ClosedXML/Excel/IXLWorksheet.cs
@@ -447,7 +447,7 @@ public interface IXLWorksheet : IXLRangeBase, IXLProtectable<IXLSheetProtection,
         XLCellValue Evaluate(String expression, string formulaAddress = null);
 
         /// <summary>
-        /// Force recalculation of all cell formulas in the sheet while leaving other sheets without change, even if they are dirty.
+        /// Force recalculation of all cell formulas in the sheet while leaving other sheets without change, even if their dirty cells.
         /// </summary>
         void RecalculateAllFormulas();
 

diff --git a/ClosedXML/Excel/Ranges/XLRangeBase.cs b/ClosedXML/Excel/Ranges/XLRangeBase.cs
@@ -125,12 +125,11 @@ public String FormulaArrayA1
                 // If formula evaluates to a text, it is stored directly in a worksheet, not in SST. Thus
                 // when the switch to formula happens, disable shared string and enable when formula is removed.
                 var valueSlice = Worksheet.Internals.CellsCollection.ValueSlice;
-                var clearFormula = value is null;
                 for (var row = range.TopRow; row <= range.BottomRow; ++row)
                 {
                     for (var col = range.LeftColumn; col <= range.RightColumn; ++col)
                     {
-                        valueSlice.SetShareString(new XLSheetPoint(row, col), clearFormula);
+                        valueSlice.SetShareString(new XLSheetPoint(row, col), false);
                     }
                 }