Skip to content

Commit 8e8c05f

Browse files
twsouthwicktwsouthwick
committed
fix generated
1 parent b01a350 commit 8e8c05f

File tree

33 files changed

+1
-10065
lines changed

33 files changed

+1
-10065
lines changed

‎generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_excel.g.cs‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
147147
{
148148
base.ConfigureMetadata(builder);
149149
builder.SetSchema(ElementType);
150-
<<<<<<< HEAD
151150
builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.CommentRowTarget.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.CommentRowTarget());
152151
builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.CommentColumnTarget.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.CommentColumnTarget());
153152
builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.InputValidationType.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.InputValidationType());
@@ -215,75 +214,6 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
215214
builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.AutoScaleFont.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.AutoScaleFont());
216215
builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.DdeObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.DdeObject());
217216
builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.UIObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.UIObject());
218-
=======
219-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.CommentRowTarget>();
220-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.CommentColumnTarget>();
221-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.InputValidationType>();
222-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MinDropDownWidth>();
223-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.SelectionEntry>();
224-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DropLines>();
225-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Checked>();
226-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarPosition>();
227-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarMin>();
228-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarMax>();
229-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarIncrement>();
230-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarPageIncrement>();
231-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarWidth>();
232-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptLanguage>();
233-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptLocation>();
234-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Anchor>();
235-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.HorizontalTextAlignment>();
236-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.VerticalTextAlignment>();
237-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaRange>();
238-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.SelectionType>();
239-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MultiSelections>();
240-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ListBoxCallbackType>();
241-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ListItem>();
242-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DropStyle>();
243-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaLink>();
244-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaPicture>();
245-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaGroup>();
246-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptText>();
247-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptExtended>();
248-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaTextBox>();
249-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AcceleratorPrimary>();
250-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AcceleratorSecondary>();
251-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClipboardFormat>();
252-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaMacro>();
253-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MoveWithCells>();
254-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ResizeWithCells>();
255-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Locked>();
256-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DefaultSize>();
257-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.PrintObject>();
258-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Disabled>();
259-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AutoFill>();
260-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AutoLine>();
261-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AutoSizePicture>();
262-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.LockText>();
263-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.JustifyLastLine>();
264-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.SecretEdit>();
265-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DefaultButton>();
266-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.HelpButton>();
267-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.CancelButton>();
268-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DismissButton>();
269-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Visible>();
270-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.RowHidden>();
271-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ColumnHidden>();
272-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MultiLine>();
273-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.VerticalScrollBar>();
274-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ValidIds>();
275-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Disable3DForListBoxAndDropDown>();
276-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Colored>();
277-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Disable3D>();
278-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FirstButton>();
279-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.HorizontalScrollBar>();
280-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MapOcxControl>();
281-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.CameraObject>();
282-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.RecalculateAlways>();
283-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AutoScaleFont>();
284-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DdeObject>();
285-
builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.UIObject>();
286-
>>>>>>> origin/main
287217
builder.AddElement<ClientData>()
288218
.AddAttribute("ObjectType", a => a.ObjectType, aBuilder =>
289219
{

‎generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_office.g.cs‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
194194
{
195195
base.ConfigureMetadata(builder);
196196
builder.SetSchema(ElementType);
197-
<<<<<<< HEAD
198197
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
199198
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ColorMenu.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ColorMenu());
200199
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed());
@@ -206,19 +205,6 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
206205
builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
207206
builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
208207
builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
209-
=======
210-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
211-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ColorMenu>();
212-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed>();
213-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
214-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
215-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
216-
builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
217-
builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
218-
builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
219-
builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
220-
builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
221-
>>>>>>> origin/main
222208
builder.AddElement<ShapeDefaults>()
223209
.AddAttribute("v:ext", a => a.Extension)
224210
.AddAttribute("spidmax", a => a.MaxShapeId)
@@ -462,15 +448,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
462448
{
463449
base.ConfigureMetadata(builder);
464450
builder.SetSchema(ElementType);
465-
<<<<<<< HEAD
466451
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ShapeIdMap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ShapeIdMap());
467452
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.RegroupTable.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.RegroupTable());
468453
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Rules.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Rules());
469-
=======
470-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ShapeIdMap>();
471-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.RegroupTable>();
472-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Rules>();
473-
>>>>>>> origin/main
474454
builder.AddElement<ShapeLayout>()
475455
.AddAttribute("v:ext", a => a.Extension);
476456
builder.Particle = new CompositeParticle.Builder(ParticleType.All, 1, 1)
@@ -927,11 +907,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
927907
{
928908
base.ConfigureMetadata(builder);
929909
builder.SetSchema(ElementType);
930-
<<<<<<< HEAD
931910
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.RelationTable.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.RelationTable());
932-
=======
933-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.RelationTable>();
934-
>>>>>>> origin/main
935911
builder.AddElement<Diagram>()
936912
.AddAttribute("v:ext", a => a.Extension)
937913
.AddAttribute("dgmstyle", a => a.Style)
@@ -1929,15 +1905,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
19291905
{
19301906
base.ConfigureMetadata(builder);
19311907
builder.SetSchema(ElementType);
1932-
<<<<<<< HEAD
19331908
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.LinkType.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.LinkType());
19341909
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.LockedField.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.LockedField());
19351910
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.FieldCodes.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.FieldCodes());
1936-
=======
1937-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.LinkType>();
1938-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.LockedField>();
1939-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.FieldCodes>();
1940-
>>>>>>> origin/main
19411911
builder.AddElement<OleObject>()
19421912
.AddAttribute("Type", a => a.Type)
19431913
.AddAttribute("ProgID", a => a.ProgId)
@@ -2763,11 +2733,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
27632733
{
27642734
base.ConfigureMetadata(builder);
27652735
builder.SetSchema(ElementType);
2766-
<<<<<<< HEAD
27672736
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Entry.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Entry());
2768-
=======
2769-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Entry>();
2770-
>>>>>>> origin/main
27712737
builder.AddElement<RegroupTable>()
27722738
.AddAttribute("v:ext", a => a.Extension);
27732739
builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2847,11 +2813,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
28472813
{
28482814
base.ConfigureMetadata(builder);
28492815
builder.SetSchema(ElementType);
2850-
<<<<<<< HEAD
28512816
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Rule.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Rule());
2852-
=======
2853-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Rule>();
2854-
>>>>>>> origin/main
28552817
builder.AddElement<Rules>()
28562818
.AddAttribute("v:ext", a => a.Extension);
28572819
builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -3011,11 +2973,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
30112973
{
30122974
base.ConfigureMetadata(builder);
30132975
builder.SetSchema(ElementType);
3014-
<<<<<<< HEAD
30152976
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Proxy.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Proxy());
3016-
=======
3017-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Proxy>();
3018-
>>>>>>> origin/main
30192977
builder.AddElement<Rule>()
30202978
.AddAttribute("id", a => a.Id, aBuilder =>
30212979
{
@@ -3104,11 +3062,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
31043062
{
31053063
base.ConfigureMetadata(builder);
31063064
builder.SetSchema(ElementType);
3107-
<<<<<<< HEAD
31083065
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Relation.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Relation());
3109-
=======
3110-
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Relation>();
3111-
>>>>>>> origin/main
31123066
builder.AddElement<RelationTable>()
31133067
.AddAttribute("v:ext", a => a.Extension);
31143068
builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)

0 commit comments

Comments
 (0)