Skip to content

Commit f29ca58

Browse files
mikeebowenmikeebowen
committed
Can view the ExtensionChildren in the PresentationExtension, but receiving IL2090
1 parent 1aa6ad5 commit f29ca58

File tree

68 files changed

+651
-650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+651
-650
lines changed

‎gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/DataModelWriterExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,11 @@ private static void WriteMetadata(this IndentedTextWriter writer, OpenXmlGenerat
322322
{
323323
if (containingType.KnownChildren is not null && containingType.KnownChildren.Any(c => c.QName.Name == "extLst") && containingType.ExtensionChildren is not null)
324324
{
325-
writer.WriteLine("internal static new List<string> ExtensionChildren = new List<string>() {");
325+
writer.WriteLine("internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {");
326326

327327
foreach (var child in containingType.ExtensionChildren)
328328
{
329-
writer.WriteLine($"\"{services.FindClassName(child.Name)}\",");
329+
writer.WriteLine($" {services.FindClassName(child.Name)}.ElementType,");
330330
}
331331

332332
writer.WriteLine("};");
@@ -369,7 +369,7 @@ private static void WriteMetadata(this IndentedTextWriter writer, OpenXmlGenerat
369369
writer.WriteLine(";");
370370
}
371371

372-
if (!containingType.IsDerived)
372+
if (!containingType.IsDerived && containingType.KnownChildren is not null)
373373
{
374374
foreach (var child in containingType.KnownChildren)
375375
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public ClassificationLabelList(string outerXml) : base(outerXml)
6767
{
6868
}
6969

70-
internal static new List<string> ExtensionChildren = new List<string>() {
70+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
7171
};
7272

7373
internal override void ConfigureMetadata(ElementMetadata.Builder builder)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
455455
set => SetAttribute(value);
456456
}
457457

458-
internal static new List<string> ExtensionChildren = new List<string>() {
458+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
459459
};
460460

461461
internal override void ConfigureMetadata(ElementMetadata.Builder builder)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public StringValue? Title
286286
set => SetAttribute(value);
287287
}
288288

289-
internal static new List<string> ExtensionChildren = new List<string>() {
289+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
290290
};
291291

292292
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -421,7 +421,7 @@ public BooleanValue? TextBox
421421
set => SetAttribute(value);
422422
}
423423

424-
internal static new List<string> ExtensionChildren = new List<string>() {
424+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
425425
};
426426

427427
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -639,7 +639,7 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
639639
set => SetAttribute(value);
640640
}
641641

642-
internal static new List<string> ExtensionChildren = new List<string>() {
642+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
643643
};
644644

645645
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -1199,7 +1199,7 @@ public NonVisualGroupDrawingShapeProperties(string outerXml) : base(outerXml)
11991199
{
12001200
}
12011201

1202-
internal static new List<string> ExtensionChildren = new List<string>() {
1202+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
12031203
};
12041204

12051205
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -1411,7 +1411,7 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
14111411
set => SetAttribute(value);
14121412
}
14131413

1414-
internal static new List<string> ExtensionChildren = new List<string>() {
1414+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
14151415
};
14161416

14171417
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -1545,7 +1545,7 @@ public StringValue? ModelId
15451545
set => SetAttribute(value);
15461546
}
15471547

1548-
internal static new List<string> ExtensionChildren = new List<string>() {
1548+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
15491549
};
15501550

15511551
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -1716,7 +1716,7 @@ public GroupShape(string outerXml) : base(outerXml)
17161716
{
17171717
}
17181718

1719-
internal static new List<string> ExtensionChildren = new List<string>() {
1719+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
17201720
};
17211721

17221722
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -1795,7 +1795,7 @@ public ShapeTree(string outerXml) : base(outerXml)
17951795
{
17961796
}
17971797

1798-
internal static new List<string> ExtensionChildren = new List<string>() {
1798+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
17991799
};
18001800

18011801
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -1874,7 +1874,7 @@ protected GroupShapeType(string outerXml) : base(outerXml)
18741874
{
18751875
}
18761876

1877-
internal static new List<string> ExtensionChildren = new List<string>() {
1877+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
18781878
};
18791879

18801880
internal override void ConfigureMetadata(ElementMetadata.Builder builder)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
9494
set => SetAttribute(value);
9595
}
9696

97-
internal static new List<string> ExtensionChildren = new List<string>() {
97+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
9898
};
9999

100100
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -282,7 +282,7 @@ public StringValue? Title
282282
set => SetAttribute(value);
283283
}
284284

285-
internal static new List<string> ExtensionChildren = new List<string>() {
285+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
286286
};
287287

288288
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -417,7 +417,7 @@ public BooleanValue? IsComment
417417
set => SetAttribute(value);
418418
}
419419

420-
internal static new List<string> ExtensionChildren = new List<string>() {
420+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
421421
};
422422

423423
internal override void ConfigureMetadata(ElementMetadata.Builder builder)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public StringValue? Title
119119
set => SetAttribute(value);
120120
}
121121

122-
internal static new List<string> ExtensionChildren = new List<string>() {
122+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
123123
};
124124

125125
internal override void ConfigureMetadata(ElementMetadata.Builder builder)

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public StringValue? RelationshipId
238238
set => SetAttribute(value);
239239
}
240240

241-
internal static new List<string> ExtensionChildren = new List<string>() {
241+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
242242
};
243243

244244
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -618,7 +618,7 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.PenAlignmentValues>? Alignment
618618
set => SetAttribute(value);
619619
}
620620

621-
internal static new List<string> ExtensionChildren = new List<string>() {
621+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
622622
};
623623

624624
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -848,7 +848,7 @@ public HiddenScene3D(string outerXml) : base(outerXml)
848848
{
849849
}
850850

