Change commentextensionlist ext element to 2006/main namespace (#1754)

- fixes #1751
dotnet · Jul 24, 2024 · cd814ec · cd814ec
1 parent 27ba922
commit cd814ec
Show file tree

Hide file tree

Showing 14 changed files with 324 additions and 172 deletions.
diff --git a/data/schemas/schemas_microsoft_com_office_powerpoint_2018_8_main.json b/data/schemas/schemas_microsoft_com_office_powerpoint_2018_8_main.json
@@ -64,18 +64,33 @@
       "Version": "Office2021",
       "Children": [
         {
-          "Name": "p188:CT_CommentPropertiesExtension/p188:ext"
+          "Name": "p188:CT_CommentPropertiesExtension/p:ext"
         }
       ],
       "Particle": {
         "Kind": "Sequence",
         "Items": [
           {
-            "Name": "p188:CT_CommentPropertiesExtension/p188:ext",
+            "Kind": "Group",
             "Occurs": [
-              {}
+              {
+                "Max": 1
+              }
             ],
-            "InitialVersion": "Microsoft365"
+            "Items": [
+              {
+                "Kind": "Sequence",
+                "Items": [
+                  {
+                    "Name": "p188:CT_CommentPropertiesExtension/p:ext",
+                    "Occurs": [
+                      {}
+                    ],
+                    "InitialVersion": "Office2021"
+                  }
+                ]
+              }
+            ]
           }
         ]
       }
@@ -839,47 +854,6 @@
           }
         ]
       }
-    },
-    {
-      "Name": "p188:CT_CommentPropertiesExtension/p188:ext",
-      "ClassName": "CommentPropertiesExtension",
-      "Summary": "Defines the CommentPropertiesExtension Class.",
-      "CompositeType": "OneSequence",
-      "BaseClass": "OpenXmlCompositeElement",
-      "Version": "Microsoft365",
-      "Children": [
-        {
-          "Name": "p228:CT_TaskDetails/p228:taskDetails",
-          "PropertyName": "TaskDetails"
-        },
-        {
-          "Name": "p223:CT_Reactions/p223:reactions",
-          "PropertyName": "Reactions"
-        }
-      ],
-      "Particle": {
-        "Kind": "Sequence",
-        "Items": [
-          {
-            "Name": "p228:CT_TaskDetails/p228:taskDetails",
-            "Occurs": [
-              {
-                "Max": 1
-              }
-            ],
-            "InitialVersion": "Microsoft365"
-          },
-          {
-            "Name": "p223:CT_Reactions/p223:reactions",
-            "Occurs": [
-              {
-                "Max": 1
-              }
-            ],
-            "InitialVersion": "Microsoft365"
-          }
-        ]
-      }
     }
   ],
   "Enums": [

diff --git a/data/schemas/schemas_openxmlformats_org_presentationml_2006_main.json b/data/schemas/schemas_openxmlformats_org_presentationml_2006_main.json
@@ -773,6 +773,47 @@
         ]
       }
     },
+    {
+      "Name": "p188:CT_CommentPropertiesExtension/p:ext",
+      "ClassName": "CommentPropertiesExtension",
+      "Summary": "Data for the Windows platform..",
+      "CompositeType": "OneSequence",
+      "BaseClass": "OpenXmlCompositeElement",
+      "Version": "Office2021",
+      "Children": [
+        {
+          "Name": "p228:CT_TaskDetails/p228:taskDetails",
+          "PropertyName": "TaskDetails"
+        },
+        {
+          "Name": "p223:CT_Reactions/p223:reactions",
+          "PropertyName": "Reactions"
+        }
+      ],
+      "Particle": {
+        "Kind": "Sequence",
+        "Items": [
+          {
+            "Name": "p228:CT_TaskDetails/p228:taskDetails",
+            "Occurs": [
+              {
+                "Max": 1
+              }
+            ],
+            "InitialVersion": "Microsoft365"
+          },
+          {
+            "Name": "p223:CT_Reactions/p223:reactions",
+            "Occurs": [
+              {
+                "Max": 1
+              }
+            ],
+            "InitialVersion": "Microsoft365"
+          }
+        ]
+      }
+    },
     {
       "Name": "p:CT_CommentAuthorList/p:cmAuthorLst",
       "ClassName": "CommentAuthorList",

diff --git a/data/typed/schemas_microsoft_com_office_powerpoint_2018_8_main.json b/data/typed/schemas_microsoft_com_office_powerpoint_2018_8_main.json
@@ -21,10 +21,6 @@
     "Name": "p188:CT_CommentRelationship/p188:commentRel",
     "ClassName": "CommentRelationship"
   },
