Merge pull request #1149 from EPPlusSoftware/bug/copy_fixes

OssianEPPlus · web-flow · commit 2014c6b24f32 · 2023-11-08T16:28:12.000+01:00
Fix some issues when copying worksheets
diff --git a/src/EPPlus/Core/Worksheet/WorksheetCopyHelper.cs b/src/EPPlus/Core/Worksheet/WorksheetCopyHelper.cs
diff --git a/src/EPPlus/Drawing/ExcelPicture.cs b/src/EPPlus/Drawing/ExcelPicture.cs
@@ -32,17 +32,19 @@ public sealed class ExcelPicture : ExcelDrawing, IPictureContainer
     {
 #region "Constructors"
         internal ExcelPicture(ExcelDrawings drawings, XmlNode node, Uri hyperlink, ePictureType type) :
-            base(drawings, node, "xdr:pic", "xdr:nvPicPr/xdr:cNvPr")
+            base(drawings, node, "xdr:pic/", "xdr:nvPicPr/xdr:cNvPr")
         {
+            Init();
             CreatePicNode(node,type);
             Hyperlink = hyperlink;
             Image = new ExcelImage(this);
         }
 
         internal ExcelPicture(ExcelDrawings drawings, XmlNode node, ExcelGroupShape shape = null) :
-            base(drawings, node, "xdr:pic", "xdr:nvPicPr/xdr:cNvPr", shape)
+            base(drawings, node, shape==null ? "xdr:pic/" : "", "xdr:nvPicPr/xdr:cNvPr", shape)
         {
-            XmlNode picNode = node.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip", drawings.NameSpaceManager);
+            Init();
+            XmlNode picNode = node.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip", drawings.NameSpaceManager);
             if (picNode != null && picNode.Attributes["embed", ExcelPackage.schemaRelationships] != null)
             {
                 IPictureContainer container = this;
@@ -78,14 +80,20 @@ internal ExcelPicture(ExcelDrawings drawings, XmlNode node, ExcelGroupShape shap
                 container.ImageHash = ii.Hash;
             }
         }
+        private void Init()
+        {
+            _lockAspectRatioPath = $"{_topPath}xdr:nvPicPr/xdr:cNvPicPr/a:picLocks/@noChangeAspect";
+            _preferRelativeResizePath = $"{_topPath}xdr:nvPicPr/xdr:cNvPicPr/@preferRelativeResize";
+        }
+
         private void SetRelId(XmlNode node, ePictureType type, string relID)
         {
             //Create relationship
-            node.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip/@r:embed", NameSpaceManager).Value = relID;
+            node.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip/@r:embed", NameSpaceManager).Value = relID;
             
             if (type == ePictureType.Svg)
             {
-                node.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip/a:extLst/a:ext/asvg:svgBlip/@r:embed", NameSpaceManager).Value = relID;
+                node.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip/a:extLst/a:ext/asvg:svgBlip/@r:embed", NameSpaceManager).Value = relID;
             }
         }
 
@@ -269,7 +277,7 @@ public ExcelDrawingFill Fill
             {
                 if (_fill == null)
                 {
-                    _fill = new ExcelDrawingFill(_drawings, NameSpaceManager, TopNode, "xdr:pic/xdr:spPr", SchemaNodeOrder);
+                    _fill = new ExcelDrawingFill(_drawings, NameSpaceManager, TopNode, $"{_topPath}xdr:spPr", SchemaNodeOrder);
                 }
                 return _fill;
             }
@@ -284,7 +292,7 @@ public ExcelDrawingBorder Border
             {
                 if (_border == null)
                 {
-                    _border = new ExcelDrawingBorder(_drawings, NameSpaceManager, TopNode, "xdr:pic/xdr:spPr/a:ln", SchemaNodeOrder);
+                    _border = new ExcelDrawingBorder(_drawings, NameSpaceManager, TopNode, $"{_topPath}xdr:spPr/a:ln", SchemaNodeOrder);
                 }
                 return _border;
             }
@@ -299,12 +307,12 @@ public ExcelDrawingEffectStyle Effect
             {
                 if (_effect == null)
                 {
-                    _effect = new ExcelDrawingEffectStyle(_drawings, NameSpaceManager, TopNode, "xdr:pic/xdr:spPr/a:effectLst", SchemaNodeOrder);
+                    _effect = new ExcelDrawingEffectStyle(_drawings, NameSpaceManager, TopNode, $"{_topPath}xdr:spPr/a:effectLst", SchemaNodeOrder);
                 }
                 return _effect;
             }
         }
-        const string _preferRelativeResizePath = "xdr:pic/xdr:nvPicPr/xdr:cNvPicPr/@preferRelativeResize";
+        string _preferRelativeResizePath;
         /// <summary>
         /// Relative to original picture size
         /// </summary>
@@ -319,7 +327,7 @@ public bool PreferRelativeResize
                 SetXmlNodeBool(_preferRelativeResizePath, value);
             }
         }
