fix #543 The given key 'rId1' was not present in the dictionary

叶飞 · 叶飞 · commit b1a8f7b426ee · 2024-10-09T09:45:05.000+08:00
diff --git a/src/EPPlus/EPPlus/ExcelWorksheet.cs b/src/EPPlus/EPPlus/ExcelWorksheet.cs
@@ -1171,6 +1171,7 @@ private static bool ReadXmlReaderUntil(XmlReader xr, string nodeText, string alt
         private void LoadHyperLinks(XmlReader xr)
         {
             if (!ReadUntil(xr, "hyperlinks", "rowBreaks", "colBreaks")) return;
+            var rIdCache = new Dictionary<string, Uri>();
             while (xr.Read())
             {
                 if (xr.LocalName == "hyperlink")
@@ -1181,7 +1182,10 @@ private void LoadHyperLinks(XmlReader xr)
                     if (xr.GetAttribute("id", ExcelPackage.schemaRelationships) != null)
                     {
                         var rId = xr.GetAttribute("id", ExcelPackage.schemaRelationships);
-                        var uri = Part.GetRelationship(rId).TargetUri;
+                        if (!rIdCache.TryGetValue(rId,out var uri))
+                        {
+                            uri = Part.GetRelationship(rId).TargetUri;
+                        }
                         if (uri.IsAbsoluteUri)
                         {
                             try
@@ -1199,6 +1203,7 @@ private void LoadHyperLinks(XmlReader xr)
                         }
                         hl.RId = rId;
                         Part.DeleteRelationship(rId); //Delete the relationship, it is recreated when we save the package.
+                        rIdCache[rId] = uri;
                     }
                     else if (xr.GetAttribute("location") != null)
                     {

Original file line number	Diff line number	Diff line change
`@@ -1171,6 +1171,7 @@ private static bool ReadXmlReaderUntil(XmlReader xr, string nodeText, string alt`
`1171`	`1171`	`private void LoadHyperLinks(XmlReader xr)`
`1172`	`1172`	`{`
`1173`	`1173`	`if (!ReadUntil(xr, "hyperlinks", "rowBreaks", "colBreaks")) return;`
	`1174`	`+ var rIdCache = new Dictionary<string, Uri>();`
`1174`	`1175`	`while (xr.Read())`
`1175`	`1176`	`{`
`1176`	`1177`	`if (xr.LocalName == "hyperlink")`
`@@ -1181,7 +1182,10 @@ private void LoadHyperLinks(XmlReader xr)`
`1181`	`1182`	`if (xr.GetAttribute("id", ExcelPackage.schemaRelationships) != null)`
`1182`	`1183`	`{`
`1183`	`1184`	`var rId = xr.GetAttribute("id", ExcelPackage.schemaRelationships);`
`1184`		`- var uri = Part.GetRelationship(rId).TargetUri;`
	`1185`	`+ if (!rIdCache.TryGetValue(rId,out var uri))`
	`1186`	`+ {`
	`1187`	`+ uri = Part.GetRelationship(rId).TargetUri;`
	`1188`	`+ }`
`1185`	`1189`	`if (uri.IsAbsoluteUri)`
`1186`	`1190`	`{`
`1187`	`1191`	`try`
`@@ -1199,6 +1203,7 @@ private void LoadHyperLinks(XmlReader xr)`
`1199`	`1203`	`}`
`1200`	`1204`	`hl.RId = rId;`
`1201`	`1205`	`Part.DeleteRelationship(rId); //Delete the relationship, it is recreated when we save the package.`
	`1206`	`+ rIdCache[rId] = uri;`
`1202`	`1207`	`}`
`1203`	`1208`	`else if (xr.GetAttribute("location") != null)`
`1204`	`1209`	`{`