Skip to content

Commit cd814ec

Browse files
tomjebotomjebo
authored
Change commentextensionlist ext element to 2006/main namespace (#1754)
- fixes #1751
1 parent 27ba922 commit cd814ec

File tree

14 files changed

+324
-172
lines changed

14 files changed

+324
-172
lines changed

‎data/schemas/schemas_microsoft_com_office_powerpoint_2018_8_main.json‎

Lines changed: 19 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,33 @@
6464
"Version": "Office2021",
6565
"Children": [
6666
{
67-
"Name": "p188:CT_CommentPropertiesExtension/p188:ext"
67+
"Name": "p188:CT_CommentPropertiesExtension/p:ext"
6868
}
6969
],
7070
"Particle": {
7171
"Kind": "Sequence",
7272
"Items": [
7373
{
74-
"Name": "p188:CT_CommentPropertiesExtension/p188:ext",
74+
"Kind": "Group",
7575
"Occurs": [
76-
{}
76+
{
77+
"Max": 1
78+
}
7779
],
78-
"InitialVersion": "Microsoft365"
80+
"Items": [
81+
{
82+
"Kind": "Sequence",
83+
"Items": [
84+
{
85+
"Name": "p188:CT_CommentPropertiesExtension/p:ext",
86+
"Occurs": [
87+
{}
88+
],
89+
"InitialVersion": "Office2021"
90+
}
91+
]
92+
}
93+
]
7994
}
8095
]
8196
}
@@ -839,47 +854,6 @@
839854
}
840855
]
841856
}
842-
},
843-
{
844-
"Name": "p188:CT_CommentPropertiesExtension/p188:ext",
845-
"ClassName": "CommentPropertiesExtension",
846-
"Summary": "Defines the CommentPropertiesExtension Class.",
847-
"CompositeType": "OneSequence",
848-
"BaseClass": "OpenXmlCompositeElement",
849-
"Version": "Microsoft365",
850-
"Children": [
851-
{
852-
"Name": "p228:CT_TaskDetails/p228:taskDetails",
853-
"PropertyName": "TaskDetails"
854-
},
855-
{
856-
"Name": "p223:CT_Reactions/p223:reactions",
857-
"PropertyName": "Reactions"
858-
}
859-
],
860-
"Particle": {
861-
"Kind": "Sequence",
862-
"Items": [
863-
{
864-
"Name": "p228:CT_TaskDetails/p228:taskDetails",
865-
"Occurs": [
866-
{
867-
"Max": 1
868-
}
869-
],
870-
"InitialVersion": "Microsoft365"
871-
},
872-
{
873-
"Name": "p223:CT_Reactions/p223:reactions",
874-
"Occurs": [
875-
{
876-
"Max": 1
877-
}
878-
],
879-
"InitialVersion": "Microsoft365"
880-
}
881-
]
882-
}
883857
}
884858
],
885859
"Enums": [

‎data/schemas/schemas_openxmlformats_org_presentationml_2006_main.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,47 @@
773773
]
774774
}
775775
},
776+
{
777+
"Name": "p188:CT_CommentPropertiesExtension/p:ext",
778+
"ClassName": "CommentPropertiesExtension",
779+
"Summary": "Data for the Windows platform..",
780+
"CompositeType": "OneSequence",
781+
"BaseClass": "OpenXmlCompositeElement",
782+
"Version": "Office2021",
783+
"Children": [
784+
{
785+
"Name": "p228:CT_TaskDetails/p228:taskDetails",
786+
"PropertyName": "TaskDetails"
787+
},
788+
{
789+
"Name": "p223:CT_Reactions/p223:reactions",
790+
"PropertyName": "Reactions"
791+
}
792+
],
793+
"Particle": {
794+
"Kind": "Sequence",
795+
"Items": [
796+
{
797+
"Name": "p228:CT_TaskDetails/p228:taskDetails",
798+
"Occurs": [
799+
{
800+
"Max": 1
801+
}
802+
],
803+
"InitialVersion": "Microsoft365"
804+
},
805+
{
806+
"Name": "p223:CT_Reactions/p223:reactions",
807+
"Occurs": [
808+
{
809+
"Max": 1
810+
}
811+
],
812+
"InitialVersion": "Microsoft365"
813+
}
814+
]
815+
}
816+
},
776817
{
777818
"Name": "p:CT_CommentAuthorList/p:cmAuthorLst",
778819
"ClassName": "CommentAuthorList",

‎data/typed/schemas_microsoft_com_office_powerpoint_2018_8_main.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
"Name": "p188:CT_CommentRelationship/p188:commentRel",
2222
"ClassName": "CommentRelationship"
2323
},
24-
{
25-
"Name": "p188:CT_CommentPropertiesExtension/p188:ext",
26-
"ClassName": "CommentPropertiesExtension"
27-
},
2824
{
2925
"Name": "p188:CT_CommentPropertiesExtensionList/p188:extLst",
3026
"ClassName": "CommentPropertiesExtensionList"

‎data/typed/schemas_openxmlformats_org_presentationml_2006_main.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,10 @@
389389
"Name": "p:CT_CommentExtension/p:ext",
390390
"ClassName": "CommentExtension"
391391
},
392+
{
393+
"Name": "p188:CT_CommentPropertiesExtension/p:ext",
394+
"ClassName": "CommentPropertiesExtension"
395+
},
392396
{
393397
"Name": "p:CT_CommonSlideDataExtension/p:ext",
394398
"ClassName": "CommonSlideDataExtension"

‎generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P.g.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,9 +1000,9 @@ public static partial class P
10001000
/// <para>As an XML element, it:</para>
10011001
/// <list type="bullet">
10021002
/// <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>
1003-
/// <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>
1003+
/// <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>
10041004
/// <item><description>has the following XML attributes: <see cref="NoNamespace.uri" />.</description></item>
1005-
/// <item><description>corresponds to the following strongly-typed classes: ApplicationNonVisualDrawingPropertiesExtension, CommentAuthorExtension, CommentExtension, CommonSlideDataExtension, Extension, HandoutMasterExtension, NotesMasterExtension, PresentationExtension, PresentationPropertiesExtension, ShowPropertiesExtension, SlideExtension, SlideLayoutExtension, SlideMasterExtension.</description></item>
1005+
/// <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>
10061006
/// </list>
10071007
/// </remarks>
10081008
public static readonly XName ext = p + "ext";

‎generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P188.g.cs‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,27 +82,14 @@ public static partial class P188
8282
/// </remarks>
8383
public static readonly XName commentRel = p188 + "commentRel";
8484

85-
/// <summary>
86-
/// Represents the p188:ext XML element.
87-
/// </summary>
88-
/// <remarks>
89-
/// <para>As an XML element, it:</para>
90-
/// <list type="bullet">
91-
/// <item><description>has the following parent XML elements: <see cref="extLst" />.</description></item>
92-
/// <item><description>has the following child XML elements: <see cref="P223.reactions" />, <see cref="P228.taskDetails" />.</description></item>
93-
/// <item><description>corresponds to the following strongly-typed classes: CommentPropertiesExtension.</description></item>
94-
/// </list>
95-
/// </remarks>
96-
public static readonly XName ext = p188 + "ext";
97-
9885
/// <summary>
9986
/// Represents the p188:extLst XML elements.
10087
/// </summary>
10188
/// <remarks>
10289
/// <para>As an XML element, it:</para>
10390
/// <list type="bullet">
10491
/// <item><description>has the following parent XML elements: <see cref="author" />, <see cref="cm" />, <see cref="reply" />.</description></item>
105-
/// <item><description>has the following child XML elements: <see cref="P.ext" />, <see cref="ext" />.</description></item>
92+
/// <item><description>has the following child XML elements: <see cref="P.ext" />.</description></item>
10693
/// <item><description>corresponds to the following strongly-typed classes: CommentPropertiesExtensionList, ExtensionList.</description></item>
10794
/// </list>
10895
/// </remarks>

‎generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P223.g.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static partial class P223
4848
/// <remarks>
4949
/// <para>As an XML element, it:</para>
5050
/// <list type="bullet">
51-
/// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="P188.ext" />.</description></item>
51+
/// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="P.ext" />.</description></item>
5252
/// <item><description>has the following child XML elements: <see cref="rxn" />.</description></item>
5353
/// <item><description>corresponds to the following strongly-typed classes: Reactions.</description></item>
5454
/// </list>

‎generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.P228.g.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static partial class P228
149149
/// <remarks>
150150
/// <para>As an XML element, it:</para>
151151
/// <list type="bullet">
152-
/// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="P188.ext" />.</description></item>
152+
/// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="P.ext" />.</description></item>
153153
/// <item><description>has the following child XML elements: <see cref="extLst" />, <see cref="history" />.</description></item>
154154
/// <item><description>has the following XML attributes: <see cref="NoNamespace.deleted" />, <see cref="NoNamespace.inactive" />.</description></item>
155155
/// <item><description>corresponds to the following strongly-typed classes: TaskDetails.</description></item>

‎generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2018_8_main.g.cs‎

Lines changed: 9 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
using DocumentFormat.OpenXml.Drawing;
1010
using DocumentFormat.OpenXml.Framework;
1111
using DocumentFormat.OpenXml.Framework.Metadata;
12-
using DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main;
13-
using DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main;
1412
using DocumentFormat.OpenXml.Office2016.Drawing.Command;
1513
using DocumentFormat.OpenXml.Office2016.Presentation.Command;
1614
using DocumentFormat.OpenXml.Packaging;
@@ -147,7 +145,7 @@ public DocumentFormat.OpenXml.Drawing.ListStyle? ListStyle
147145
/// <remark>
148146
/// <para>The following table lists the possible child types:</para>
149147
/// <list type="bullet">
150-
/// <item><description><see cref="DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtension" /> <c>&lt;p188:ext></c></description></item>
148+
/// <item><description><see cref="DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension" /> <c>&lt;p:ext></c></description></item>
151149
/// </list>
152150
/// </remark>
153151
public partial class CommentPropertiesExtensionList : OpenXmlCompositeElement
@@ -188,10 +186,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
188186
base.ConfigureMetadata(builder);
189187
builder.SetSchema("p188:extLst");
190188
builder.Availability = FileFormatVersions.Office2021;
191-
builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtension>();
189+
builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension>();
192190
builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
193191
{
194-
new ElementParticle(typeof(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtension), 0, 0, version: FileFormatVersions.Microsoft365)
192+
new CompositeParticle.Builder(ParticleType.Group, 0, 1)
193+
{
194+
new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
195+
{
196+
new ElementParticle(typeof(DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension), 0, 0, version: FileFormatVersions.Office2021)
197+
}
198+
}
195199
};
196200
}
197201