-        const string _lockAspectRatioPath = "xdr:pic/xdr:nvPicPr/xdr:cNvPicPr/a:picLocks/@noChangeAspect";
+        string _lockAspectRatioPath;
         /// <summary>
         /// Lock aspect ratio
         /// </summary>
@@ -380,10 +388,10 @@ void IPictureContainer.RemoveImage()
         void IPictureContainer.SetNewImage()
         {
             var relId = ((IPictureContainer)this).RelPic.Id;
-            TopNode.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip/@r:embed", NameSpaceManager).Value = relId;
+            TopNode.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip/@r:embed", NameSpaceManager).Value = relId;
             if (Image.Type == ePictureType.Svg)
             {
-                TopNode.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip/a:extLst/a:ext/asvg:svgBlip/@r:embed", NameSpaceManager).Value = relId;
+                TopNode.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip/a:extLst/a:ext/asvg:svgBlip/@r:embed", NameSpaceManager).Value = relId;
             }
         }
 
diff --git a/src/EPPlus/Drawing/Vml/ExcelVmlDrawingBaseCollection.cs b/src/EPPlus/Drawing/Vml/ExcelVmlDrawingBaseCollection.cs
@@ -18,6 +18,8 @@ Date               Author                       Change
 using OfficeOpenXml.Utils;
 using System.IO;
 using OfficeOpenXml.Constants;
