Skip to content

Commit 34e52c0

Browse files
committed
include base types
1 parent 04ed991 commit 34e52c0

File tree

14 files changed

+284
-78
lines changed

14 files changed

+284
-78
lines changed

gen/DocumentFormat.OpenXml.Generator.Models/Generators/Linq/LinqVisitor.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ private IEnumerable<SchemaType> FindBaseClass(string? className)
104104
}
105105
}
106106
}
107+
else if (services.DataSource.TypedClasses.FirstOrDefault(t => t.ClassName == className) is { } @class && services.TryFindType(@class.Name, out var found))
108+
{
109+
yield return found;
110+
}
107111
}
108112
}
109113

generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs

Lines changed: 34 additions & 34 deletions
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System.Xml.Linq;
5+
6+
namespace DocumentFormat.OpenXml.Linq
7+
{
8+
/// <summary>
9+
/// Declares XNamespace and XName fields for the xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" namespace.
10+
/// </summary>
11+
public static partial class AM3D
12+
{
13+
/// <summary>
14+
/// Defines the XML namespace associated with the am3d prefix.
15+
/// </summary>
16+
public static readonly XNamespace am3d = "http://schemas.microsoft.com/office/drawing/2017/model3d";
17+
18+
/// <summary>
19+
/// Represents the am3d:clr XML element.
20+
/// </summary>
21+
/// <remarks>
22+
/// <para>As an XML element, it:</para>
23+
/// <list type="bullet">
24+
/// <item><description>has the following parent XML elements: <see cref="A.clrChange" />.</description></item>
25+
/// <item><description>has the following child XML elements: <see cref="A.hslClr" />, <see cref="A.prstClr" />, <see cref="A.schemeClr" />, <see cref="A.scrgbClr" />, <see cref="A.srgbClr" />, <see cref="A.sysClr" />.</description></item>
26+
/// <item><description>corresponds to the following strongly-typed classes: ColorType.</description></item>
27+
/// </list>
28+
/// </remarks>
29+
public static readonly XName clr = am3d + "clr";
30+
}
31+
}

generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.C.g.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ public static partial class C
808808
/// <remarks>
809809
/// <para>As an XML element, it:</para>
810810
/// <list type="bullet">
811-
/// <item><description>has the following parent XML elements: <see cref="area3DChart" />, <see cref="areaChart" />, <see cref="backWall" />, <see cref="bar3DChart" />, <see cref="barChart" />, <see cref="bubbleChart" />, <see cref="catAx" />, <see cref="chart" />, <see cref="chartSpace" />, <see cref="dateAx" />, <see cref="dispUnits" />, <see cref="dLbl" />, <see cref="dLbls" />, <see cref="doughnutChart" />, <see cref="dPt" />, <see cref="dTable" />, <see cref="errBars" />, <see cref="floor" />, <see cref="layout" />, <see cref="legend" />, <see cref="legendEntry" />, <see cref="line3DChart" />, <see cref="lineChart" />, <see cref="manualLayout" />, <see cref="marker" />, <see cref="multiLvlStrCache" />, <see cref="multiLvlStrRef" />, <see cref="numCache" />, <see cref="numLit" />, <see cref="numRef" />, <see cref="ofPieChart" />, <see cref="pie3DChart" />, <see cref="pieChart" />, <see cref="pivotFmt" />, <see cref="pivotSource" />, <see cref="plotArea" />, <see cref="radarChart" />, <see cref="scaling" />, <see cref="scatterChart" />, <see cref="ser" />, <see cref="serAx" />, <see cref="sideWall" />, <see cref="stockChart" />, <see cref="strCache" />, <see cref="strLit" />, <see cref="strRef" />, <see cref="surface3DChart" />, <see cref="surfaceChart" />, <see cref="title" />, <see cref="trendline" />, <see cref="trendlineLbl" />, <see cref="upDownBars" />, <see cref="valAx" />, <see cref="view3D" />, <see cref="C15.dLbl" />, <see cref="C15.dlblFieldTableCache" />, <see cref="C15.dlblRangeCache" />, <see cref="C15.layout" />, <see cref="C15.marker" />, <see cref="C15.pivotSource" />, <see cref="C15.ser" />, <see cref="C16.dLbl" />, <see cref="C16.marker" />.</description></item>
811+
/// <item><description>has the following parent XML elements: <see cref="area3DChart" />, <see cref="areaChart" />, <see cref="backWall" />, <see cref="bar3DChart" />, <see cref="barChart" />, <see cref="bubbleChart" />, <see cref="catAx" />, <see cref="chart" />, <see cref="chartSpace" />, <see cref="dateAx" />, <see cref="dispUnits" />, <see cref="dLbl" />, <see cref="dLbls" />, <see cref="doughnutChart" />, <see cref="dPt" />, <see cref="dTable" />, <see cref="errBars" />, <see cref="floor" />, <see cref="layout" />, <see cref="legend" />, <see cref="legendEntry" />, <see cref="line3DChart" />, <see cref="lineChart" />, <see cref="manualLayout" />, <see cref="marker" />, <see cref="multiLvlStrCache" />, <see cref="multiLvlStrRef" />, <see cref="numCache" />, <see cref="numLit" />, <see cref="numRef" />, <see cref="ofPieChart" />, <see cref="pie3DChart" />, <see cref="pieChart" />, <see cref="pivotFmt" />, <see cref="pivotSource" />, <see cref="plotArea" />, <see cref="radarChart" />, <see cref="scaling" />, <see cref="scatterChart" />, <see cref="ser" />, <see cref="serAx" />, <see cref="sideWall" />, <see cref="stockChart" />, <see cref="strCache" />, <see cref="strLit" />, <see cref="strRef" />, <see cref="surface3DChart" />, <see cref="surfaceChart" />, <see cref="title" />, <see cref="trendline" />, <see cref="trendlineLbl" />, <see cref="upDownBars" />, <see cref="valAx" />, <see cref="view3D" />, <see cref="C15.dLbl" />, <see cref="C15.dlblFieldTableCache" />, <see cref="C15.dlblRangeCache" />, <see cref="C15.layout" />, <see cref="C15.marker" />, <see cref="C15.pivotSource" />, <see cref="C15.ser" />, <see cref="C16.dLbl" />, <see cref="C16.marker" />, <see cref="C16.numCache" />, <see cref="C16.strCache" />.</description></item>
812812
/// <item><description>has the following child XML elements: <see cref="ext" />.</description></item>
813813
/// <item><description>corresponds to the following strongly-typed classes: Area3DChartExtensionList, AreaChartExtensionList, AreaSerExtensionList, Bar3DChartExtensionList, BarChartExtensionList, BarSerExtensionList, BubbleChartExtensionList, BubbleSerExtensionList, CatAxExtensionList, ChartExtensionList, ChartSpaceExtensionList, DateAxExtensionList, DLblExtensionList, DLblsExtensionList, ExtensionList, Line3DChartExtensionList, LineChartExtensionList, LineSerExtensionList, MultiLvlStrRefExtensionList, NumRefExtensionList, Pie3DChartExtensionList, PieChartExtensionList, PieSerExtensionList, RadarChartExtensionList, RadarSerExtensionList, ScatterChartExtensionList, ScatterSerExtensionList, SerAxExtensionList, StockChartExtensionList, StrDataExtensionList, StrRefExtensionList, Surface3DChartExtensionList, SurfaceChartExtensionList, SurfaceSerExtensionList, ValAxExtensionList.</description></item>
814814
/// </list>
@@ -895,7 +895,7 @@ public static partial class C
895895
/// <remarks>
896896
/// <para>As an XML element, it:</para>
897897
/// <list type="bullet">
898-
/// <item><description>has the following parent XML elements: <see cref="numCache" />, <see cref="numLit" />.</description></item>
898+
/// <item><description>has the following parent XML elements: <see cref="numCache" />, <see cref="numLit" />, <see cref="C16.numCache" />.</description></item>
899899
/// <item><description>corresponds to the following strongly-typed classes: FormatCode.</description></item>
900900
/// </list>
901901
/// </remarks>
@@ -1858,7 +1858,7 @@ public static partial class C
18581858
/// <remarks>
18591859
/// <para>As an XML element, it:</para>
18601860
/// <list type="bullet">
1861-
/// <item><description>has the following parent XML elements: <see cref="lvl" />, <see cref="numCache" />, <see cref="numLit" />, <see cref="strCache" />, <see cref="strLit" />, <see cref="C15.dlblFieldTableCache" />, <see cref="C15.dlblRangeCache" />.</description></item>
1861+
/// <item><description>has the following parent XML elements: <see cref="lvl" />, <see cref="numCache" />, <see cref="numLit" />, <see cref="strCache" />, <see cref="strLit" />, <see cref="C15.dlblFieldTableCache" />, <see cref="C15.dlblRangeCache" />, <see cref="C16.numCache" />, <see cref="C16.strCache" />.</description></item>
18621862
/// <item><description>has the following child XML elements: <see cref="v" />.</description></item>
18631863
/// <item><description>has the following XML attributes: <see cref="NoNamespace.formatCode" />, <see cref="NoNamespace.idx" />.</description></item>
18641864
/// <item><description>corresponds to the following strongly-typed classes: NumericPoint, StringPoint.</description></item>
@@ -1872,7 +1872,7 @@ public static partial class C
18721872
/// <remarks>
18731873
/// <para>As an XML element, it:</para>
18741874
/// <list type="bullet">
1875-
/// <item><description>has the following parent XML elements: <see cref="multiLvlStrCache" />, <see cref="numCache" />, <see cref="numLit" />, <see cref="strCache" />, <see cref="strLit" />, <see cref="C15.dlblFieldTableCache" />, <see cref="C15.dlblRangeCache" />.</description></item>
1875+
/// <item><description>has the following parent XML elements: <see cref="multiLvlStrCache" />, <see cref="numCache" />, <see cref="numLit" />, <see cref="strCache" />, <see cref="strLit" />, <see cref="C15.dlblFieldTableCache" />, <see cref="C15.dlblRangeCache" />, <see cref="C16.numCache" />, <see cref="C16.strCache" />.</description></item>
18761876
/// <item><description>corresponds to the following strongly-typed classes: PointCount.</description></item>
18771877
/// </list>
18781878
/// </remarks>

generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.C15.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static partial class C15
4545
/// <remarks>
4646
/// <para>As an XML element, it:</para>
4747
/// <list type="bullet">
48-
/// <item><description>has the following parent XML elements: <see cref="filteredCategoryTitle" />.</description></item>
48+
/// <item><description>has the following parent XML elements: <see cref="C.ser" />, <see cref="filteredCategoryTitle" />.</description></item>
4949
/// <item><description>has the following child XML elements: <see cref="C.multiLvlStrRef" />, <see cref="C.numLit" />, <see cref="C.numRef" />, <see cref="C.strLit" />, <see cref="C.strRef" />.</description></item>
5050
/// <item><description>corresponds to the following strongly-typed classes: AxisDataSourceType.</description></item>
5151
/// </list>

generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.C16.g.cs

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static partial class C16
8585
/// <remarks>
8686
/// <para>As an XML element, it:</para>
8787
/// <list type="bullet">
88-
/// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="categoryFilterException" />.</description></item>
88+
/// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="C.pivotSource" />, <see cref="categoryFilterException" />.</description></item>
8989
/// <item><description>has the following XML attributes: <see cref="NoNamespace.val" />.</description></item>
9090
/// <item><description>corresponds to the following strongly-typed classes: UnsignedIntegerType.</description></item>
9191
/// </list>
@@ -117,6 +117,19 @@ public static partial class C16
117117
/// </remarks>
118118
public static readonly XName marker = c16 + "marker";
119119