-  {
-    "Name": "p188:CT_CommentPropertiesExtension/p188:ext",
-    "ClassName": "CommentPropertiesExtension"
-  },
   {
     "Name": "p188:CT_CommentPropertiesExtensionList/p188:extLst",
     "ClassName": "CommentPropertiesExtensionList"

diff --git a/data/typed/schemas_openxmlformats_org_presentationml_2006_main.json b/data/typed/schemas_openxmlformats_org_presentationml_2006_main.json
@@ -389,6 +389,10 @@
     "Name": "p:CT_CommentExtension/p:ext",
     "ClassName": "CommentExtension"
   },
+  {
+    "Name": "p188:CT_CommentPropertiesExtension/p:ext",
+    "ClassName": "CommentPropertiesExtension"
+  },
   {
     "Name": "p:CT_CommonSlideDataExtension/p:ext",
     "ClassName": "CommonSlideDataExtension"

diff --git a/...entFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P.g.cs b/...entFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P.g.cs
@@ -1000,9 +1000,9 @@ public static partial class P
         /// <para>As an XML element, it:</para>
         /// <list type="bullet">
         /// <item><description>has the following parent XML elements: <see cref="extLst" />, <see cref="P14.extLst" />, <see cref="P15.extLst" />, <see cref="P188.extLst" />, <see cref="P1912.extLst" />, <see cref="P223.extLst" />, <see cref="P228.extLst" />.</description></item>
-        /// <item><description>has the following child XML elements: <see cref="A14.m" />, <see cref="P14.browseMode" />, <see cref="P14.creationId" />, <see cref="P14.defaultImageDpi" />, <see cref="P14.discardImageEditData" />, <see cref="P14.laserClr" />, <see cref="P14.laserTraceLst" />, <see cref="P14.media" />, <see cref="P14.modId" />, <see cref="P14.sectionLst" />, <see cref="P14.sectionPr" />, <see cref="P14.showEvtLst" />, <see cref="P14.showMediaCtrls" />, <see cref="P15.chartTrackingRefBased" />, <see cref="P15.notesGuideLst" />, <see cref="P15.presenceInfo" />, <see cref="P15.sldGuideLst" />, <see cref="P15.threadingInfo" />, <see cref="P188.commentRel" />.</description></item>
+        /// <item><description>has the following child XML elements: <see cref="A14.m" />, <see cref="P14.browseMode" />, <see cref="P14.creationId" />, <see cref="P14.defaultImageDpi" />, <see cref="P14.discardImageEditData" />, <see cref="P14.laserClr" />, <see cref="P14.laserTraceLst" />, <see cref="P14.media" />, <see cref="P14.modId" />, <see cref="P14.sectionLst" />, <see cref="P14.sectionPr" />, <see cref="P14.showEvtLst" />, <see cref="P14.showMediaCtrls" />, <see cref="P15.chartTrackingRefBased" />, <see cref="P15.notesGuideLst" />, <see cref="P15.presenceInfo" />, <see cref="P15.sldGuideLst" />, <see cref="P15.threadingInfo" />, <see cref="P188.commentRel" />, <see cref="P223.reactions" />, <see cref="P228.taskDetails" />.</description></item>
         /// <item><description>has the following XML attributes: <see cref="NoNamespace.uri" />.</description></item>
-        /// <item><description>corresponds to the following strongly-typed classes: ApplicationNonVisualDrawingPropertiesExtension, CommentAuthorExtension, CommentExtension, CommonSlideDataExtension, Extension, HandoutMasterExtension, NotesMasterExtension, PresentationExtension, PresentationPropertiesExtension, ShowPropertiesExtension, SlideExtension, SlideLayoutExtension, SlideMasterExtension.</description></item>
+        /// <item><description>corresponds to the following strongly-typed classes: ApplicationNonVisualDrawingPropertiesExtension, CommentAuthorExtension, CommentExtension, CommentPropertiesExtension, CommonSlideDataExtension, Extension, HandoutMasterExtension, NotesMasterExtension, PresentationExtension, PresentationPropertiesExtension, ShowPropertiesExtension, SlideExtension, SlideLayoutExtension, SlideMasterExtension.</description></item>
         /// </list>
         /// </remarks>
         public static readonly XName ext = p + "ext";

diff --git a/...Format.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P188.g.cs b/...Format.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P188.g.cs
@@ -82,27 +82,14 @@ public static partial class P188
         /// </remarks>
         public static readonly XName commentRel = p188 + "commentRel";
 
-        /// <summary>
-        /// Represents the p188:ext XML element.
-        /// </summary>
-        /// <remarks>
-        /// <para>As an XML element, it:</para>
-        /// <list type="bullet">
-        /// <item><description>has the following parent XML elements: <see cref="extLst" />.</description></item>
-        /// <item><description>has the following child XML elements: <see cref="P223.reactions" />, <see cref="P228.taskDetails" />.</description></item>
-        /// <item><description>corresponds to the following strongly-typed classes: CommentPropertiesExtension.</description></item>
-        /// </list>
-        /// </remarks>
-        public static readonly XName ext = p188 + "ext";
-
         /// <summary>
         /// Represents the p188:extLst XML elements.
         /// </summary>
         /// <remarks>
         /// <para>As an XML element, it:</para>
         /// <list type="bullet">
         /// <item><description>has the following parent XML elements: <see cref="author" />, <see cref="cm" />, <see cref="reply" />.</description></item>
-        /// <item><description>has the following child XML elements: <see cref="P.ext" />, <see cref="ext" />.</description></item>
+        /// <item><description>has the following child XML elements: <see cref="P.ext" />.</description></item>
         /// <item><description>corresponds to the following strongly-typed classes: CommentPropertiesExtensionList, ExtensionList.</description></item>
         /// </list>
         /// </remarks>

diff --git a/...Format.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P223.g.cs b/...Format.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P223.g.cs
@@ -48,7 +48,7 @@ public static partial class P223
         /// <remarks>
         /// <para>As an XML element, it:</para>
         /// <list type="bullet">
-        /// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="P188.ext" />.</description></item>
+        /// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="P.ext" />.</description></item>
         /// <item><description>has the following child XML elements: <see cref="rxn" />.</description></item>
         /// <item><description>corresponds to the following strongly-typed classes: Reactions.</description></item>
         /// </list>

diff --git a/...Format.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P228.g.cs b/...Format.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P228.g.cs
@@ -149,7 +149,7 @@ public static partial class P228
         /// <remarks>
         /// <para>As an XML element, it:</para>
         /// <list type="bullet">
-        /// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="P188.ext" />.</description></item>
+        /// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="P.ext" />.</description></item>
         /// <item><description>has the following child XML elements: <see cref="extLst" />, <see cref="history" />.</description></item>
         /// <item><description>has the following XML attributes: <see cref="NoNamespace.deleted" />, <see cref="NoNamespace.inactive" />.</description></item>
         /// <item><description>corresponds to the following strongly-typed classes: TaskDetails.</description></item>

diff --git a/...enXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2018_8_main.g.cs b/...enXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2018_8_main.g.cs
@@ -9,8 +9,6 @@
 using DocumentFormat.OpenXml.Drawing;
 using DocumentFormat.OpenXml.Framework;
 using DocumentFormat.OpenXml.Framework.Metadata;
-using DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main;
-using DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main;
 using DocumentFormat.OpenXml.Office2016.Drawing.Command;
 using DocumentFormat.OpenXml.Office2016.Presentation.Command;
 using DocumentFormat.OpenXml.Packaging;
@@ -147,7 +145,7 @@ public DocumentFormat.OpenXml.Drawing.ListStyle? ListStyle
     /// <remark>
     /// <para>The following table lists the possible child types:</para>
     /// <list type="bullet">
-    ///   <item><description><see cref="DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtension" /> <c>&lt;p188:ext></c></description></item>
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension" /> <c>&lt;p:ext></c></description></item>
     /// </list>
     /// </remark>
     public partial class CommentPropertiesExtensionList : OpenXmlCompositeElement
@@ -188,10 +186,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema("p188:extLst");
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtension>();
+            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension>();
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
-                new ElementParticle(typeof(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtension), 0, 0, version: FileFormatVersions.Microsoft365)
+                new CompositeParticle.Builder(ParticleType.Group, 0, 1)
+                {
+                    new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
+                    {
+                        new ElementParticle(typeof(DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension), 0, 0, version: FileFormatVersions.Office2021)
+                    }
+                }
             };
         }
 
