Merge branch 'master' into FixEncryption

nissl-lab · Jul 23, 2022 · b5f9afd · b5f9afd
2 parents 51169e2 + 2c3ffbd
commit b5f9afd
Show file tree

Hide file tree

Showing 367 changed files with 29,670 additions and 6,440 deletions.
diff --git a/OpenXmlFormats/Drawing/BaseTypes.cs b/OpenXmlFormats/Drawing/BaseTypes.cs
@@ -3095,7 +3095,7 @@ public static CT_Hyperlink Parse(XmlNode node, XmlNamespaceManager namespaceMana
             if (node == null)
                 return null;
             CT_Hyperlink ctObj = new CT_Hyperlink();
-            ctObj.id = XmlHelper.ReadString(node.Attributes["id"]);
+            ctObj.id = XmlHelper.ReadString(node.Attributes["r:id"]);
             ctObj.invalidUrl = XmlHelper.ReadString(node.Attributes["invalidUrl"]);
             ctObj.action = XmlHelper.ReadString(node.Attributes["action"]);
             ctObj.tgtFrame = XmlHelper.ReadString(node.Attributes["tgtFrame"]);
@@ -3117,15 +3117,15 @@ public static CT_Hyperlink Parse(XmlNode node, XmlNamespaceManager namespaceMana
 
         internal void Write(StreamWriter sw, string nodeName)
         {
-            sw.Write(string.Format("<a:{0}", nodeName));
-            XmlHelper.WriteAttribute(sw, "id", this.id);
+            sw.Write(string.Format("<a:{0} xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"", nodeName));
+            XmlHelper.WriteAttribute(sw, "r:id", this.id);
             XmlHelper.WriteAttribute(sw, "invalidUrl", this.invalidUrl);
             XmlHelper.WriteAttribute(sw, "action", this.action);
             XmlHelper.WriteAttribute(sw, "tgtFrame", this.tgtFrame);
             XmlHelper.WriteAttribute(sw, "tooltip", this.tooltip);
-            XmlHelper.WriteAttribute(sw, "history", this.history);
-            XmlHelper.WriteAttribute(sw, "highlightClick", this.highlightClick);
-            XmlHelper.WriteAttribute(sw, "endSnd", this.endSnd);
+            XmlHelper.WriteAttribute(sw, "history", this.history, false, true);
+            XmlHelper.WriteAttribute(sw, "highlightClick", this.highlightClick, false, false);
+            XmlHelper.WriteAttribute(sw, "endSnd", this.endSnd, false, false);
             sw.Write(">");
             if (this.snd != null)
                 this.snd.Write(sw, "snd");
@@ -3135,8 +3135,6 @@ internal void Write(StreamWriter sw, string nodeName)
         }
         public CT_Hyperlink()
         {
-            //this.extLstField = new CT_OfficeArtExtensionList();
-            //this.sndField = new CT_EmbeddedWAVAudioFile();
             this.invalidUrlField = "";
             this.actionField = "";
             this.tgtFrameField = "";