@@ -1188,95 +1192,6 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
11881192
public override OpenXmlElement CloneNode(bool deep) => CloneImp<Comment>(deep);
11891193
}
11901194

1191-
/// <summary>
1192-
/// <para>Defines the CommentPropertiesExtension Class.</para>
1193-
/// <para>This class is available in Microsoft365 and above.</para>
1194-
/// <para>When the object is serialized out as xml, it's qualified name is p188:ext.</para>
1195-
/// </summary>
1196-
/// <remark>
1197-
/// <para>The following table lists the possible child types:</para>
1198-
/// <list type="bullet">
1199-
/// <item><description><see cref="DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions" /> <c>&lt;p223:reactions></c></description></item>
1200-
/// <item><description><see cref="DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails" /> <c>&lt;p228:taskDetails></c></description></item>
1201-
/// </list>
1202-
/// </remark>
1203-
public partial class CommentPropertiesExtension : OpenXmlCompositeElement
1204-
{
1205-
/// <summary>
1206-
/// Initializes a new instance of the CommentPropertiesExtension class.
1207-
/// </summary>
1208-
public CommentPropertiesExtension() : base()
1209-
{
1210-
}
1211-
1212-
/// <summary>
1213-
/// Initializes a new instance of the CommentPropertiesExtension class with the specified child elements.
1214-
/// </summary>
1215-
/// <param name="childElements">Specifies the child elements.</param>
1216-
public CommentPropertiesExtension(IEnumerable<OpenXmlElement> childElements) : base(childElements)
1217-
{
1218-
}
1219-
1220-
/// <summary>
1221-
/// Initializes a new instance of the CommentPropertiesExtension class with the specified child elements.
1222-
/// </summary>
1223-
/// <param name="childElements">Specifies the child elements.</param>
1224-
public CommentPropertiesExtension(params OpenXmlElement[] childElements) : base(childElements)
1225-
{
1226-
}
1227-
1228-
/// <summary>
1229-
/// Initializes a new instance of the CommentPropertiesExtension class from outer XML.
1230-
/// </summary>
1231-
/// <param name="outerXml">Specifies the outer XML of the element.</param>
1232-
public CommentPropertiesExtension(string outerXml) : base(outerXml)
1233-
{
1234-
}
1235-
1236-
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
1237-
{
1238-
base.ConfigureMetadata(builder);
1239-
builder.SetSchema("p188:ext");
1240-
builder.Availability = FileFormatVersions.Microsoft365;
1241-
builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions>();
1242-
builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails>();
1243-
builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
1244-
{
1245-
new ElementParticle(typeof(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails), 0, 1, version: FileFormatVersions.Microsoft365),
1246-
new ElementParticle(typeof(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions), 0, 1, version: FileFormatVersions.Microsoft365)
1247-
};
1248-
}
1249-
1250-
/// <summary>
1251-
/// <para>TaskDetails.</para>
1252-
/// <para>Represents the following element tag in the schema: p228:taskDetails.</para>
1253-
/// </summary>
1254-
/// <remark>
1255-
/// xmlns:p228 = http://schemas.microsoft.com/office/powerpoint/2022/08/main
1256-
/// </remark>
1257-
public DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails? TaskDetails
1258-
{
1259-
get => GetElement<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails>();
1260-
set => SetElement(value);
1261-
}
1262-
1263-
/// <summary>
1264-
/// <para>Reactions.</para>
1265-
/// <para>Represents the following element tag in the schema: p223:reactions.</para>
1266-
/// </summary>
1267-
/// <remark>
1268-
/// xmlns:p223 = http://schemas.microsoft.com/office/powerpoint/2022/03/main
1269-
/// </remark>
1270-
public DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions? Reactions
1271-
{
1272-
get => GetElement<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions>();
1273-
set => SetElement(value);
1274-
}
1275-
1276-
/// <inheritdoc/>
1277-
public override OpenXmlElement CloneNode(bool deep) => CloneImp<CommentPropertiesExtension>(deep);
1278-
}
1279-
12801195
/// <summary>
12811196
/// Defines the CommentStatus enumeration.
12821197
/// </summary>

0 commit comments

Comments
 (0)