@@ -1188,95 +1192,6 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         public override OpenXmlElement CloneNode(bool deep) => CloneImp<Comment>(deep);
     }
 
-    /// <summary>
-    /// <para>Defines the CommentPropertiesExtension Class.</para>
-    /// <para>This class is available in Microsoft365 and above.</para>
-    /// <para>When the object is serialized out as xml, it's qualified name is p188:ext.</para>
-    /// </summary>
-    /// <remark>
-    /// <para>The following table lists the possible child types:</para>
-    /// <list type="bullet">
-    ///   <item><description><see cref="DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions" /> <c>&lt;p223:reactions></c></description></item>
-    ///   <item><description><see cref="DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails" /> <c>&lt;p228:taskDetails></c></description></item>
-    /// </list>
-    /// </remark>
-    public partial class CommentPropertiesExtension : OpenXmlCompositeElement
-    {
-        /// <summary>
-        /// Initializes a new instance of the CommentPropertiesExtension class.
-        /// </summary>
-        public CommentPropertiesExtension() : base()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the CommentPropertiesExtension class with the specified child elements.
-        /// </summary>
-        /// <param name="childElements">Specifies the child elements.</param>
-        public CommentPropertiesExtension(IEnumerable<OpenXmlElement> childElements) : base(childElements)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the CommentPropertiesExtension class with the specified child elements.
-        /// </summary>
-        /// <param name="childElements">Specifies the child elements.</param>
-        public CommentPropertiesExtension(params OpenXmlElement[] childElements) : base(childElements)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the CommentPropertiesExtension class from outer XML.
-        /// </summary>
-        /// <param name="outerXml">Specifies the outer XML of the element.</param>
-        public CommentPropertiesExtension(string outerXml) : base(outerXml)
-        {
-        }
-
-        internal override void ConfigureMetadata(ElementMetadata.Builder builder)
-        {
-            base.ConfigureMetadata(builder);
-            builder.SetSchema("p188:ext");
-            builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails>();
-            builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
-            {
-                new ElementParticle(typeof(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails), 0, 1, version: FileFormatVersions.Microsoft365),
-                new ElementParticle(typeof(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions), 0, 1, version: FileFormatVersions.Microsoft365)
-            };
-        }
-
-        /// <summary>
-        /// <para>TaskDetails.</para>
-        /// <para>Represents the following element tag in the schema: p228:taskDetails.</para>
-        /// </summary>
-        /// <remark>
-        /// xmlns:p228 = http://schemas.microsoft.com/office/powerpoint/2022/08/main
-        /// </remark>
-        public DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails? TaskDetails
-        {
-            get => GetElement<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails>();
-            set => SetElement(value);
-        }
-
-        /// <summary>
-        /// <para>Reactions.</para>
-        /// <para>Represents the following element tag in the schema: p223:reactions.</para>
-        /// </summary>
-        /// <remark>
-        /// xmlns:p223 = http://schemas.microsoft.com/office/powerpoint/2022/03/main
-        /// </remark>
-        public DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions? Reactions
-        {
-            get => GetElement<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions>();
-            set => SetElement(value);
-        }
-
-        /// <inheritdoc/>
-        public override OpenXmlElement CloneNode(bool deep) => CloneImp<CommentPropertiesExtension>(deep);
-    }
-
     /// <summary>
     /// Defines the CommentStatus enumeration.
     /// </summary>