Merge branch 'develop7_2' into feature/copy-drawings

# Conflicts:
#	src/EPPlus/Drawing/Controls/ExcelControlWithText.cs

src/EPPlus/Drawing/Controls/ExcelControlWithText.cs

@@ -27,21 +27,10 @@ public abstract class ExcelControlWithText : ExcelControl
  private string _paragraphPath = "{0}xdr:txBody/a:p";
  private string _lockTextPath = "{0}@fLocksText";
  private string _textBodyPath = "{0}xdr:txBody/a:bodyPr";
- internal ExcelControlWithText(ExcelDrawings drawings, XmlNode drawingNode, ControlInternal control, ZipPackagePart part, XmlDocument ctrlPropXml, ExcelGroupShape parent = null) :
+ internal ExcelControlWithText(ExcelDrawings drawings, XmlNode drawingNode, ControlInternal control, ZipPackagePart part, XmlDocument ctrlPropXml, ExcelGroupShape parent = null) : 
  base(drawings, drawingNode, control, part, ctrlPropXml, parent)
  {
- if (TopNode.LocalName == "sp")
- {
- _paragraphPath = string.Format(_paragraphPath, "");
- _lockTextPath = string.Format(_lockTextPath, "");
- _textBodyPath = string.Format(_textBodyPath, "");
- }
- else
- {
- _paragraphPath = string.Format(_paragraphPath, "xdr:sp/");
- _lockTextPath = string.Format(_lockTextPath, "xdr:sp/");
- _textBodyPath = string.Format(_textBodyPath, "xdr:sp/");
- }
+ InitPaths();
  }
 
  internal ExcelControlWithText(ExcelDrawings drawings, XmlElement drawNode, string name, ExcelGroupShape parent = null) :