Upgrade to ClosedXML 0.102 (#322)

* Upgrade to ClosedXML 0.102 * Drop needless SetCalcEngineCacheExpressions as it uses inaccessible field
ClosedXML · Jul 27, 2023 · 2193707 · 2193707
1 parent a530ce9
commit 2193707
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 22 deletions.
diff --git a/ClosedXML.Report/ClosedXML.Report.csproj b/ClosedXML.Report/ClosedXML.Report.csproj
@@ -37,7 +37,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClosedXML" Version="0.101.0" />
+    <PackageReference Include="ClosedXML" Version="0.102.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="morelinq" Version="3.4.1" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.0" />

diff --git a/ClosedXML.Report/Excel/TempSheetBuffer.cs b/ClosedXML.Report/Excel/TempSheetBuffer.cs
@@ -33,7 +33,6 @@ private void Init()
                 if (!_wb.TryGetWorksheet(SheetName, out _sheet))
                 {
                     _sheet = _wb.AddWorksheet(SheetName);
-                    _sheet.SetCalcEngineCacheExpressions(false);
                 }
                 _sheet.Visibility = XLWorksheetVisibility.VeryHidden;
             }

diff --git a/ClosedXML.Report/Excel/XlExtensions.cs b/ClosedXML.Report/Excel/XlExtensions.cs
@@ -329,13 +329,6 @@ public static IXLCell Offset(this IXLAddress addr, IXLAddress offset)
                 addr.ColumnNumber + offset.ColumnNumber - 1);
         }
 
-        public static void SetCalcEngineCacheExpressions(this IXLWorksheet worksheet, bool value)
-        {
-            var wsType = worksheet.GetType();
-            var calcEngine = wsType.GetProperty("CalcEngine", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(worksheet, new object[] { });
-            calcEngine.GetType().GetProperty("CacheExpressions").SetValue(calcEngine, value, new object[] { });
-        }
-
         /* ClosedXML issue #686 */
         public static void ReplaceCFFormulaeToR1C1(this IXLWorksheet worksheet)
         {

diff --git a/ClosedXML.Report/Options/PivotTag.cs b/ClosedXML.Report/Options/PivotTag.cs
@@ -1,9 +1,9 @@
 /*
 PivotTable Options Package
 ================================================
-OPTION          PARAMS                OBJECTS   
+OPTION          PARAMS                OBJECTS
 ================================================
-"Pivot"          "Name="              Range     
+"Pivot"          "Name="              Range
                  "Dst="
                  "RowGrand"
                  "ColumnGrand"
@@ -15,10 +15,10 @@ OPTION          PARAMS                OBJECTS
                  "AutofitColumns"
                  "NoSort"
 
-"Data"                                Column    
-"Row"                                 Column    
-"Column"                              Column    
-"Page"                                Column    
+"Data"                                Column
+"Row"                                 Column
+"Column"                              Column
+"Page"                                Column
 ================================================
 */
 
@@ -200,9 +200,9 @@ private IXLPivotTable CreatePivot(PivotTag pivot, ProcessingContext context, XLP
             pt.PreserveCellFormatting = !pivot.HasParameter("NoPreserveFormatting");
             pt.ShowGrandTotalsColumns = pivot.HasParameter("ColumnGrand");
             pt.ShowGrandTotalsRows = pivot.HasParameter("RowGrand");
-            pt.SaveSourceData = true;
+            pt.PivotCache.SaveSourceData = true;
             pt.FilterAreaOrder = XLFilterAreaOrder.DownThenOver;
-            pt.RefreshDataOnOpen = true;
+            pt.PivotCache.RefreshDataOnOpen = true;
             return pt;
         }
 

diff --git a/ClosedXML.Report/RangeInterpreter.cs b/ClosedXML.Report/RangeInterpreter.cs
@@ -193,12 +193,9 @@ string EvalString(string str)
                     }
 
                     // refresh ranges for pivot tables
-                    foreach (var pt in range.Worksheet.Workbook.Worksheets.SelectMany(sh => sh.PivotTables))
+                    foreach (var pivotCache in range.Worksheet.Workbook.PivotCaches)
                     {
-                        if (pt.SourceRange.Intersects(growedRange))
-                        {
-                            pt.SourceRange = growedRange.Offset(-1, 1, growedRange.RowCount() + 1, growedRange.ColumnCount() - 1);
-                        }
+                        pivotCache.Refresh();
                     }
                 }
             }