851-
internal static new List<string> ExtensionChildren = new List<string>() {
851+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
852852
};
853853

854854
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -1019,7 +1019,7 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.PresetMaterialTypeValues>? Prese
10191019
set => SetAttribute(value);
10201020
}
10211021

1022-
internal static new List<string> ExtensionChildren = new List<string>() {
1022+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
10231023
};
10241024

10251025
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -1503,7 +1503,7 @@ public BooleanValue? NoChangeShapeType
15031503
set => SetAttribute(value);
15041504
}
15051505

1506-
internal static new List<string> ExtensionChildren = new List<string>() {
1506+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
15071507
};
15081508

15091509
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -4054,7 +4054,7 @@ public StringValue? Title
40544054
set => SetAttribute(value);
40554055
}
40564056

4057-
internal static new List<string> ExtensionChildren = new List<string>() {
4057+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
40584058
};
40594059

40604060
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -4189,7 +4189,7 @@ public BooleanValue? IsComment
41894189
set => SetAttribute(value);
41904190
}
41914191

4192-
internal static new List<string> ExtensionChildren = new List<string>() {
4192+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
41934193
};
41944194

41954195
internal override void ConfigureMetadata(ElementMetadata.Builder builder)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public StringValue? Name
7777
set => SetAttribute(value);
7878
}
7979

80-
internal static new List<string> ExtensionChildren = new List<string>() {
80+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
8181
};
8282

8383
internal override void ConfigureMetadata(ElementMetadata.Builder builder)

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public PivotSource(string outerXml) : base(outerXml)
7070
{
7171
}
7272

73-
internal static new List<string> ExtensionChildren = new List<string>() {
73+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
7474
};
7575

7676
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -263,7 +263,7 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
263263
set => SetAttribute(value);
264264
}
265265

266-
internal static new List<string> ExtensionChildren = new List<string>() {
266+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
267267
};
268268

269269
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -397,7 +397,7 @@ public Layout(string outerXml) : base(outerXml)
397397
{
398398
}
399399

400-
internal static new List<string> ExtensionChildren = new List<string>() {
400+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
401401
};
402402

403403
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -2456,7 +2456,7 @@ public BarChartSeries(string outerXml) : base(outerXml)
24562456
{
24572457
}
24582458

2459-
internal static new List<string> ExtensionChildren = new List<string>() {
2459+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
24602460
};
24612461

24622462
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -2648,7 +2648,7 @@ public LineChartSeries(string outerXml) : base(outerXml)
26482648
{
26492649
}
26502650

2651-
internal static new List<string> ExtensionChildren = new List<string>() {
2651+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
26522652
};
26532653

26542654
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -2841,7 +2841,7 @@ public ScatterChartSeries(string outerXml) : base(outerXml)
28412841
{
28422842
}
28432843

2844-
internal static new List<string> ExtensionChildren = new List<string>() {
2844+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
28452845
};
28462846

28472847
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -3016,7 +3016,7 @@ public AreaChartSeries(string outerXml) : base(outerXml)
30163016
{
30173017
}
30183018

3019-
internal static new List<string> ExtensionChildren = new List<string>() {
3019+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
30203020
};
30213021

30223022
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -3188,7 +3188,7 @@ public PieChartSeries(string outerXml) : base(outerXml)
31883188
{
31893189
}
31903190

3191-
internal static new List<string> ExtensionChildren = new List<string>() {
3191+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
31923192
};
31933193

31943194
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -3377,7 +3377,7 @@ public BubbleChartSeries(string outerXml) : base(outerXml)
33773377
{
33783378
}
33793379

3380-
internal static new List<string> ExtensionChildren = new List<string>() {
3380+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
33813381
};
33823382

33833383
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -3570,7 +3570,7 @@ public RadarChartSeries(string outerXml) : base(outerXml)
35703570
{
35713571
}
35723572

3573-
internal static new List<string> ExtensionChildren = new List<string>() {
3573+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
35743574
};
35753575

35763576
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -3753,7 +3753,7 @@ public SurfaceChartSeries(string outerXml) : base(outerXml)
37533753
{
37543754
}
37553755

3756-
internal static new List<string> ExtensionChildren = new List<string>() {
3756+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
37573757
};
37583758

37593759
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -3967,7 +3967,7 @@ public DataLabelsRangeChache(string outerXml) : base(outerXml)
39673967
{
39683968
}
39693969

3970-
internal static new List<string> ExtensionChildren = new List<string>() {
3970+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
39713971
};
39723972

39733973
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -4039,7 +4039,7 @@ public DataLabelFieldTableCache(string outerXml) : base(outerXml)
40394039
{
40404040
}
40414041

4042-
internal static new List<string> ExtensionChildren = new List<string>() {
4042+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
40434043
};
40444044

40454045
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -4111,7 +4111,7 @@ protected StringDataType(string outerXml) : base(outerXml)
41114111
{
41124112
}
41134113

4114-
internal static new List<string> ExtensionChildren = new List<string>() {
4114+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
41154115
};
41164116

41174117
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -4235,7 +4235,7 @@ public Marker(string outerXml) : base(outerXml)
42354235
{
42364236
}
42374237

4238-
internal static new List<string> ExtensionChildren = new List<string>() {
4238+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
42394239
};
42404240

42414241
internal override void ConfigureMetadata(ElementMetadata.Builder builder)
@@ -4377,7 +4377,7 @@ public DataLabel(string outerXml) : base(outerXml)
43774377
{
43784378
}
43794379

4380-
internal static new List<string> ExtensionChildren = new List<string>() {
4380+
internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
43814381
};
43824382

43834383
internal override void ConfigureMetadata(ElementMetadata.Builder builder)

0 commit comments

Comments
 (0)