Skip to content
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

Fixed the "fix" #1831

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Fixed the "fix" #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca4c01
Fixed the "fix"
OssianEPPlus Jan 29, 2025
aedf6e1
Added test that can be run anywhere
OssianEPPlus Jan 29, 2025
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
12 changes: 6 additions & 6 deletions src/EPPlus/Core/Worksheet/WorksheetCopyHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@ internal static ExcelWorksheet Copy(ExcelWorksheets targetWorksheets, string nam
CopyPivotTable(sourceWorksheet, targetWorksheet);
}

//Copy dfx styles used in conditional formatting.
if (!(sourceWorksheet.Workbook == targetWorksheet.Workbook))
{
CopyDxfStyles(sourceWorksheet, targetWorksheet);
}

if (sourceWorksheet.Names.Count > 0)
{
CopySheetNames(sourceWorksheet, targetWorksheet);
Expand All @@ -132,6 +126,12 @@ internal static ExcelWorksheet Copy(ExcelWorksheets targetWorksheets, string nam
}
}

//Copy dfx styles used in conditional formatting.
if (!(sourceWorksheet.Workbook == targetWorksheet.Workbook))
{
CopyDxfStyles(sourceWorksheet, targetWorksheet);
}

//Copy the VBA code

if (pck.Workbook.VbaProject == null)
Expand Down
59 changes: 58 additions & 1 deletion src/EPPlusTest/ConditionalFormatting/ConditionalFormattingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2240,7 +2240,7 @@ public void MultipleConditionalFormattingRangesShouldBeReadCorrectlyAfterSave()
var sheet = p2.Workbook.Worksheets[0];
SaveWorkbook("cf_severalCFReadSave2.xlsx", p2);

using(var p3 = new ExcelPackage(p2.Stream))
using (var p3 = new ExcelPackage(p2.Stream))
{
var sheet2 = p3.Workbook.Worksheets[0];
Assert.AreEqual(2, sheet2.ConditionalFormatting.Count);
Expand All @@ -2262,5 +2262,62 @@ protected static void SaveAndCleanup(ExcelPackage pck, bool disposePackage = tru
pck.Dispose();
}
}

[TestMethod]
public void CopyingDxfs()
{
using (var p = OpenPackage("CF_DxfStyleCopying.xlsx", true))
{
var ws = p.Workbook.Worksheets.Add("SomeWorksheet");

ws.Cells["A1:A5"].Formula = "ROW()+5";

var cf = ws.Cells["A1:A5"].ConditionalFormatting.AddBetween();
cf.Formula = "8";
cf.Formula2 = "11";

cf.Style.Fill.PatternType = ExcelFillStyle.Solid;
cf.Style.Fill.BackgroundColor.Color = Color.RoyalBlue;

cf.Style.Fill.BackgroundColor.Color = Color.RoyalBlue;
using (var p2 = OpenPackage("CF_DxfStyleCopyingWithCopies.xlsx", true))
{
p2.Workbook.Worksheets.Add("Sheet1", ws);
SaveAndCleanup(p2);
}
SaveAndCleanup(p);
}
}

[TestMethod]
public void CopyingDxfsSaveBetween()
{
using (var p = OpenPackage("CF_DxfStyleCopying_SaveBetween.xlsx", true))
{
var ws = p.Workbook.Worksheets.Add("SomeWorksheet");

ws.Cells["A1:A5"].Formula = "ROW()+5";

var cf = ws.Cells["A1:A5"].ConditionalFormatting.AddBetween();
cf.Formula = "8";
cf.Formula2 = "11";

cf.Style.Fill.PatternType = ExcelFillStyle.Solid;
cf.Style.Fill.BackgroundColor.Color = Color.RoyalBlue;
SaveAndCleanup(p);
}


using (var p2 = OpenPackage("CF_DxfStyleCopyingWithCopies_SaveBetween.xlsx", true))
{
using (var p = OpenPackage("CF_DxfStyleCopying_SaveBetween.xlsx", false))
{
var ws = p.Workbook.Worksheets[0];
p2.Workbook.Worksheets.Add("Sheet1", ws);
}

SaveAndCleanup(p2);
}
}
}
}