Skip to content

Fixes issue 2069 #2070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop8
Choose a base branch
from
Open

Fixes issue 2069 #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/EPPlus/FormulaParsing/Excel/Functions/RefAndLookup/GetPivotData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,10 @@ private bool GetPivotTable(IRangeInfo ri, out ExcelPivotTable pivotTable)
var adr = ri.Address;
foreach (var pt in ws.PivotTables)
{
if (pt.Address.Collide(adr.FromRow, adr.FromCol, adr.ToRow, adr.ToCol)!=ExcelAddressBase.eAddressCollition.No)
var pfCount = pt.PageFields.Count;
if (pfCount > 0) pfCount++;
var ptAddress = new ExcelAddressBase(adr.FromRow <= pfCount + 1 ? 1 : adr.FromRow - pfCount, adr.FromCol, adr.ToRow, adr.ToCol);
if (ptAddress.Collide(adr.FromRow, adr.FromCol, adr.ToRow, adr.ToCol)!=ExcelAddressBase.eAddressCollition.No)
{
pivotTable = pt;
return true;
Expand Down
27 changes: 12 additions & 15 deletions src/EPPlusTest/Issues/PivotTableIssues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,21 +523,6 @@ public void s907()

SaveAndCleanup(package);
}


//using (var package = new ExcelPackage(new FileInfo(@"C:\Websites\EPPlusTest\GWTemplateSavedWithoutChanges.xlsx")))
//{
// var firstDataRow = 2;
// var ws = package.Workbook.Worksheets["Raw Data"];


// var firstRowToDelete = firstDataRow + 1;
// ws.DeleteRow(firstRowToDelete, ExcelPackage.MaxRows - firstRowToDelete + 1);
// ws.Cells[firstDataRow, 1].Value = "123456";


// File.WriteAllBytes(@"C:\Websites\EPPlusTest\GWResultSuccess.xlsx", package.GetAsByteArray());
//}
}
[TestMethod]
public void s907_2()
Expand Down Expand Up @@ -606,5 +591,17 @@ static void LoadSomeData(ExcelWorksheet ws, OfficeOpenXml.Table.ExcelTable t)

t.DeleteRow(0); // delete 1st/template row
}
[TestMethod]
public void s919()
{
using (var p = OpenTemplatePackage("s919.xlsx"))
{
var ws = p.Workbook.Worksheets["Aico Data"];
ws.Calculate();

Assert.AreEqual(123D ,ws.Cells["C37"].Value);
Assert.AreEqual(123D, ws.Cells["D38"].Value);
}
}
}
}