Copy drawings on ranges

src/EPPlus/Core/RangeCopyHelper.cs

@@ -24,6 +24,7 @@
 using OfficeOpenXml.Utils;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Xml;
 using static OfficeOpenXml.ExcelAddressBase;
@@ -94,10 +95,31 @@ internal void Copy()
  CopyMergedCells(copiedMergedCells);
  }
 
+ if (EnumUtil.HasNotFlag(_copyOptions, ExcelRangeCopyOptionFlags.ExcludeDrawings))
+ {
+ CopyDrawings();
+ }
+
  CopyFullColumn();
  CopyFullRow();
  }
 
+ private void CopyDrawings()
+ {
+ foreach(var drawing in _sourceRange._worksheet.Drawings.ToList())
+ {
+ var drawingRange = new ExcelAddress(drawing.From.Row+1, drawing.From.Column+1, drawing.To.Row+1, drawing.To.Column + 1);
+ if (_sourceRange.Intersect(drawingRange) != null )
+ {
+ var row = drawingRange._fromRow - _sourceRange._fromRow;
+ row = _destination._fromRow + row - 1;
+ var col = drawingRange._fromCol - _sourceRange._fromCol;
+ col = _destination._fromCol + col - 1;
+ drawing.Copy(_destination.Worksheet, row, col);
+ }
+ }
+ }
+
  private void CopyDataValidations()
  {
  foreach (var idv in _sourceRange._worksheet.DataValidations)

src/EPPlus/Drawing/ExcelDrawing.cs

@@ -1334,9 +1334,17 @@ internal XmlElement CreateClientData()
  }
 
 
- public void Copy(ExcelWorksheet worksheet, int row, int col, int rowOffset = 0, int colOffset = 0)
+ public void Copy(ExcelWorksheet worksheet, int row, int col, int rowOffset = int.MinValue, int colOffset = int.MinValue)
  {
  XmlNode drawNode = null;
+ if(rowOffset == int.MinValue)
+ {
+ rowOffset = From.RowOff / 9525;
+ }
+ if(colOffset == int.MinValue)
+ {
+ colOffset = From.ColumnOff / 9525;
+ }
  switch (DrawingType)
  {
  case eDrawingType.Shape:
@@ -1356,7 +1364,7 @@ public void Copy(ExcelWorksheet worksheet, int row, int col, int rowOffset = 0,
  break;
  case eDrawingType.GroupShape:
  drawNode = CopyGroupShape(worksheet);
- break; ;
+ break;
  }
  //Set position of the drawing copy.
  var copy = GetDrawing(worksheet._drawings, drawNode);
@@ -1574,22 +1582,22 @@ private XmlNode CopyControl(ExcelWorksheet worksheet, int row, int col, int rowO
  //Create the copy
  var copy = GetDrawing(worksheet._drawings, drawNode);
  copy.EditAs = ExcelControl.GetControlEditAs(control.ControlType);
- //var width = GetPixelWidth();
- //var height = GetPixelHeight();
- //copy.SetPixelWidth(width);
- //copy.SetPixelHeight(height);
- //copy.SetPosition(row, rowOffset, col, colOffset);
- //worksheet._drawings.AddDrawingInternal(copy);
+ var width = GetPixelWidth();
+ var height = GetPixelHeight();
+ copy.SetPosition(row, rowOffset, col, colOffset);
+ copy.SetPixelWidth(width);
+ copy.SetPixelHeight(height);
+ copy.GetPositionSize();
 
  //Update position in worksheet xml
  var fromCol = controlNode.SelectSingleNode("d:control/d:controlPr/d:anchor/d:from/xdr:col", worksheet.NameSpaceManager);
  var fromColOff = controlNode.SelectSingleNode("d:control/d:controlPr/d:anchor/d:from/xdr:colOff", worksheet.NameSpaceManager);
  var fromRow = controlNode.SelectSingleNode("d:control/d:controlPr/d:anchor/d:from/xdr:row", worksheet.NameSpaceManager);
  var fromRowOff = controlNode.SelectSingleNode("d:control/d:controlPr/d:anchor/d:from/xdr:rowOff", worksheet.NameSpaceManager);
- fromCol.InnerText = col.ToString();
- fromColOff.InnerText = colOffset.ToString();
- fromRow.InnerText = row.ToString();
- fromRowOff.InnerText = rowOffset.ToString();
+ fromCol.InnerText = copy.From.Column.ToString();
+ fromColOff.InnerText = copy.From.ColumnOff.ToString();
+ fromRow.InnerText = copy.From.Row.ToString();
+ fromRowOff.InnerText = copy.From.RowOff.ToString();
  var toCol = controlNode.SelectSingleNode("d:control/d:controlPr/d:anchor/d:to/xdr:col", worksheet.NameSpaceManager);
  var toColOff = controlNode.SelectSingleNode("d:control/d:controlPr/d:anchor/d:to/xdr:colOff", worksheet.NameSpaceManager);
  var toRow = controlNode.SelectSingleNode("d:control/d:controlPr/d:anchor/d:to/xdr:row", worksheet.NameSpaceManager);
@@ -1743,10 +1751,5 @@ private XmlNode CopyShape(ExcelWorksheet worksheet, bool isGroupShape = false, X
  WorksheetCopyHelper.CopyBlipFillDrawing(worksheet, worksheet._drawings.Part, worksheet._drawings.DrawingXml, this, sourceShape.Fill, worksheet._drawings.Part.Uri);
  return drawNode;
  }
-
- public void Copy(ExcelRangeBase range, int rowOffset = 0, int colOffset = 0)
- {
-
- }
  }
 }

src/EPPlus/ExcelRangeCopyOptionFlags.cs

@@ -60,5 +60,9 @@ public enum ExcelRangeCopyOptionFlags : int
  /// Transpose the copied data
  /// </summary>
  Transpose = 0x200,
+ /// <summary>
+ /// Exclude drawings from being copied
+ /// </summary>
+ ExcludeDrawings = 0x400,
  }
 }

src/EPPlusTest/Drawing/CopyDrawingTests.cs

@@ -267,5 +267,15 @@ public void CopyPivotSlicerSameWorksheet()
  Assert.AreEqual(4, ws3.Drawings.Count);
  SaveAndCleanup(p);
  }
+
+ //Copy Range
+ [TestMethod]
+ public void CopyDrawingsRange()
+ {
+ using var p = OpenTemplatePackage("CopyDrawings.xlsx");
+ var ws3 = p.Workbook.Worksheets[2];
+ ws3.Cells["A1:Z50"].Copy(ws3.Cells["AA1:AZ50"]);
+ SaveAndCleanup(p);
+ }
  }
 }