120+
/// <summary>
121+
/// Represents the c16:numCache XML element.
122+
/// </summary>
123+
/// <remarks>
124+
/// <para>As an XML element, it:</para>
125+
/// <list type="bullet">
126+
/// <item><description>has the following parent XML elements: <see cref="C.numRef" />.</description></item>
127+
/// <item><description>has the following child XML elements: <see cref="C.extLst" />, <see cref="C.formatCode" />, <see cref="C.pt" />, <see cref="C.ptCount" />.</description></item>
128+
/// <item><description>corresponds to the following strongly-typed classes: NumberDataType.</description></item>
129+
/// </list>
130+
/// </remarks>
131+
public static readonly XName numCache = c16 + "numCache";
132+
120133
/// <summary>
121134
/// Represents the c16:pivotOptions16 XML element.
122135
/// </summary>
@@ -182,6 +195,19 @@ public static partial class C16
182195
/// </remarks>
183196
public static readonly XName spPr = c16 + "spPr";
184197

198+
/// <summary>
199+
/// Represents the c16:strCache XML element.
200+
/// </summary>
201+
/// <remarks>
202+
/// <para>As an XML element, it:</para>
203+
/// <list type="bullet">
204+
/// <item><description>has the following parent XML elements: <see cref="C.strRef" />.</description></item>
205+
/// <item><description>has the following child XML elements: <see cref="C.extLst" />, <see cref="C.pt" />, <see cref="C.ptCount" />.</description></item>
206+
/// <item><description>corresponds to the following strongly-typed classes: StringDataType.</description></item>
207+
/// </list>
208+
/// </remarks>
209+
public static readonly XName strCache = c16 + "strCache";
210+
185211
/// <summary>
186212
/// Represents the c16:uniqueId XML element.
187213
/// </summary>

generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.CS.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public static partial class CS
219219
/// <remarks>
220220
/// <para>As an XML element, it:</para>
221221
/// <list type="bullet">
222-
/// <item><description>has the following parent XML elements: <see cref="axisTitle" />, <see cref="categoryAxis" />, <see cref="chartArea" />, <see cref="dataLabel" />, <see cref="dataLabelCallout" />, <see cref="dataPoint" />, <see cref="dataPoint3D" />, <see cref="dataPointLine" />, <see cref="dataPointMarker" />, <see cref="dataPointWireframe" />, <see cref="dataTable" />, <see cref="downBar" />, <see cref="dropLine" />, <see cref="errorBar" />, <see cref="floor" />, <see cref="gridlineMajor" />, <see cref="gridlineMinor" />, <see cref="hiLoLine" />, <see cref="leaderLine" />, <see cref="legend" />, <see cref="plotArea" />, <see cref="plotArea3D" />, <see cref="seriesAxis" />, <see cref="seriesLine" />, <see cref="title" />, <see cref="trendline" />, <see cref="trendlineLabel" />, <see cref="upBar" />, <see cref="valueAxis" />, <see cref="wall" />.</description></item>
222+
/// <item><description>has the following parent XML elements: <see cref="A.defPPr" />, <see cref="axisTitle" />, <see cref="categoryAxis" />, <see cref="chartArea" />, <see cref="dataLabel" />, <see cref="dataLabelCallout" />, <see cref="dataPoint" />, <see cref="dataPoint3D" />, <see cref="dataPointLine" />, <see cref="dataPointMarker" />, <see cref="dataPointWireframe" />, <see cref="dataTable" />, <see cref="downBar" />, <see cref="dropLine" />, <see cref="errorBar" />, <see cref="floor" />, <see cref="gridlineMajor" />, <see cref="gridlineMinor" />, <see cref="hiLoLine" />, <see cref="leaderLine" />, <see cref="legend" />, <see cref="plotArea" />, <see cref="plotArea3D" />, <see cref="seriesAxis" />, <see cref="seriesLine" />, <see cref="title" />, <see cref="trendline" />, <see cref="trendlineLabel" />, <see cref="upBar" />, <see cref="valueAxis" />, <see cref="wall" />.</description></item>
223223
/// <item><description>has the following child XML elements: <see cref="A.blipFill" />, <see cref="A.cs" />, <see cref="A.ea" />, <see cref="A.effectDag" />, <see cref="A.effectLst" />, <see cref="A.extLst" />, <see cref="A.gradFill" />, <see cref="A.grpFill" />, <see cref="A.highlight" />, <see cref="A.hlinkClick" />, <see cref="A.hlinkMouseOver" />, <see cref="A.latin" />, <see cref="A.ln" />, <see cref="A.noFill" />, <see cref="A.pattFill" />, <see cref="A.rtl" />, <see cref="A.solidFill" />, <see cref="A.sym" />, <see cref="A.uFill" />, <see cref="A.uFillTx" />, <see cref="A.uLn" />, <see cref="A.uLnTx" />.</description></item>
224224
/// <item><description>has the following XML attributes: <see cref="NoNamespace.altLang" />, <see cref="NoNamespace.b" />, <see cref="NoNamespace.baseline" />, <see cref="NoNamespace.bmk" />, <see cref="NoNamespace.cap" />, <see cref="NoNamespace.dirty" />, <see cref="NoNamespace.err" />, <see cref="NoNamespace.i" />, <see cref="NoNamespace.kern" />, <see cref="NoNamespace.kumimoji" />, <see cref="NoNamespace.lang" />, <see cref="NoNamespace.noProof" />, <see cref="NoNamespace.normalizeH" />, <see cref="NoNamespace.smtClean" />, <see cref="NoNamespace.smtId" />, <see cref="NoNamespace.spc" />, <see cref="NoNamespace.strike" />, <see cref="NoNamespace.sz" />, <see cref="NoNamespace.u" />.</description></item>
225225
/// <item><description>corresponds to the following strongly-typed classes: TextCharacterPropertiesType.</description></item>

generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.CX.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public static partial class CX
198198
/// <remarks>
199199
/// <para>As an XML element, it:</para>
200200
/// <list type="bullet">
201-
/// <item><description>has the following parent XML elements: <see cref="chartSpace" />.</description></item>
201+
/// <item><description>has the following parent XML elements: <see cref="A.extraClrScheme" />, <see cref="chartSpace" />.</description></item>
202202
/// <item><description>has the following child XML elements: <see cref="A.extLst" />.</description></item>
203203
/// <item><description>has the following XML attributes: <see cref="NoNamespace.accent1" />, <see cref="NoNamespace.accent2" />, <see cref="NoNamespace.accent3" />, <see cref="NoNamespace.accent4" />, <see cref="NoNamespace.accent5" />, <see cref="NoNamespace.accent6" />, <see cref="NoNamespace.bg1" />, <see cref="NoNamespace.bg2" />, <see cref="NoNamespace.folHlink" />, <see cref="NoNamespace.hlink" />, <see cref="NoNamespace.tx1" />, <see cref="NoNamespace.tx2" />.</description></item>
204204
/// <item><description>corresponds to the following strongly-typed classes: ColorMappingType.</description></item>

generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.DGM1612.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static partial class DGM1612
2121
/// <remarks>
2222
/// <para>As an XML element, it:</para>
2323
/// <list type="bullet">
24-
/// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="DGM.ext" />.</description></item>
24+
/// <item><description>has the following parent XML elements: <see cref="A.graphicData" />, <see cref="DGM.ext" />, <see cref="P.presentation" />.</description></item>
2525
/// <item><description>has the following child XML elements: <see cref="A.defPPr" />, <see cref="A.extLst" />, <see cref="A.lvl1pPr" />, <see cref="A.lvl2pPr" />, <see cref="A.lvl3pPr" />, <see cref="A.lvl4pPr" />, <see cref="A.lvl5pPr" />, <see cref="A.lvl6pPr" />, <see cref="A.lvl7pPr" />, <see cref="A.lvl8pPr" />, <see cref="A.lvl9pPr" />.</description></item>
2626
/// <item><description>corresponds to the following strongly-typed classes: TextListStyleType.</description></item>
2727
/// </list>

0 commit comments

Comments
 (0)