Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add rowId and colId extensions to CT_TableRow and CT_TableCol #1860

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add rowId and colId extensions to CT_TableRow and CT_TableCol #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
278 changes: 190 additions & 88 deletions data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11818,6 +11818,9 @@
{
"Name": "adec:CT_Decorative/adec:decorative"
},
{
"Name": "ahyp:CT_HyperlinkColor/ahyp:hlinkClr"
},
{
"Name": "a16:CT_CreationId/a16:creationId"
},
Expand All @@ -11833,9 +11836,6 @@
{
"Name": "a16:CT_Identifier/a16:colId"
},
{
"Name": "ahyp:CT_HyperlinkColor/ahyp:hlinkClr"
},
{
"Name": "wp15:CT_WebVideoPr/wp15:webVideoPr"
},
Expand Down Expand Up @@ -17381,84 +17381,6 @@
]
}
},
{
"Name": "a:CT_TableCell/a:tc",
"ClassName": "TableCell",
"Summary": "Table Cell.",
"CompositeType": "OneSequence",
"BaseClass": "OpenXmlCompositeElement",
"Attributes": [
{
"QName": ":rowSpan",
"PropertyName": "RowSpan",
"Type": "Int32Value",
"PropertyComments": "Row Span"
},
{
"QName": ":gridSpan",
"PropertyName": "GridSpan",
"Type": "Int32Value",
"PropertyComments": "Grid Span"
},
{
"QName": ":hMerge",
"PropertyName": "HorizontalMerge",
"Type": "BooleanValue",
"PropertyComments": "Horizontal Merge"
},
{
"QName": ":vMerge",
"PropertyName": "VerticalMerge",
"Type": "BooleanValue",
"PropertyComments": "Vertical Merge"
}
],
"Children": [
{
"Name": "a:CT_TextBody/a:txBody",
"PropertyName": "TextBody",
"PropertyComments": "Text Body"
},
{
"Name": "a:CT_TableCellProperties/a:tcPr",
"PropertyName": "TableCellProperties",
"PropertyComments": "Table Cell Properties"
},
{
"Name": "a:CT_OfficeArtExtensionList/a:extLst",
"PropertyName": "ExtensionList"
}
],
"Particle": {
"Kind": "Sequence",
"Items": [
{
"Name": "a:CT_TextBody/a:txBody",
"Occurs": [
{
"Max": 1
}
]
},
{
"Name": "a:CT_TableCellProperties/a:tcPr",
"Occurs": [
{
"Max": 1
}
]
},
{
"Name": "a:CT_OfficeArtExtensionList/a:extLst",
"Occurs": [
{
"Max": 1
}
]
}
]
}
},
{
"Name": "a:CT_TableStyle/a:tableStyle",
"ClassName": "TableStyle",
Expand Down Expand Up @@ -18054,7 +17976,7 @@
"QName": ":w",
"PropertyName": "Width",
"Type": "Int64Value",
"PropertyComments": "Width",
"PropertyComments": "w",
"Validators": [
{
"Name": "RequiredValidator"
Expand All @@ -18080,15 +18002,15 @@
],
"Children": [
{
"Name": "a:CT_OfficeArtExtensionList/a:extLst",
"PropertyName": "ExtensionList"
"Name": "a:CT_TableColExtensionList/a:extLst",
"PropertyName": "TableColExtensionList"
}
],
"Particle": {
"Kind": "Sequence",
"Items": [
{
"Name": "a:CT_OfficeArtExtensionList/a:extLst",
"Name": "a:CT_TableColExtensionList/a:extLst",
"Occurs": [
{
"Max": 1
Expand Down Expand Up @@ -18301,7 +18223,7 @@
"QName": ":h",
"PropertyName": "Height",
"Type": "Int64Value",
"PropertyComments": "Height",
"PropertyComments": "h",
"Validators": [
{
"Name": "RequiredValidator"
Expand Down Expand Up @@ -18330,7 +18252,7 @@
"Name": "a:CT_TableCell/a:tc"
},
{
"Name": "a:CT_OfficeArtExtensionList/a:extLst"
"Name": "a:CT_TableRowExtensionList/a:extLst"
}
],
"Particle": {
Expand All @@ -18343,7 +18265,7 @@
]
},
{
"Name": "a:CT_OfficeArtExtensionList/a:extLst",
"Name": "a:CT_TableRowExtensionList/a:extLst",
"Occurs": [
{
"Max": 1
Expand Down Expand Up @@ -25037,6 +24959,186 @@
]
}
},
{
"Name": "a:CT_TableColExtension/a:ext",
"ClassName": "TableColExtension",
"Summary": "Defines the TableColExtension Class.",
"BaseClass": "OpenXmlCompositeElement",
"Children": [
{
"Name": "a16:CT_Identifier/a16:colId",
"PropertyName": "ColIdIdentifier"
}
],
"Particle": {
"Kind": "Choice",
"Items": [
{
"Name": "a16:CT_Identifier/a16:colId",
"InitialVersion": "Office2016"
},
{
"Kind": "Any",
"Occurs": [
{
"Max": 1
}
]
}
]
}
},
{
"Name": "a:CT_TableRowExtension/a:ext",
"ClassName": "TableRowExtension",
"Summary": "Defines the TableRowExtension Class.",
"BaseClass": "OpenXmlCompositeElement",
"Children": [
{
"Name": "a16:CT_Identifier/a16:rowId",
"PropertyName": "RowIdIdentifier"
}
],
"Particle": {
"Kind": "Choice",
"Items": [
{
"Name": "a16:CT_Identifier/a16:rowId",
"InitialVersion": "Office2016"
},
{
"Kind": "Any",
"Occurs": [
{
"Max": 1
}
]
}
]
}
},
{
"Name": "a:CT_TableColExtensionList/a:extLst",
"ClassName": "TableColExtensionList",
"Summary": "Defines the TableColExtensionList Class.",
"BaseClass": "OpenXmlCompositeElement",
"Children": [
{
"Name": "a:CT_TableColExtension/a:ext"
}
],
"Particle": {
"Kind": "Sequence",
"Items": [
{
"Name": "a:CT_TableColExtension/a:ext",
"Occurs": [
{}
]
}
]
}
},
{
"Name": "a:CT_TableCell/a:tc",
"ClassName": "TableCell",
"Summary": "Defines the TableCell Class.",
"CompositeType": "OneSequence",
"BaseClass": "OpenXmlCompositeElement",
"Attributes": [
{
"QName": ":rowSpan",
"PropertyName": "RowSpan",
"Type": "Int32Value",
"PropertyComments": "Row Span"
},
{
"QName": ":gridSpan",
"PropertyName": "GridSpan",
"Type": "Int32Value",
"PropertyComments": "Grid Span"
},
{
"QName": ":hMerge",
"PropertyName": "HorizontalMerge",
"Type": "BooleanValue",
"PropertyComments": "Horizontal Merge"
},
{
"QName": ":vMerge",
"PropertyName": "VerticalMerge",
"Type": "BooleanValue",
"PropertyComments": "Vertical Merge"
}
],
"Children": [
{
"Name": "a:CT_TextBody/a:txBody",
"PropertyName": "TextBody",
"PropertyComments": "Text Body"
},
{
"Name": "a:CT_TableCellProperties/a:tcPr",
"PropertyName": "TableCellProperties",
"PropertyComments": "Table Cell Properties"
},
{
"Name": "a:CT_OfficeArtExtensionList/a:extLst",
"PropertyName": "ExtensionList"
}
],
"Particle": {
"Kind": "Sequence",
"Items": [
{
"Name": "a:CT_TextBody/a:txBody",
"Occurs": [
{
"Max": 1
}
]
},
{
"Name": "a:CT_TableCellProperties/a:tcPr",
"Occurs": [
{
"Max": 1
}
]
},
{
"Name": "a:CT_OfficeArtExtensionList/a:extLst",
"Occurs": [
{
"Max": 1
}
]
}
]
}
},
{
"Name": "a:CT_TableRowExtensionList/a:extLst",
"ClassName": "TableRowExtensionList",
"Summary": "Defines the TableRowExtensionList Class.",
"BaseClass": "OpenXmlCompositeElement",
"Children": [
{
"Name": "a:CT_TableRowExtension/a:ext"
}
],
"Particle": {
"Kind": "Sequence",
"Items": [
{
"Name": "a:CT_TableRowExtension/a:ext",
"Occurs": [
{}
]
}
]
}
},
{
"Name": "a:CT_HyperlinkExtension/a:ext",
"ClassName": "HyperlinkExtension",
Expand Down
16 changes: 16 additions & 0 deletions data/typed/schemas_openxmlformats_org_drawingml_2006_main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,14 @@
"Name": "a:CT_ShapePropertiesExtension/a:ext",
"ClassName": "ShapePropertiesExtension"
},
{
"Name": "a:CT_TableColExtension/a:ext",
"ClassName": "TableColExtension"
},
{
"Name": "a:CT_TableRowExtension/a:ext",
"ClassName": "TableRowExtension"
},
{
"Name": "a:CT_BlipExtensionList/a:extLst",
"ClassName": "BlipExtensionList"
Expand Down Expand Up @@ -663,6 +671,14 @@
"Name": "a:CT_ShapePropertiesExtensionList/a:extLst",
"ClassName": "ShapePropertiesExtensionList"
},
{
"Name": "a:CT_TableColExtensionList/a:extLst",
"ClassName": "TableColExtensionList"
},
{
"Name": "a:CT_TableRowExtensionList/a:extLst",
"ClassName": "TableRowExtensionList"
},
{
"Name": "a:CT_ColorSchemeAndMapping/a:extraClrScheme",
"ClassName": "ExtraColorScheme"
Expand Down
6 changes: 3 additions & 3 deletions ...entFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,9 +1396,9 @@ public static partial class A
/// <para>As an XML element, it:</para>
/// <list type="bullet">
/// <item><description>has the following parent XML elements: <see cref="extLst" />, <see cref="xfrm" />, <see cref="A14.extLst" />, <see cref="A14.xfrm" />, <see cref="ALF.extLst" />, <see cref="AOE.extLst" />, <see cref="ASK.extLst" />, <see cref="ASL.extLst" />, <see cref="CDR.xfrm" />, <see cref="CDR14.extLst" />, <see cref="CDR14.xfrm" />, <see cref="CS.extLst" />, <see cref="DGM.extLst" />, <see cref="DSP.extLst" />, <see cref="DSP.txXfrm" />, <see cref="P.xfrm" />, <see cref="P14.xfrm" />, <see cref="PIC14.extLst" />, <see cref="SLE.extLst" />, <see cref="THM15.extLst" />, <see cref="TSLE.extLst" />, <see cref="W14.extLst" />, <see cref="W14.xfrm" />, <see cref="WE.extLst" />, <see cref="WETP.extLst" />, <see cref="WPC.extLst" />, <see cref="WPG.extLst" />, <see cref="WPG.xfrm" />, <see cref="WPS.extLst" />, <see cref="XDR.xfrm" />, <see cref="XDR14.extLst" />, <see cref="XDR14.xfrm" />.</description></item>
/// <item><description>has the following child XML elements: <see cref="graphic" />, <see cref="A14.cameraTool" />, <see cref="A14.compatExt" />, <see cref="A14.hiddenEffects" />, <see cref="A14.hiddenFill" />, <see cref="A14.hiddenLine" />, <see cref="A14.hiddenScene3d" />, <see cref="A14.hiddenSp3d" />, <see cref="A14.imgProps" />, <see cref="A14.isCanvas" />, <see cref="A14.shadowObscured" />, <see cref="A14.useLocalDpi" />, <see cref="A15.backgroundPr" />, <see cref="A15.nonVisualGroupProps" />, <see cref="A15.objectPr" />, <see cref="A15.signatureLine" />, <see cref="A16.creationId" />, <see cref="A16.predDERef" />, <see cref="A1611.picAttrSrcUrl" />, <see cref="ACLSH.classification" />, <see cref="ADEC.decorative" />, <see cref="AHYP.hlinkClr" />, <see cref="AIF.imageFormula" />, <see cref="ALF.liveFeedProps" />, <see cref="AOE.oembedShared" />, <see cref="ASK.lineSketchStyleProps" />, <see cref="ASL.scriptLink" />, <see cref="ASVG.svgBlip" />, <see cref="DGM14.cNvPr" />, <see cref="DGM14.recolorImg" />, <see cref="DSP.dataModelExt" />, <see cref="THM15.themeFamily" />, <see cref="WOE.oembed" />, <see cref="WP15.webVideoPr" />.</description></item>
/// <item><description>has the following child XML elements: <see cref="graphic" />, <see cref="A14.cameraTool" />, <see cref="A14.compatExt" />, <see cref="A14.hiddenEffects" />, <see cref="A14.hiddenFill" />, <see cref="A14.hiddenLine" />, <see cref="A14.hiddenScene3d" />, <see cref="A14.hiddenSp3d" />, <see cref="A14.imgProps" />, <see cref="A14.isCanvas" />, <see cref="A14.shadowObscured" />, <see cref="A14.useLocalDpi" />, <see cref="A15.backgroundPr" />, <see cref="A15.nonVisualGroupProps" />, <see cref="A15.objectPr" />, <see cref="A15.signatureLine" />, <see cref="A16.colId" />, <see cref="A16.creationId" />, <see cref="A16.predDERef" />, <see cref="A16.rowId" />, <see cref="A1611.picAttrSrcUrl" />, <see cref="ACLSH.classification" />, <see cref="ADEC.decorative" />, <see cref="AHYP.hlinkClr" />, <see cref="AIF.imageFormula" />, <see cref="ALF.liveFeedProps" />, <see cref="AOE.oembedShared" />, <see cref="ASK.lineSketchStyleProps" />, <see cref="ASL.scriptLink" />, <see cref="ASVG.svgBlip" />, <see cref="DGM14.cNvPr" />, <see cref="DGM14.recolorImg" />, <see cref="DSP.dataModelExt" />, <see cref="THM15.themeFamily" />, <see cref="WOE.oembed" />, <see cref="WP15.webVideoPr" />.</description></item>
/// <item><description>has the following XML attributes: <see cref="NoNamespace.uri" />.</description></item>
/// <item><description>corresponds to the following strongly-typed classes: BlipExtension, ConnectorLockingExtension, DataModelExtension, Extension, Extents, GvmlGroupShapeExtension, HyperlinkExtension, LinePropertiesExtension, NonVisualDrawingPropertiesExtension, NonVisualGroupDrawingShapePropsExtension, NonVisualPicturePropertiesExtension, OfficeStyleSheetExtension, PtExtension, ShapePropertiesExtension.</description></item>
/// <item><description>corresponds to the following strongly-typed classes: BlipExtension, ConnectorLockingExtension, DataModelExtension, Extension, Extents, GvmlGroupShapeExtension, HyperlinkExtension, LinePropertiesExtension, NonVisualDrawingPropertiesExtension, NonVisualGroupDrawingShapePropsExtension, NonVisualPicturePropertiesExtension, OfficeStyleSheetExtension, PtExtension, ShapePropertiesExtension, TableColExtension, TableRowExtension.</description></item>
/// </list>
/// </remarks>
public static readonly XName ext = a + "ext";
Expand All @@ -1411,7 +1411,7 @@ public static partial class A
/// <list type="bullet">
/// <item><description>has the following parent XML elements: <see cref="audioCd" />, <see cref="audioFile" />, <see cref="backdrop" />, <see cref="blip" />, <see cref="bodyPr" />, <see cref="cell3D" />, <see cref="clrMap" />, <see cref="clrScheme" />, <see cref="cNvCxnSpPr" />, <see cref="cNvGraphicFramePr" />, <see cref="cNvGrpSpPr" />, <see cref="cNvPicPr" />, <see cref="cNvPr" />, <see cref="cNvSpPr" />, <see cref="cxnSp" />, <see cref="cxnSpLocks" />, <see cref="defPPr" />, <see cref="defRPr" />, <see cref="endParaRPr" />, <see cref="font" />, <see cref="fontScheme" />, <see cref="graphicFrame" />, <see cref="graphicFrameLocks" />, <see cref="gridCol" />, <see cref="grpSp" />, <see cref="grpSpLocks" />, <see cref="grpSpPr" />, <see cref="hlinkClick" />, <see cref="hlinkHover" />, <see cref="hlinkMouseOver" />, <see cref="ln" />, <see cref="lnB" />, <see cref="lnBlToTr" />, <see cref="lnDef" />, <see cref="lnL" />, <see cref="lnR" />, <see cref="lnT" />, <see cref="lnTlToBr" />, <see cref="lstStyle" />, <see cref="lvl1pPr" />, <see cref="lvl2pPr" />, <see cref="lvl3pPr" />, <see cref="lvl4pPr" />, <see cref="lvl5pPr" />, <see cref="lvl6pPr" />, <see cref="lvl7pPr" />, <see cref="lvl8pPr" />, <see cref="lvl9pPr" />, <see cref="majorFont" />, <see cref="minorFont" />, <see cref="objectDefaults" />, <see cref="overrideClrMapping" />, <see cref="pic" />, <see cref="picLocks" />, <see cref="pPr" />, <see cref="quickTimeFile" />, <see cref="rPr" />, <see cref="scene3d" />, <see cref="sp" />, <see cref="sp3d" />, <see cref="spDef" />, <see cref="spLocks" />, <see cref="spPr" />, <see cref="tableStyle" />, <see cref="tblPr" />, <see cref="tblStyle" />, <see cref="tc" />, <see cref="tcBdr" />, <see cref="tcPr" />, <see cref="tcTxStyle" />, <see cref="theme" />, <see cref="themeElements" />, <see cref="tr" />, <see cref="txDef" />, <see cref="txSp" />, <see cref="uLn" />, <see cref="videoFile" />, <see cref="A14.cNvPr" />, <see cref="A14.hiddenLine" />, <see cref="A14.hiddenScene3d" />, <see cref="A14.hiddenSp3d" />, <see cref="C.clrMapOvr" />, <see cref="C.spPr" />, <see cref="C14.spPr" />, <see cref="C15.spPr" />, <see cref="C16.spPr" />, <see cref="CDR.cNvCxnSpPr" />, <see cref="CDR.cNvGraphicFramePr" />, <see cref="CDR.cNvGrpSpPr" />, <see cref="CDR.cNvPicPr" />, <see cref="CDR.cNvPr" />, <see cref="CDR.cNvSpPr" />, <see cref="CDR.grpSpPr" />, <see cref="CDR.spPr" />, <see cref="CDR14.cNvPr" />, <see cref="CS.bodyPr" />, <see cref="CS.defRPr" />, <see cref="CS.spPr" />, <see cref="CX.clrMapOvr" />, <see cref="CX.spPr" />, <see cref="DGM.scene3d" />, <see cref="DGM.sp3d" />, <see cref="DGM.spPr" />, <see cref="DGM14.cNvPr" />, <see cref="DGM1612.lstStyle" />, <see cref="DGM1612.spPr" />, <see cref="DSP.cNvGrpSpPr" />, <see cref="DSP.cNvPr" />, <see cref="DSP.cNvSpPr" />, <see cref="DSP.grpSpPr" />, <see cref="DSP.spPr" />, <see cref="LC.lockedCanvas" />, <see cref="OAC.cNvGrpSpPr" />, <see cref="OAC.cNvPr" />, <see cref="OAC.grpSpPr" />, <see cref="OAC.lineProps" />, <see cref="OAC.pPr" />, <see cref="P.bodyStyle" />, <see cref="P.clrMap" />, <see cref="P.cNvCxnSpPr" />, <see cref="P.cNvGraphicFramePr" />, <see cref="P.cNvGrpSpPr" />, <see cref="P.cNvPicPr" />, <see cref="P.cNvPr" />, <see cref="P.cNvSpPr" />, <see cref="P.defaultTextStyle" />, <see cref="P.grpSpPr" />, <see cref="P.notesStyle" />, <see cref="P.otherStyle" />, <see cref="P.spPr" />, <see cref="P.titleStyle" />, <see cref="P14.cNvPr" />, <see cref="PIC.cNvPicPr" />, <see cref="PIC.cNvPr" />, <see cref="PIC.spPr" />, <see cref="W14.cNvPr" />, <see cref="WE.snapshot" />, <see cref="WP.cNvGraphicFramePr" />, <see cref="WP.docPr" />, <see cref="WPG.cNvFrPr" />, <see cref="WPG.cNvGrpSpPr" />, <see cref="WPG.cNvPr" />, <see cref="WPG.grpSpPr" />, <see cref="WPS.bodyPr" />, <see cref="WPS.cNvCnPr" />, <see cref="WPS.cNvPr" />, <see cref="WPS.cNvSpPr" />, <see cref="WPS.spPr" />, <see cref="XDR.cNvCxnSpPr" />, <see cref="XDR.cNvGraphicFramePr" />, <see cref="XDR.cNvGrpSpPr" />, <see cref="XDR.cNvPicPr" />, <see cref="XDR.cNvPr" />, <see cref="XDR.cNvSpPr" />, <see cref="XDR.grpSpPr" />, <see cref="XDR.spPr" />, <see cref="XDR14.cNvPr" />.</description></item>
/// <item><description>has the following child XML elements: <see cref="ext" />.</description></item>
/// <item><description>corresponds to the following strongly-typed classes: BlipExtensionList, ConnectorLockingExtensionList, ExtensionList, GvmlGroupShapeExtensionList, HyperlinkExtensionList, LinePropertiesExtensionList, NonVisualDrawingPropertiesExtensionList, NonVisualGroupDrawingShapePropsExtensionList, NonVisualPicturePropertiesExtensionList, OfficeStyleSheetExtensionList, ShapePropertiesExtensionList.</description></item>
/// <item><description>corresponds to the following strongly-typed classes: BlipExtensionList, ConnectorLockingExtensionList, ExtensionList, GvmlGroupShapeExtensionList, HyperlinkExtensionList, LinePropertiesExtensionList, NonVisualDrawingPropertiesExtensionList, NonVisualGroupDrawingShapePropsExtensionList, NonVisualPicturePropertiesExtensionList, OfficeStyleSheetExtensionList, ShapePropertiesExtensionList, TableColExtensionList, TableRowExtensionList.</description></item>
/// </list>
/// </remarks>
public static readonly XName extLst = a + "extLst";
Expand Down
Loading
Loading