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

Jump to bottom

Feature/copy drawings #1472

Merged
merged 18 commits into from
Jun 10, 2024
Merged

Feature/copy drawings #1472

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
eb66df5
copyDrawings progress
AdrianEPPlus May 10, 2024
ead1695
CopyCharts are working now...
AdrianEPPlus May 13, 2024
91900a3
Copy drawings
AdrianEPPlus May 13, 2024
367eee5
copy control vml
AdrianEPPlus May 14, 2024
0eb9647
copy drawing controls progress
AdrianEPPlus May 15, 2024
ca5b923
Copy slicers & fixing copy issues.
AdrianEPPlus May 20, 2024
7a608e9
Fixed issues with copying drawings
AdrianEPPlus May 21, 2024
e565eae
renamed some variables
AdrianEPPlus May 21, 2024
6a6c685
Refactor copy drawings code
AdrianEPPlus May 22, 2024
2939d8f
copy drawing control
AdrianEPPlus May 22, 2024
b567323
Groupshape copy progress.
AdrianEPPlus May 23, 2024
de2b630
fixed copy slicer issue
AdrianEPPlus May 29, 2024
2a217eb
fixed smaller issues with slicer copy
AdrianEPPlus May 30, 2024
7158996
Fixed settings new name to copied drawings and tests
AdrianEPPlus May 30, 2024
0e068cc
Merge branch 'develop7_2' into feature/copy-drawings
AdrianEPPlus May 30, 2024
a89faa7
Pivot table slicer progress
AdrianEPPlus May 31, 2024
5c6edda
Fixed slicer issues.
AdrianEPPlus May 31, 2024
91000eb
Copy drawings on ranges
AdrianEPPlus Jun 3, 2024
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
Prev Previous commit
Next Next commit
fixed smaller issues with slicer copy
  • Loading branch information
@AdrianEPPlus
AdrianEPPlus committed May 30, 2024
commit 2a217eb44d15f7c4fe7fe38fccafbee7b94f2753
17 changes: 10 additions & 7 deletions src/EPPlus/Drawing/ExcelDrawing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,10 +1436,9 @@ private XmlNode CopySlicer(ExcelWorksheet worksheet, bool isGroupShape = false,
}

//Create copy of source worksheet node in target worksheet.xml
XmlNode wsSlicerNode = null;
XmlNode wsSlicerNode = worksheet.TopNode.SelectSingleNode("d:extLst/d:ext/x14:slicerList/x14:slicer", worksheet.NameSpaceManager);
if (worksheet != _drawings.Worksheet)
{
wsSlicerNode = worksheet.TopNode.SelectSingleNode("d:extLst/d:ext/x14:slicerList/x14:slicer", worksheet.NameSpaceManager);
if (wsSlicerNode == null)
{
((XmlElement)worksheet.TopNode).SetAttribute("xmlns:x14", ExcelPackage.schemaMainX14); //Make sure the namespace exists
Expand All @@ -1450,9 +1449,17 @@ private XmlNode CopySlicer(ExcelWorksheet worksheet, bool isGroupShape = false,

////Set Name in drawingXML
var drawNodeName = drawNode.SelectSingleNode("mc:AlternateContent/mc:Choice/xdr:graphicFrame/xdr:nvGraphicFramePr/xdr:cNvPr", worksheet._drawings.NameSpaceManager);
if(drawNodeName == null && isGroupShape)
{
drawNodeName = drawNode.SelectSingleNode("mc:Choice/xdr:graphicFrame/xdr:nvGraphicFramePr/xdr:cNvPr", worksheet._drawings.NameSpaceManager);
}
var drawNodeNameValue = drawNodeName.Attributes["name"].Value + " " + worksheet.Workbook._nextDrawingId++;
drawNodeName.Attributes["name"].Value = drawNodeNameValue;
var drawNodeSlicerName = drawNode.SelectSingleNode("mc:AlternateContent/mc:Choice/xdr:graphicFrame/a:graphic/a:graphicData/sle:slicer", worksheet._drawings.NameSpaceManager);
if (drawNodeSlicerName == null && isGroupShape)
{
drawNodeSlicerName = drawNode.SelectSingleNode("mc:Choice/xdr:graphicFrame/a:graphic/a:graphicData/sle:slicer", worksheet._drawings.NameSpaceManager);
}
drawNodeSlicerName.Attributes["name"].Value = drawNodeNameValue;

//Copy Slicer xml node
Expand Down Expand Up @@ -1509,16 +1516,12 @@ private XmlNode CopySlicer(ExcelWorksheet worksheet, bool isGroupShape = false,
var stream = new StreamWriter(part.GetStream(FileMode.OpenOrCreate, FileAccess.Write));
xmlTarget.Save(stream);

if (!isGroupShape && isNewPart)
if (isNewPart)
{
//Now create the new relationship between the worksheet and the slicer.
var relNode = (XmlElement)(worksheet.WorksheetXml.DocumentElement.SelectSingleNode($"d:extLst/d:ext/x14:slicerList/x14:slicer[@r:id='{xmlSource.Rel.Id}']", worksheet.NameSpaceManager));
relNode.Attributes["r:id"].Value = relationship.Id;
}
if (worksheet == _drawings.Worksheet)
{
xmlSource.XmlDocument.LastChild.AppendChild(importNode);
}
return drawNode;
}

Expand Down