Skip to content

Commit 2193707

Browse files
authored
Upgrade to ClosedXML 0.102 (#322)
* Upgrade to ClosedXML 0.102 * Drop needless SetCalcEngineCacheExpressions as it uses inaccessible field
1 parent a530ce9 commit 2193707

File tree

5 files changed

+11
-22
lines changed

5 files changed

+11
-22
lines changed

ClosedXML.Report/ClosedXML.Report.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="ClosedXML" Version="0.101.0" />
40+
<PackageReference Include="ClosedXML" Version="0.102.0" />
4141
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
4242
<PackageReference Include="morelinq" Version="3.4.1" />
4343
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.0" />

ClosedXML.Report/Excel/TempSheetBuffer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ private void Init()
3333
if (!_wb.TryGetWorksheet(SheetName, out _sheet))
3434
{
3535
_sheet = _wb.AddWorksheet(SheetName);
36-
_sheet.SetCalcEngineCacheExpressions(false);
3736
}
3837
_sheet.Visibility = XLWorksheetVisibility.VeryHidden;
3938
}

ClosedXML.Report/Excel/XlExtensions.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,6 @@ public static IXLCell Offset(this IXLAddress addr, IXLAddress offset)
329329
addr.ColumnNumber + offset.ColumnNumber - 1);
330330
}
331331

332-
public static void SetCalcEngineCacheExpressions(this IXLWorksheet worksheet, bool value)
333-
{
334-
var wsType = worksheet.GetType();
335-
var calcEngine = wsType.GetProperty("CalcEngine", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(worksheet, new object[] { });
336-
calcEngine.GetType().GetProperty("CacheExpressions").SetValue(calcEngine, value, new object[] { });
337-
}
338-
339332
/* ClosedXML issue #686 */
340333
public static void ReplaceCFFormulaeToR1C1(this IXLWorksheet worksheet)
341334
{

ClosedXML.Report/Options/PivotTag.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
PivotTable Options Package
33
================================================
4-
OPTION PARAMS OBJECTS
4+
OPTION PARAMS OBJECTS
55
================================================
6-
"Pivot" "Name=" Range
6+
"Pivot" "Name=" Range
77
"Dst="
88
"RowGrand"
99
"ColumnGrand"
@@ -15,10 +15,10 @@ OPTION PARAMS OBJECTS
1515
"AutofitColumns"
1616
"NoSort"
1717
18-
"Data" Column
19-
"Row" Column
20-
"Column" Column
21-
"Page" Column
18+
"Data" Column
19+
"Row" Column
20+
"Column" Column
21+
"Page" Column
2222
================================================
2323
*/
2424

@@ -200,9 +200,9 @@ private IXLPivotTable CreatePivot(PivotTag pivot, ProcessingContext context, XLP
200200
pt.PreserveCellFormatting = !pivot.HasParameter("NoPreserveFormatting");
201201
pt.ShowGrandTotalsColumns = pivot.HasParameter("ColumnGrand");
202202
pt.ShowGrandTotalsRows = pivot.HasParameter("RowGrand");
203-
pt.SaveSourceData = true;
203+
pt.PivotCache.SaveSourceData = true;
204204
pt.FilterAreaOrder = XLFilterAreaOrder.DownThenOver;
205-
pt.RefreshDataOnOpen = true;
205+
pt.PivotCache.RefreshDataOnOpen = true;
206206
return pt;
207207
}
208208

ClosedXML.Report/RangeInterpreter.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,9 @@ string EvalString(string str)
193193
}
194194

195195
// refresh ranges for pivot tables
196-
foreach (var pt in range.Worksheet.Workbook.Worksheets.SelectMany(sh => sh.PivotTables))
196+
foreach (var pivotCache in range.Worksheet.Workbook.PivotCaches)
197197
{
198-
if (pt.SourceRange.Intersects(growedRange))
199-
{
200-
pt.SourceRange = growedRange.Offset(-1, 1, growedRange.RowCount() + 1, growedRange.ColumnCount() - 1);
201-
}
198+
pivotCache.Refresh();
202199
}
203200
}
204201
}

0 commit comments

Comments
 (0)