+using OfficeOpenXml.Drawing.Interfaces;
+using OfficeOpenXml.Packaging;
 
 namespace OfficeOpenXml.Drawing.Vml
 {
diff --git a/src/EPPlus/Drawing/Vml/ExcelVmlDrawingPicture.cs b/src/EPPlus/Drawing/Vml/ExcelVmlDrawingPicture.cs
@@ -343,19 +343,19 @@ IPictureRelationDocument RelationDocument
         {
             get
             {
-                return _worksheet.VmlDrawings;
+                return _worksheet.HeaderFooter._vmlDrawingsHF;
             }
         }
 
         string ImageHash { get; set; }
         Uri UriPic { get; set; }
         Packaging.ZipPackageRelationship RelPic { get; set; }
 
-        IPictureRelationDocument IPictureContainer.RelationDocument => throw new NotImplementedException();
+        IPictureRelationDocument IPictureContainer.RelationDocument => _worksheet.HeaderFooter._vmlDrawingsHF;
 
-        string IPictureContainer.ImageHash { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        Uri IPictureContainer.UriPic { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        Packaging.ZipPackageRelationship IPictureContainer.RelPic { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        string IPictureContainer.ImageHash { get; set; }
+        Uri IPictureContainer.UriPic { get; set; }
+        Packaging.ZipPackageRelationship IPictureContainer.RelPic { get; set; }
 
         void IPictureContainer.RemoveImage()
         {
diff --git a/src/EPPlus/Drawing/Vml/ExcelVmlDrawingPictureCollection.cs b/src/EPPlus/Drawing/Vml/ExcelVmlDrawingPictureCollection.cs
@@ -17,15 +17,18 @@ Date               Author                       Change
 using System.Collections;
 using System.Globalization;
 using OfficeOpenXml.Utils;
+using OfficeOpenXml.Drawing.Interfaces;
+using OfficeOpenXml.Packaging;
 
 namespace OfficeOpenXml.Drawing.Vml
 {
     /// <summary>
     /// A collection of vml drawings used for header and footer picturess
     /// </summary>
-    public class ExcelVmlDrawingPictureCollection : ExcelVmlDrawingBaseCollection, IEnumerable
+    public class ExcelVmlDrawingPictureCollection : ExcelVmlDrawingBaseCollection, IEnumerable, IPictureRelationDocument
     {
         internal List<ExcelVmlDrawingPicture> _images;
+        Dictionary<string, HashInfo> _hashes = new Dictionary<string, HashInfo>();
         internal ExcelVmlDrawingPictureCollection(ExcelWorksheet ws, Uri uri) :
             base(ws, uri, "d:legacyDrawingHF/@r:id")
         {            
@@ -149,5 +152,12 @@ IEnumerator IEnumerable.GetEnumerator()
         }
 
         #endregion
+        ExcelPackage IPictureRelationDocument.Package => _package;
+
+        Dictionary<string, HashInfo> IPictureRelationDocument.Hashes => _hashes;
+
+        ZipPackagePart IPictureRelationDocument.RelatedPart => Part;
+
+        Uri IPictureRelationDocument.RelatedUri => Uri;
     }
 }
diff --git a/src/EPPlus/EPPlus.csproj b/src/EPPlus/EPPlus.csproj
@@ -480,7 +480,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.30" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.32" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream">
       <Version>2.2.1</Version>
     </PackageReference>
@@ -496,7 +496,7 @@
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream">
       <Version>2.2.1</Version>
     </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.3" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
 
@@ -505,7 +505,7 @@
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream">
       <Version>2.2.1</Version>
     </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.3" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
   </ItemGroup>
 
diff --git a/src/EPPlus/ExcelHeaderFooter.cs b/src/EPPlus/ExcelHeaderFooter.cs
@@ -131,7 +131,7 @@ public ExcelVmlDrawingPicture InsertPicture(Stream PictureStream, ePictureType p
             var imgBytes=new byte[PictureStream.Length];
             PictureStream.Seek(0, SeekOrigin.Begin);
             PictureStream.Read(imgBytes,0, imgBytes.Length);
-            var ii = _ws.Workbook._package.PictureStore.AddImage(imgBytes,null, pictureType);
+            var ii = _ws.Workbook._package.PictureStore.AddImage(imgBytes, null, pictureType);
 
             return AddImage(id, ii);
         }
@@ -429,7 +429,7 @@ public ExcelHeaderFooterText FirstFooter
                 return _firstFooter; 
             } 
         }
-        private ExcelVmlDrawingPictureCollection _vmlDrawingsHF = null;
+        internal ExcelVmlDrawingPictureCollection _vmlDrawingsHF = null;
         /// <summary>
         /// Vml drawings. Underlaying object for Header footer images
         /// </summary>
diff --git a/src/EPPlus/ExcelPackage.cs b/src/EPPlus/ExcelPackage.cs
@@ -843,7 +843,8 @@ public void Dispose()
             {
                 if (_isExternalStream==false && _stream != null && (_stream.CanRead || _stream.CanWrite))
                 {
-                    CloseStream();
+                    _stream.Close();
+                    _stream.Dispose();
                 }
                 _zipPackage.Close();    
                 if(_workbook != null)
@@ -1228,7 +1229,7 @@ private void CheckNotDisposed()
         /// </summary>
         /// <param name="input">The input.</param>
         public void Load(Stream input)
-        {
+        {            
             Load(input, RecyclableMemory.GetStream(), null);            
         }
         /// <summary>
@@ -1248,6 +1249,7 @@ public void Load(Stream input, string Password)
         /// <param name="Password"></param>
         private void Load(Stream input, Stream output, string Password)
         {
+            
             ReleaseResources();
             if (input.CanSeek && input.Length == 0) // Template is blank, Construct new
             {
diff --git a/src/EPPlus/ExcelWorksheet.cs b/src/EPPlus/ExcelWorksheet.cs
@@ -1110,7 +1110,7 @@ internal string CodeModuleName
             }
             set
             {
-                SetXmlNodeString(codeModuleNamePath, value);
+                SetXmlNodeString(codeModuleNamePath, value, true);
             }
         }
         internal void CodeNameChange(string value)
diff --git a/src/EPPlus/ExcelWorksheets.cs b/src/EPPlus/ExcelWorksheets.cs
@@ -180,6 +180,10 @@ private ExcelWorksheet AddSheet(string Name, bool isChart, eChartType? chartType
                     _pck.Workbook.VbaProject.Modules.Add(new ExcelVBAModule(worksheet.CodeNameChange) { Name = name, Code = "", Attributes = _pck.Workbook.VbaProject.GetDocumentAttributes(Name, "0{00020820-0000-0000-C000-000000000046}"), Type = eModuleType.Document, HelpContext = 0 });
                     worksheet.CodeModuleName = name;
                 }
+                else
+                {
+                    worksheet.CodeModuleName = null;
+                }
 
                 return worksheet;
             }
diff --git a/src/EPPlus/Packaging/ZipPackagePart.cs b/src/EPPlus/Packaging/ZipPackagePart.cs
@@ -50,6 +50,11 @@ internal Stream Stream
             }
             set
             {
+                if(_stream!=null)
+                {
+                    _stream.Close();
+                    _stream.Dispose();
+                }
                 _stream = value;
             }
         }
diff --git a/src/EPPlus/WorksheetZipStream.cs b/src/EPPlus/WorksheetZipStream.cs
@@ -17,7 +17,7 @@ Date               Author                       Change
 
 namespace OfficeOpenXml
 {
-    internal class WorksheetZipStream : Stream
+    internal class WorksheetZipStream : Stream, IDisposable
     {
         RollingBuffer _rollingBuffer = new RollingBuffer(8192 * 2); //Zip stream buffer is 8K, so we use the double here so we preserve any values from previous read.
         private Stream _stream;
@@ -43,7 +43,7 @@ public override void Flush()
         }
         public override int Read(byte[] buffer, int offset, int count)
         {
-            if(_stream.Length > 0 && _stream.Position + count > _stream.Length)
+            if (_stream.Length > 0 && _stream.Position + count > _stream.Length)
             {
                 count = (int)(_stream.Length - _stream.Position);
             }
@@ -223,7 +223,7 @@ internal string ReadFromEndElement(string endElement, string startXml = "", stri
             WriteToBuffer = writeToBuffer;
             return startXml + xml;
         }
-        internal string ReadToExt(string startXml, string uriValue, ref string lastElement, string lastUri="")
+        internal string ReadToExt(string startXml, string uriValue, ref string lastElement, string lastUri = "")
         {
             Buffer.Flush();
             var xml = System.Text.Encoding.UTF8.GetString(((MemoryStream)Buffer.BaseStream).ToArray());
@@ -232,13 +232,13 @@ internal string ReadToExt(string startXml, string uriValue, ref string lastEleme
             {
                 var lastExtStartIx = GetXmlIndex(xml, lastUri);
                 int endExtIx;
-                if(lastExtStartIx < 0)
+                if (lastExtStartIx < 0)
                 {
                     endExtIx = FindElementPos(xml, "ext", false);
                 }
                 else
                 {
-                    endExtIx = FindElementPos(xml, "ext", false, lastExtStartIx+4);
+                    endExtIx = FindElementPos(xml, "ext", false, lastExtStartIx + 4);
                 }
                 xml = xml.Substring(endExtIx);
             }
@@ -287,16 +287,16 @@ private int GetXmlIndex(string xml, string uriValue)
         private bool HasExtElementUri(string elementString, string uriValue)
         {
             if (elementString.StartsWith("</")) return false; //An endtag, return false;
-            var ix=elementString.IndexOf("uri");
+            var ix = elementString.IndexOf("uri");
             var pc = elementString[ix - 1];
             var nc = elementString[ix + 3];
-            if(char.IsWhiteSpace(pc) && (char.IsWhiteSpace(nc) || nc=='='))
+            if (char.IsWhiteSpace(pc) && (char.IsWhiteSpace(nc) || nc == '='))
             {
                 ix = elementString.IndexOf('=', ix + 1);
                 var ixAttrStart = elementString.IndexOf('"', ix + 1) + 1;
                 var ixAttrEnd = elementString.IndexOf('"', ixAttrStart + 1) - 1;
 
-                var uri = elementString.Substring(ixAttrStart, ixAttrEnd - ixAttrStart+1);
+                var uri = elementString.Substring(ixAttrStart, ixAttrEnd - ixAttrStart + 1);
                 return uriValue.Equals(uri, StringComparison.OrdinalIgnoreCase);
             }
             return false;
@@ -310,7 +310,7 @@ private bool HasExtElementUri(string elementString, string uriValue)
         /// <param name="returnStartPos">If the position before the start element is returned. If false the end of the end element is returned.</param>
         /// <param name="ix">the index</param>
         /// <returns>The position of the element in the input xml</returns>
-        private int FindElementPos(string xml, string element, bool returnStartPos = true, int ix=0)
+        private int FindElementPos(string xml, string element, bool returnStartPos = true, int ix = 0)
         {
             while (true)
             {
@@ -347,5 +347,13 @@ private int FindElementPos(string xml, string element, bool returnStartPos = tru
                 ix += element.Length;
             }
         }
+        /// <summary>
+        /// Disposes resources.
+        /// </summary>
+        public void Dispose()
+        {
+            base.Dispose();
+            Buffer.BaseStream.Dispose();
+        }
     }
 }
diff --git a/src/EPPlusTest/Issues.cs b/src/EPPlusTest/Issues.cs
@@ -5504,5 +5504,31 @@ public void s542()
                 SaveAndCleanup(destinationpackage);
             }
         }
+        [TestMethod]
+        public void GroupDrawingIssue()
+        {
+            using (var p = OpenTemplatePackage("pic_shape_grouped2.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                var grpSp = (ExcelGroupShape)ws.Drawings[0];
+                var d = grpSp.Drawings[0];
+
+                p.Workbook.Worksheets.Add("Sheet2", ws);
+                SaveAndCleanup(p);
+            }
+        }
+        [TestMethod]
+        public void i1146()
+        {
+            using (var p1 = OpenTemplatePackage("HeaderFooterTest.xlsx"))
+            {
+                using (var p2 = new ExcelPackage())
+                {
+                    var ws = p1.Workbook.Worksheets[0];
+                    p2.Workbook.Worksheets.Add("sheet1", ws);
+                    SaveWorkbook("HeaderFooterSaved.xlsx", p2);
+                }
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,19 @@ public sealed class ExcelPicture : ExcelDrawing, IPictureContainer`
`32`	`32`	`{`
`33`	`33`	`#region "Constructors"`
`34`	`34`	`internal ExcelPicture(ExcelDrawings drawings, XmlNode node, Uri hyperlink, ePictureType type) :`
`35`		`- base(drawings, node, "xdr:pic", "xdr:nvPicPr/xdr:cNvPr")`
	`35`	`+ base(drawings, node, "xdr:pic/", "xdr:nvPicPr/xdr:cNvPr")`
`36`	`36`	`{`
	`37`	`+ Init();`
`37`	`38`	`CreatePicNode(node,type);`
`38`	`39`	`Hyperlink = hyperlink;`
`39`	`40`	`Image = new ExcelImage(this);`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`internal ExcelPicture(ExcelDrawings drawings, XmlNode node, ExcelGroupShape shape = null) :`
`43`		`- base(drawings, node, "xdr:pic", "xdr:nvPicPr/xdr:cNvPr", shape)`
	`44`	`+ base(drawings, node, shape==null ? "xdr:pic/" : "", "xdr:nvPicPr/xdr:cNvPr", shape)`
`44`	`45`	`{`
`45`		`- XmlNode picNode = node.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip", drawings.NameSpaceManager);`
	`46`	`+ Init();`
	`47`	`+ XmlNode picNode = node.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip", drawings.NameSpaceManager);`
`46`	`48`	`if (picNode != null && picNode.Attributes["embed", ExcelPackage.schemaRelationships] != null)`
`47`	`49`	`{`
`48`	`50`	`IPictureContainer container = this;`
`@@ -78,14 +80,20 @@ internal ExcelPicture(ExcelDrawings drawings, XmlNode node, ExcelGroupShape shap`
`78`	`80`	`container.ImageHash = ii.Hash;`
`79`	`81`	`}`
`80`	`82`	`}`
	`83`	`+ private void Init()`
	`84`	`+ {`
	`85`	`+ _lockAspectRatioPath = $"{_topPath}xdr:nvPicPr/xdr:cNvPicPr/a:picLocks/@noChangeAspect";`
	`86`	`+ _preferRelativeResizePath = $"{_topPath}xdr:nvPicPr/xdr:cNvPicPr/@preferRelativeResize";`
	`87`	`+ }`
	`88`	`+`
`81`	`89`	`private void SetRelId(XmlNode node, ePictureType type, string relID)`
`82`	`90`	`{`
`83`	`91`	`//Create relationship`
`84`		`- node.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip/@r:embed", NameSpaceManager).Value = relID;`
	`92`	`+ node.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip/@r:embed", NameSpaceManager).Value = relID;`
`85`	`93`
`86`	`94`	`if (type == ePictureType.Svg)`
`87`	`95`	`{`
`88`		`- node.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip/a:extLst/a:ext/asvg:svgBlip/@r:embed", NameSpaceManager).Value = relID;`
	`96`	`+ node.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip/a:extLst/a:ext/asvg:svgBlip/@r:embed", NameSpaceManager).Value = relID;`
`89`	`97`	`}`
`90`	`98`	`}`
`91`	`99`
`@@ -269,7 +277,7 @@ public ExcelDrawingFill Fill`
`269`	`277`	`{`
`270`	`278`	`if (_fill == null)`
`271`	`279`	`{`
`272`		`- _fill = new ExcelDrawingFill(_drawings, NameSpaceManager, TopNode, "xdr:pic/xdr:spPr", SchemaNodeOrder);`
	`280`	`+ _fill = new ExcelDrawingFill(_drawings, NameSpaceManager, TopNode, $"{_topPath}xdr:spPr", SchemaNodeOrder);`
`273`	`281`	`}`
`274`	`282`	`return _fill;`
`275`	`283`	`}`
`@@ -284,7 +292,7 @@ public ExcelDrawingBorder Border`
`284`	`292`	`{`
`285`	`293`	`if (_border == null)`
`286`	`294`	`{`
`287`		`- _border = new ExcelDrawingBorder(_drawings, NameSpaceManager, TopNode, "xdr:pic/xdr:spPr/a:ln", SchemaNodeOrder);`
	`295`	`+ _border = new ExcelDrawingBorder(_drawings, NameSpaceManager, TopNode, $"{_topPath}xdr:spPr/a:ln", SchemaNodeOrder);`
`288`	`296`	`}`
`289`	`297`	`return _border;`
`290`	`298`	`}`
`@@ -299,12 +307,12 @@ public ExcelDrawingEffectStyle Effect`
`299`	`307`	`{`
`300`	`308`	`if (_effect == null)`
`301`	`309`	`{`
`302`		`- _effect = new ExcelDrawingEffectStyle(_drawings, NameSpaceManager, TopNode, "xdr:pic/xdr:spPr/a:effectLst", SchemaNodeOrder);`
	`310`	`+ _effect = new ExcelDrawingEffectStyle(_drawings, NameSpaceManager, TopNode, $"{_topPath}xdr:spPr/a:effectLst", SchemaNodeOrder);`
`303`	`311`	`}`
`304`	`312`	`return _effect;`
`305`	`313`	`}`
`306`	`314`	`}`
`307`		`- const string _preferRelativeResizePath = "xdr:pic/xdr:nvPicPr/xdr:cNvPicPr/@preferRelativeResize";`
	`315`	`+ string _preferRelativeResizePath;`
`308`	`316`	`/// <summary>`
`309`	`317`	`/// Relative to original picture size`
`310`	`318`	`/// </summary>`
`@@ -319,7 +327,7 @@ public bool PreferRelativeResize`
`319`	`327`	`SetXmlNodeBool(_preferRelativeResizePath, value);`
`320`	`328`	`}`
`321`	`329`	`}`
`322`		`- const string _lockAspectRatioPath = "xdr:pic/xdr:nvPicPr/xdr:cNvPicPr/a:picLocks/@noChangeAspect";`
	`330`	`+ string _lockAspectRatioPath;`
`323`	`331`	`/// <summary>`
`324`	`332`	`/// Lock aspect ratio`
`325`	`333`	`/// </summary>`
`@@ -380,10 +388,10 @@ void IPictureContainer.RemoveImage()`
`380`	`388`	`void IPictureContainer.SetNewImage()`
`381`	`389`	`{`
`382`	`390`	`var relId = ((IPictureContainer)this).RelPic.Id;`
`383`		`- TopNode.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip/@r:embed", NameSpaceManager).Value = relId;`
	`391`	`+ TopNode.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip/@r:embed", NameSpaceManager).Value = relId;`
`384`	`392`	`if (Image.Type == ePictureType.Svg)`
`385`	`393`	`{`
`386`		`- TopNode.SelectSingleNode("xdr:pic/xdr:blipFill/a:blip/a:extLst/a:ext/asvg:svgBlip/@r:embed", NameSpaceManager).Value = relId;`
	`394`	`+ TopNode.SelectSingleNode($"{_topPath}xdr:blipFill/a:blip/a:extLst/a:ext/asvg:svgBlip/@r:embed", NameSpaceManager).Value = relId;`
`387`	`395`	`}`
`388`	`396`	`}`
`389`	`397`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ Date Author Change`
`18`	`18`	`using OfficeOpenXml.Utils;`
`19`	`19`	`using System.IO;`
`20`	`20`	`using OfficeOpenXml.Constants;`
	`21`	`+using OfficeOpenXml.Drawing.Interfaces;`
	`22`	`+using OfficeOpenXml.Packaging;`
`21`	`23`
`22`	`24`	`namespace OfficeOpenXml.Drawing.Vml`
`23`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -343,19 +343,19 @@ IPictureRelationDocument RelationDocument`
`343`	`343`	`{`
`344`	`344`	`get`
`345`	`345`	`{`
`346`		`- return _worksheet.VmlDrawings;`
	`346`	`+ return _worksheet.HeaderFooter._vmlDrawingsHF;`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`string ImageHash { get; set; }`
`351`	`351`	`Uri UriPic { get; set; }`
`352`	`352`	`Packaging.ZipPackageRelationship RelPic { get; set; }`
`353`	`353`
`354`		`- IPictureRelationDocument IPictureContainer.RelationDocument => throw new NotImplementedException();`
	`354`	`+ IPictureRelationDocument IPictureContainer.RelationDocument => _worksheet.HeaderFooter._vmlDrawingsHF;`
`355`	`355`
`356`		`- string IPictureContainer.ImageHash { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }`
`357`		`- Uri IPictureContainer.UriPic { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }`
`358`		`- Packaging.ZipPackageRelationship IPictureContainer.RelPic { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }`
	`356`	`+ string IPictureContainer.ImageHash { get; set; }`
	`357`	`+ Uri IPictureContainer.UriPic { get; set; }`
	`358`	`+ Packaging.ZipPackageRelationship IPictureContainer.RelPic { get; set; }`
`359`	`359`
`360`	`360`	`void IPictureContainer.RemoveImage()`
`361`	`361`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,18 @@ Date Author Change`
`17`	`17`	`using System.Collections;`
`18`	`18`	`using System.Globalization;`
`19`	`19`	`using OfficeOpenXml.Utils;`
	`20`	`+using OfficeOpenXml.Drawing.Interfaces;`
	`21`	`+using OfficeOpenXml.Packaging;`
`20`	`22`
`21`	`23`	`namespace OfficeOpenXml.Drawing.Vml`
`22`	`24`	`{`
`23`	`25`	`/// <summary>`
`24`	`26`	`/// A collection of vml drawings used for header and footer picturess`
`25`	`27`	`/// </summary>`
`26`		`- public class ExcelVmlDrawingPictureCollection : ExcelVmlDrawingBaseCollection, IEnumerable`
	`28`	`+ public class ExcelVmlDrawingPictureCollection : ExcelVmlDrawingBaseCollection, IEnumerable, IPictureRelationDocument`
`27`	`29`	`{`
`28`	`30`	`internal List<ExcelVmlDrawingPicture> _images;`
	`31`	`+ Dictionary<string, HashInfo> _hashes = new Dictionary<string, HashInfo>();`
`29`	`32`	`internal ExcelVmlDrawingPictureCollection(ExcelWorksheet ws, Uri uri) :`
`30`	`33`	`base(ws, uri, "d:legacyDrawingHF/@r:id")`
`31`	`34`	`{`
`@@ -149,5 +152,12 @@ IEnumerator IEnumerable.GetEnumerator()`
`149`	`152`	`}`
`150`	`153`
`151`	`154`	`#endregion`
	`155`	`+ ExcelPackage IPictureRelationDocument.Package => _package;`
	`156`	`+`
	`157`	`+ Dictionary<string, HashInfo> IPictureRelationDocument.Hashes => _hashes;`
	`158`	`+`
	`159`	`+ ZipPackagePart IPictureRelationDocument.RelatedPart => Part;`
	`160`	`+`
	`161`	`+ Uri IPictureRelationDocument.RelatedUri => Uri;`
`152`	`162`	`}`
`153`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public ExcelVmlDrawingPicture InsertPicture(Stream PictureStream, ePictureType p`
`131`	`131`	`var imgBytes=new byte[PictureStream.Length];`
`132`	`132`	`PictureStream.Seek(0, SeekOrigin.Begin);`
`133`	`133`	`PictureStream.Read(imgBytes,0, imgBytes.Length);`
`134`		`- var ii = _ws.Workbook._package.PictureStore.AddImage(imgBytes,null, pictureType);`
	`134`	`+ var ii = _ws.Workbook._package.PictureStore.AddImage(imgBytes, null, pictureType);`
`135`	`135`
`136`	`136`	`return AddImage(id, ii);`
`137`	`137`	`}`
`@@ -429,7 +429,7 @@ public ExcelHeaderFooterText FirstFooter`
`429`	`429`	`return _firstFooter;`
`430`	`430`	`}`
`431`	`431`	`}`
`432`		`- private ExcelVmlDrawingPictureCollection _vmlDrawingsHF = null;`
	`432`	`+ internal ExcelVmlDrawingPictureCollection _vmlDrawingsHF = null;`
`433`	`433`	`/// <summary>`
`434`	`434`	`/// Vml drawings. Underlaying object for Header footer images`
`435`	`435`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,8 @@ public void Dispose()`
`843`	`843`	`{`
`844`	`844`	`if (_isExternalStream==false && _stream != null && (_stream.CanRead \|\| _stream.CanWrite))`
`845`	`845`	`{`
`846`		`- CloseStream();`
	`846`	`+ _stream.Close();`
	`847`	`+ _stream.Dispose();`
`847`	`848`	`}`
`848`	`849`	`_zipPackage.Close();`
`849`	`850`	`if(_workbook != null)`
`@@ -1228,7 +1229,7 @@ private void CheckNotDisposed()`
`1228`	`1229`	`/// </summary>`
`1229`	`1230`	`/// <param name="input">The input.</param>`
`1230`	`1231`	`public void Load(Stream input)`
`1231`		`- {`
	`1232`	`+ {`
`1232`	`1233`	`Load(input, RecyclableMemory.GetStream(), null);`
`1233`	`1234`	`}`
`1234`	`1235`	`/// <summary>`
`@@ -1248,6 +1249,7 @@ public void Load(Stream input, string Password)`
`1248`	`1249`	`/// <param name="Password"></param>`
`1249`	`1250`	`private void Load(Stream input, Stream output, string Password)`
`1250`	`1251`	`{`
	`1252`	`+`
`1251`	`1253`	`ReleaseResources();`
`1252`	`1254`	`if (input.CanSeek && input.Length == 0) // Template is blank, Construct new`
`1253`	`1255`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1110,7 +1110,7 @@ internal string CodeModuleName`
`1110`	`1110`	`}`
`1111`	`1111`	`set`
`1112`	`1112`	`{`
`1113`		`- SetXmlNodeString(codeModuleNamePath, value);`
	`1113`	`+ SetXmlNodeString(codeModuleNamePath, value, true);`
`1114`	`1114`	`}`
`1115`	`1115`	`}`
`1116`	`1116`	`internal void CodeNameChange(string value)`
Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,10 @@ private ExcelWorksheet AddSheet(string Name, bool isChart, eChartType? chartType`
`180`	`180`	`_pck.Workbook.VbaProject.Modules.Add(new ExcelVBAModule(worksheet.CodeNameChange) { Name = name, Code = "", Attributes = _pck.Workbook.VbaProject.GetDocumentAttributes(Name, "0{00020820-0000-0000-C000-000000000046}"), Type = eModuleType.Document, HelpContext = 0 });`
`181`	`181`	`worksheet.CodeModuleName = name;`
`182`	`182`	`}`
	`183`	`+ else`
	`184`	`+ {`
	`185`	`+ worksheet.CodeModuleName = null;`
	`186`	`+ }`
`183`	`187`
`184`	`188`	`return worksheet;`
`185`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ internal Stream Stream`
`50`	`50`	`}`
`51`	`51`	`set`
`52`	`52`	`{`
	`53`	`+ if(_stream!=null)`
	`54`	`+ {`
	`55`	`+ _stream.Close();`
	`56`	`+ _stream.Dispose();`
	`57`	`+ }`
`53`	`58`	`_stream = value;`
`54`	`59`	`}`
`55`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Date Author Change`
`17`	`17`
`18`	`18`	`namespace OfficeOpenXml`
`19`	`19`	`{`
`20`		`- internal class WorksheetZipStream : Stream`
	`20`	`+ internal class WorksheetZipStream : Stream, IDisposable`
`21`	`21`	`{`
`22`	`22`	`RollingBuffer _rollingBuffer = new RollingBuffer(8192 * 2); //Zip stream buffer is 8K, so we use the double here so we preserve any values from previous read.`
`23`	`23`	`private Stream _stream;`
`@@ -43,7 +43,7 @@ public override void Flush()`
`43`	`43`	`}`
`44`	`44`	`public override int Read(byte[] buffer, int offset, int count)`
`45`	`45`	`{`
`46`		`- if(_stream.Length > 0 && _stream.Position + count > _stream.Length)`
	`46`	`+ if (_stream.Length > 0 && _stream.Position + count > _stream.Length)`
`47`	`47`	`{`
`48`	`48`	`count = (int)(_stream.Length - _stream.Position);`
`49`	`49`	`}`
`@@ -223,7 +223,7 @@ internal string ReadFromEndElement(string endElement, string startXml = "", stri`
`223`	`223`	`WriteToBuffer = writeToBuffer;`
`224`	`224`	`return startXml + xml;`
`225`	`225`	`}`
`226`		`- internal string ReadToExt(string startXml, string uriValue, ref string lastElement, string lastUri="")`
	`226`	`+ internal string ReadToExt(string startXml, string uriValue, ref string lastElement, string lastUri = "")`
`227`	`227`	`{`
`228`	`228`	`Buffer.Flush();`
`229`	`229`	`var xml = System.Text.Encoding.UTF8.GetString(((MemoryStream)Buffer.BaseStream).ToArray());`
`@@ -232,13 +232,13 @@ internal string ReadToExt(string startXml, string uriValue, ref string lastEleme`
`232`	`232`	`{`
`233`	`233`	`var lastExtStartIx = GetXmlIndex(xml, lastUri);`
`234`	`234`	`int endExtIx;`
`235`		`- if(lastExtStartIx < 0)`
	`235`	`+ if (lastExtStartIx < 0)`
`236`	`236`	`{`
`237`	`237`	`endExtIx = FindElementPos(xml, "ext", false);`
`238`	`238`	`}`
`239`	`239`	`else`
`240`	`240`	`{`
`241`		`- endExtIx = FindElementPos(xml, "ext", false, lastExtStartIx+4);`
	`241`	`+ endExtIx = FindElementPos(xml, "ext", false, lastExtStartIx + 4);`
`242`	`242`	`}`
`243`	`243`	`xml = xml.Substring(endExtIx);`
`244`	`244`	`}`
`@@ -287,16 +287,16 @@ private int GetXmlIndex(string xml, string uriValue)`
`287`	`287`	`private bool HasExtElementUri(string elementString, string uriValue)`
`288`	`288`	`{`
`289`	`289`	`if (elementString.StartsWith("</")) return false; //An endtag, return false;`
`290`		`- var ix=elementString.IndexOf("uri");`
	`290`	`+ var ix = elementString.IndexOf("uri");`
`291`	`291`	`var pc = elementString[ix - 1];`
`292`	`292`	`var nc = elementString[ix + 3];`
`293`		`- if(char.IsWhiteSpace(pc) && (char.IsWhiteSpace(nc) \|\| nc=='='))`
	`293`	`+ if (char.IsWhiteSpace(pc) && (char.IsWhiteSpace(nc) \|\| nc == '='))`
`294`	`294`	`{`
`295`	`295`	`ix = elementString.IndexOf('=', ix + 1);`
`296`	`296`	`var ixAttrStart = elementString.IndexOf('"', ix + 1) + 1;`
`297`	`297`	`var ixAttrEnd = elementString.IndexOf('"', ixAttrStart + 1) - 1;`
`298`	`298`
`299`		`- var uri = elementString.Substring(ixAttrStart, ixAttrEnd - ixAttrStart+1);`
	`299`	`+ var uri = elementString.Substring(ixAttrStart, ixAttrEnd - ixAttrStart + 1);`
`300`	`300`	`return uriValue.Equals(uri, StringComparison.OrdinalIgnoreCase);`
`301`	`301`	`}`
`302`	`302`	`return false;`
`@@ -310,7 +310,7 @@ private bool HasExtElementUri(string elementString, string uriValue)`
`310`	`310`	`/// <param name="returnStartPos">If the position before the start element is returned. If false the end of the end element is returned.</param>`
`311`	`311`	`/// <param name="ix">the index</param>`
`312`	`312`	`/// <returns>The position of the element in the input xml</returns>`
`313`		`- private int FindElementPos(string xml, string element, bool returnStartPos = true, int ix=0)`
	`313`	`+ private int FindElementPos(string xml, string element, bool returnStartPos = true, int ix = 0)`
`314`	`314`	`{`
`315`	`315`	`while (true)`
`316`	`316`	`{`
`@@ -347,5 +347,13 @@ private int FindElementPos(string xml, string element, bool returnStartPos = tru`
`347`	`347`	`ix += element.Length;`
`348`	`348`	`}`
`349`	`349`	`}`
	`350`	`+ /// <summary>`
	`351`	`+ /// Disposes resources.`
	`352`	`+ /// </summary>`
	`353`	`+ public void Dispose()`
	`354`	`+ {`
	`355`	`+ base.Dispose();`
	`356`	`+ Buffer.BaseStream.Dispose();`
	`357`	`+ }`
`350`	`358`	`}`
`351`	`359`	`}`