From fd47ec1daf7d5757f419d32fb510d5d598b6cf87 Mon Sep 17 00:00:00 2001 From: Michael Bowen Date: Wed, 28 Aug 2024 13:33:17 -0700 Subject: [PATCH 1/5] add August 2024 XSD updates --- data/namespaces.json | 5 + ...fice_spreadsheetml_2022_pivotRichData.json | 73 ++++++++++ ...readsheetml_2023_pivot2023Calculation.json | 12 ++ ...mlformats_org_spreadsheetml_2006_main.json | 24 ++++ data/typed/namespaces.json | 4 + ...fice_spreadsheetml_2022_pivotRichData.json | 14 ++ .../Namespaces.g.cs | 3 + .../Linq.X.g.cs | 2 +- .../Linq.XLPAR.g.cs | 30 ++++ .../Linq.XPRD.g.cs | 42 ++++++ ...fice_spreadsheetml_2022_pivotRichData.g.cs | 129 ++++++++++++++++++ ...readsheetml_2023_pivot2023Calculation.g.cs | 18 +++ ...mlformats_org_spreadsheetml_2006_main.g.cs | 10 ++ .../ElementChildren.json | 20 +++ .../OpenXmlNamespaceTests.cs | 2 +- .../data/Particles.json | 9 ++ 16 files changed, 395 insertions(+), 2 deletions(-) create mode 100644 data/schemas/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json create mode 100644 data/typed/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json create mode 100644 generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XLPAR.g.cs create mode 100644 generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XPRD.g.cs create mode 100644 generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs diff --git a/data/namespaces.json b/data/namespaces.json index d81d08212..c52f42623 100644 --- a/data/namespaces.json +++ b/data/namespaces.json @@ -694,6 +694,11 @@ "Uri": "http://schemas.microsoft.com/office/spreadsheetml/2016/pivotdefaultlayout", "Version": "Office2019" }, + { + "Prefix": "xprd", + "Uri": "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData", + "Version": "Microsoft365" + }, { "Prefix": "xr", "Uri": "http://schemas.microsoft.com/office/spreadsheetml/2014/revision", diff --git a/data/schemas/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json b/data/schemas/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json new file mode 100644 index 000000000..769db385f --- /dev/null +++ b/data/schemas/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json @@ -0,0 +1,73 @@ +{ + "TargetNamespace": "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData", + "Types": [ + { + "Name": "xprd:CT_PivotCacheRichInfo/xprd:richInfo", + "ClassName": "RichInfoPivotCacheRichInfo", + "Summary": "Defines the RichInfoPivotCacheRichInfo Class.", + "BaseClass": "OpenXmlPivotCacheRichInfoElement", + "IsDerived": true, + "IsLeafElement": true, + "Version": "Microsoft365" + }, + { + "Name": "xprd:CT_PivotCacheRichInfo/xprd:pivotCacheHasRichValue", + "ClassName": "PivotCacheHasRichValuePivotCacheRichInfo", + "Summary": "Defines the PivotCacheHasRichValuePivotCacheRichInfo Class.", + "BaseClass": "OpenXmlPivotCacheRichInfoElement", + "IsDerived": true, + "IsLeafElement": true, + "Version": "Microsoft365" + }, + { + "Name": "xprd:CT_PivotCacheRichInfo/", + "ClassName": "OpenXmlPivotCacheRichInfoElement", + "Summary": "Defines the OpenXmlPivotCacheRichInfoElement Class.", + "BaseClass": "OpenXmlLeafElement", + "IsAbstract": true, + "IsLeafElement": true, + "Version": "Microsoft365", + "Attributes": [ + { + "QName": ":pivotCacheGuid", + "Type": "StringValue", + "Version": "Microsoft365", + "PropertyComments": "pivotCacheGuid", + "Validators": [ + { + "Name": "RequiredValidator" + }, + { + "Arguments": [ + { + "Type": "Boolean", + "Name": "IsToken", + "Value": "True" + }, + { + "Type": "String", + "Name": "Pattern", + "Value": "\\{[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\\}" + } + ], + "Name": "StringValidator", + "IsInitialVersion": true + } + ] + }, + { + "QName": ":pivotIgnoreInvalidCache", + "Type": "BooleanValue", + "Version": "Microsoft365", + "PropertyComments": "pivotIgnoreInvalidCache" + }, + { + "QName": "r:id", + "Type": "StringValue", + "Version": "Microsoft365", + "PropertyComments": "id" + } + ] + } + ] +} \ No newline at end of file diff --git a/data/schemas/schemas_microsoft_com_office_spreadsheetml_2023_pivot2023Calculation.json b/data/schemas/schemas_microsoft_com_office_spreadsheetml_2023_pivot2023Calculation.json index c507fd49c..6a80736eb 100644 --- a/data/schemas/schemas_microsoft_com_office_spreadsheetml_2023_pivot2023Calculation.json +++ b/data/schemas/schemas_microsoft_com_office_spreadsheetml_2023_pivot2023Calculation.json @@ -67,6 +67,18 @@ { "Version": "Microsoft365", "Value": "median" + }, + { + "Version": "Microsoft365", + "Value": "distinctDuplicates" + }, + { + "Version": "Microsoft365", + "Value": "countValuesDuplicated" + }, + { + "Version": "Microsoft365", + "Value": "countRepeatValues" } ], "Version": "Microsoft365" diff --git a/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json b/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json index 8de8251ca..d7f0dd8e0 100644 --- a/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json +++ b/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json @@ -24271,9 +24271,21 @@ "Name": "xsd:boolean/xxpim:implicitMeasureSupport", "PropertyName": "Xsdboolean" }, + { + "Name": "xprd:CT_PivotCacheRichInfo/xprd:pivotCacheHasRichValue", + "PropertyName": "PivotCacheHasRichValuePivotCacheRichInfo" + }, + { + "Name": "xprd:CT_PivotCacheRichInfo/xprd:richInfo", + "PropertyName": "RichInfoPivotCacheRichInfo" + }, { "Name": "xxpvi:CT_CacheVersionInfo/xxpvi:cacheVersionInfo", "PropertyName": "CacheVersionInfo" + }, + { + "Name": "xsd:boolean/xlpar:autoRefresh", + "PropertyName": "Xsdboolean" } ], "Particle": { @@ -24299,10 +24311,22 @@ "Name": "xsd:boolean/xxpim:implicitMeasureSupport", "InitialVersion": "Office2021" }, + { + "Name": "xprd:CT_PivotCacheRichInfo/xprd:pivotCacheHasRichValue", + "InitialVersion": "Microsoft365" + }, + { + "Name": "xprd:CT_PivotCacheRichInfo/xprd:richInfo", + "InitialVersion": "Microsoft365" + }, { "Name": "xxpvi:CT_CacheVersionInfo/xxpvi:cacheVersionInfo", "InitialVersion": "Microsoft365" }, + { + "Name": "xsd:boolean/xlpar:autoRefresh", + "InitialVersion": "Microsoft365" + }, { "Kind": "Any", "Occurs": [ diff --git a/data/typed/namespaces.json b/data/typed/namespaces.json index 40e6cf992..ba3b0370c 100644 --- a/data/typed/namespaces.json +++ b/data/typed/namespaces.json @@ -151,6 +151,10 @@ "Prefix": "xxl21", "Namespace": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021" }, + { + "Prefix": "xprd", + "Namespace": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData" + }, { "Prefix": "xxpvi", "Namespace": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo" diff --git a/data/typed/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json b/data/typed/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json new file mode 100644 index 000000000..b253216e1 --- /dev/null +++ b/data/typed/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json @@ -0,0 +1,14 @@ +[ + { + "Name": "xprd:CT_PivotCacheRichInfo/", + "ClassName": "OpenXmlPivotCacheRichInfoElement" + }, + { + "Name": "xprd:CT_PivotCacheRichInfo/xprd:pivotCacheHasRichValue", + "ClassName": "PivotCacheHasRichValuePivotCacheRichInfo" + }, + { + "Name": "xprd:CT_PivotCacheRichInfo/xprd:richInfo", + "ClassName": "RichInfoPivotCacheRichInfo" + } +] \ No newline at end of file diff --git a/generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs b/generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs index d91cd4434..711de09da 100644 --- a/generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs +++ b/generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs @@ -161,6 +161,7 @@ internal partial class OpenXmlNamespaceResolver { "http://schemas.microsoft.com/office/excel/2006/main", "xne" }, { "http://schemas.microsoft.com/office/spreadsheetml/2019/namedsheetviews", "xnsv" }, { "http://schemas.microsoft.com/office/spreadsheetml/2016/pivotdefaultlayout", "xpdl" }, + { "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData", "xprd" }, { "http://schemas.microsoft.com/office/spreadsheetml/2014/revision", "xr" }, { "http://schemas.microsoft.com/office/spreadsheetml/2016/revision10", "xr10" }, { "http://schemas.microsoft.com/office/spreadsheetml/2017/revision16", "xr16" }, @@ -328,6 +329,7 @@ internal partial class OpenXmlNamespaceResolver { "xne", "http://schemas.microsoft.com/office/excel/2006/main" }, { "xnsv", "http://schemas.microsoft.com/office/spreadsheetml/2019/namedsheetviews" }, { "xpdl", "http://schemas.microsoft.com/office/spreadsheetml/2016/pivotdefaultlayout" }, + { "xprd", "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData" }, { "xr", "http://schemas.microsoft.com/office/spreadsheetml/2014/revision" }, { "xr10", "http://schemas.microsoft.com/office/spreadsheetml/2016/revision10" }, { "xr16", "http://schemas.microsoft.com/office/spreadsheetml/2017/revision16" }, @@ -495,6 +497,7 @@ internal partial class OpenXmlNamespaceResolver { "xne", FileFormatVersions.Office2007 }, { "xnsv", FileFormatVersions.Office2021 }, { "xpdl", FileFormatVersions.Office2019 }, + { "xprd", FileFormatVersions.Microsoft365 }, { "xr", FileFormatVersions.Office2016 }, { "xr10", FileFormatVersions.Office2019 }, { "xr16", FileFormatVersions.Office2019 }, diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs index e5c16cea0..b76f2c074 100644 --- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs @@ -1454,7 +1454,7 @@ public static partial class X /// As an XML element, it: /// /// has the following parent XML elements: , , , , , , , , , . - /// has the following child XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . + /// has the following child XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . /// has the following XML attributes: . /// corresponds to the following strongly-typed classes: CacheFieldExtension, CacheHierarchyExtension, CacheSourceExtension, CalculatedMemberExtension, ConditionalFormattingRuleExtension, ConnectionExtension, DataFieldExtension, Extension, PivotCacheDefinitionExtension, PivotFieldExtension, PivotFilterExtension, PivotHierarchyExtension, PivotTableDefinitionExtension, QueryTableExtension, SlicerCacheDefinitionExtension, StylesheetExtension, TableExtension, WorkbookExtension, WorksheetExtension. /// diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XLPAR.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XLPAR.g.cs new file mode 100644 index 000000000..498311b0b --- /dev/null +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XLPAR.g.cs @@ -0,0 +1,30 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Xml.Linq; + +namespace DocumentFormat.OpenXml.Linq +{ + /// + /// Declares XNamespace and XName fields for the xmlns:xlpar="http://schemas.microsoft.com/office/spreadsheetml/2024/pivotAutoRefresh" namespace. + /// + public static partial class XLPAR + { + /// + /// Defines the XML namespace associated with the xlpar prefix. + /// + public static readonly XNamespace xlpar = "http://schemas.microsoft.com/office/spreadsheetml/2024/pivotAutoRefresh"; + + /// + /// Represents the xlpar:autoRefresh XML element. + /// + /// + /// As an XML element, it: + /// + /// has the following parent XML elements: . + /// corresponds to the following strongly-typed classes: Xsdboolean. + /// + /// + public static readonly XName autoRefresh = xlpar + "autoRefresh"; + } +} diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XPRD.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XPRD.g.cs new file mode 100644 index 000000000..c7dd7c80d --- /dev/null +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XPRD.g.cs @@ -0,0 +1,42 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Xml.Linq; + +namespace DocumentFormat.OpenXml.Linq +{ + /// + /// Declares XNamespace and XName fields for the xmlns:xprd="http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData" namespace. + /// + public static partial class XPRD + { + /// + /// Defines the XML namespace associated with the xprd prefix. + /// + public static readonly XNamespace xprd = "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData"; + + /// + /// Represents the xprd:pivotCacheHasRichValue XML element. + /// + /// + /// As an XML element, it: + /// + /// has the following parent XML elements: . + /// corresponds to the following strongly-typed classes: PivotCacheHasRichValuePivotCacheRichInfo. + /// + /// + public static readonly XName pivotCacheHasRichValue = xprd + "pivotCacheHasRichValue"; + + /// + /// Represents the xprd:richInfo XML element. + /// + /// + /// As an XML element, it: + /// + /// has the following parent XML elements: . + /// corresponds to the following strongly-typed classes: RichInfoPivotCacheRichInfo. + /// + /// + public static readonly XName richInfo = xprd + "richInfo"; + } +} diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs new file mode 100644 index 000000000..bf1f76409 --- /dev/null +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs @@ -0,0 +1,129 @@ +// + +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#nullable enable + +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Framework; +using DocumentFormat.OpenXml.Framework.Metadata; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Validation.Schema; +using System; +using System.Collections.Generic; +using System.IO.Packaging; + +namespace DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData +{ + /// + /// Defines the RichInfoPivotCacheRichInfo Class. + /// This class is available in Microsoft365 and above. + /// When the object is serialized out as xml, it's qualified name is xprd:richInfo. + /// + public partial class RichInfoPivotCacheRichInfo : OpenXmlPivotCacheRichInfoElement + { + /// + /// Initializes a new instance of the RichInfoPivotCacheRichInfo class. + /// + public RichInfoPivotCacheRichInfo() : base() + { + } + + internal override void ConfigureMetadata(ElementMetadata.Builder builder) + { + base.ConfigureMetadata(builder); + builder.SetSchema("xprd:richInfo"); + builder.Availability = FileFormatVersions.Microsoft365; + } + + /// + public override OpenXmlElement CloneNode(bool deep) => CloneImp(deep); + } + + /// + /// Defines the PivotCacheHasRichValuePivotCacheRichInfo Class. + /// This class is available in Microsoft365 and above. + /// When the object is serialized out as xml, it's qualified name is xprd:pivotCacheHasRichValue. + /// + public partial class PivotCacheHasRichValuePivotCacheRichInfo : OpenXmlPivotCacheRichInfoElement + { + /// + /// Initializes a new instance of the PivotCacheHasRichValuePivotCacheRichInfo class. + /// + public PivotCacheHasRichValuePivotCacheRichInfo() : base() + { + } + + internal override void ConfigureMetadata(ElementMetadata.Builder builder) + { + base.ConfigureMetadata(builder); + builder.SetSchema("xprd:pivotCacheHasRichValue"); + builder.Availability = FileFormatVersions.Microsoft365; + } + + /// + public override OpenXmlElement CloneNode(bool deep) => CloneImp(deep); + } + + /// + /// Defines the OpenXmlPivotCacheRichInfoElement Class. + /// This class is available in Microsoft365 and above. + /// When the object is serialized out as xml, it's qualified name is :. + /// + public abstract partial class OpenXmlPivotCacheRichInfoElement : OpenXmlLeafElement + { + /// + /// Initializes a new instance of the OpenXmlPivotCacheRichInfoElement class. + /// + protected OpenXmlPivotCacheRichInfoElement() : base() + { + } + + /// + /// pivotCacheGuid, this property is only available in Microsoft365 and later. + /// Represents the following attribute in the schema: pivotCacheGuid + /// + public StringValue? PivotCacheGuid + { + get => GetAttribute(); + set => SetAttribute(value); + } + + /// + /// pivotIgnoreInvalidCache, this property is only available in Microsoft365 and later. + /// Represents the following attribute in the schema: pivotIgnoreInvalidCache + /// + public BooleanValue? PivotIgnoreInvalidCache + { + get => GetAttribute(); + set => SetAttribute(value); + } + + /// + /// id, this property is only available in Microsoft365 and later. + /// Represents the following attribute in the schema: r:id + /// + /// + /// xmlns:r=http://schemas.openxmlformats.org/officeDocument/2006/relationships + /// + public StringValue? Id + { + get => GetAttribute(); + set => SetAttribute(value); + } + + internal override void ConfigureMetadata(ElementMetadata.Builder builder) + { + base.ConfigureMetadata(builder); + builder.AddElement() + .AddAttribute("pivotCacheGuid", a => a.PivotCacheGuid, aBuilder => + { + aBuilder.AddValidator(RequiredValidator.Instance); + aBuilder.AddValidator(new StringValidator() { IsToken = (true), Pattern = ("\\{[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\\}") }); + }) + .AddAttribute("pivotIgnoreInvalidCache", a => a.PivotIgnoreInvalidCache) + .AddAttribute("r:id", a => a.Id); + } + } +} \ No newline at end of file diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_pivot2023Calculation.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_pivot2023Calculation.g.cs index 1754061af..aa1da1cd0 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_pivot2023Calculation.g.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_pivot2023Calculation.g.cs @@ -125,6 +125,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) { "distinctCount" => true, "median" => true, + "distinctDuplicates" => true, + "countValuesDuplicated" => true, + "countRepeatValues" => true, _ => false }; string IEnumValue.Value => InternalValue; @@ -140,6 +143,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) /// When the item is serialized out as xml, its value is "median". /// public static AggregationType Median => new("median"); + /// + /// distinctDuplicates. + /// When the item is serialized out as xml, its value is "distinctDuplicates". + /// + public static AggregationType DistinctDuplicates => new("distinctDuplicates"); + /// + /// countValuesDuplicated. + /// When the item is serialized out as xml, its value is "countValuesDuplicated". + /// + public static AggregationType CountValuesDuplicated => new("countValuesDuplicated"); + /// + /// countRepeatValues. + /// When the item is serialized out as xml, its value is "countRepeatValues". + /// + public static AggregationType CountRepeatValues => new("countRepeatValues"); } } \ No newline at end of file diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs index 40650b2ab..e78f3ffbe 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs @@ -11,6 +11,7 @@ using DocumentFormat.OpenXml.Framework; using DocumentFormat.OpenXml.Framework.Metadata; using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021; +using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData; using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo; using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.ExternalCodeService; using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms; @@ -45036,7 +45037,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) /// <x15:pivotCacheDecoupled> /// <x15:pivotCacheIdVersion> /// <x15:timelinePivotCacheDefinition> + /// <xprd:pivotCacheHasRichValue> + /// <xprd:richInfo> /// <xxpim:implicitMeasureSupport> + /// <xlpar:autoRefresh> /// <xxpvi:cacheVersionInfo> /// /// @@ -45091,7 +45095,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) builder.AddChild(); builder.AddChild(); builder.AddChild(); + builder.AddChild(); + builder.AddChild(); builder.AddChild(); + builder.AddChild(); builder.AddChild(); builder.AddElement() .AddAttribute("uri", a => a.Uri, aBuilder => @@ -45106,7 +45113,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) new ElementParticle(typeof(DocumentFormat.OpenXml.Office2013.Excel.TimelinePivotCacheDefinition), 1, 1, version: FileFormatVersions.Office2013), new ElementParticle(typeof(DocumentFormat.OpenXml.Office2013.Excel.PivotCacheIdVersion), 1, 1, version: FileFormatVersions.Office2013), new ElementParticle(typeof(DocumentFormat.OpenXml.Office2021.Excel.Pivot.Xsdboolean), 1, 1, version: FileFormatVersions.Office2021), + new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheHasRichValuePivotCacheRichInfo), 1, 1, version: FileFormatVersions.Microsoft365), + new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.RichInfoPivotCacheRichInfo), 1, 1, version: FileFormatVersions.Microsoft365), new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo), 1, 1, version: FileFormatVersions.Microsoft365), + new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean), 1, 1, version: FileFormatVersions.Microsoft365), new AnyParticle(0, 1) }; } diff --git a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json index 7c38959b3..d9220ae32 100644 --- a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json +++ b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json @@ -22749,6 +22749,14 @@ "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.RelativeUrlAlternateUrl", "Children": [] }, + { + "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheHasRichValuePivotCacheRichInfo", + "Children": [] + }, + { + "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.RichInfoPivotCacheRichInfo", + "Children": [] + }, { "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo", "Children": [ @@ -45134,9 +45142,21 @@ "Name": "implicitMeasureSupport", "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2020/pivotNov2020" }, + { + "Name": "pivotCacheHasRichValue", + "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData" + }, + { + "Name": "richInfo", + "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData" + }, { "Name": "cacheVersionInfo", "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotVersionInfo" + }, + { + "Name": "autoRefresh", + "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2024/pivotAutoRefresh" } ] }, diff --git a/test/DocumentFormat.OpenXml.Framework.Tests/OpenXmlNamespaceTests.cs b/test/DocumentFormat.OpenXml.Framework.Tests/OpenXmlNamespaceTests.cs index 63c0f43d4..e88b816ac 100644 --- a/test/DocumentFormat.OpenXml.Framework.Tests/OpenXmlNamespaceTests.cs +++ b/test/DocumentFormat.OpenXml.Framework.Tests/OpenXmlNamespaceTests.cs @@ -12,7 +12,7 @@ public class OpenXmlNamespaceTests public void NamespaceCount() { var resolver = new OpenXmlNamespaceResolver(); - Assert.Equal(163, resolver.GetNamespacesInScope(System.Xml.XmlNamespaceScope.All).Count); + Assert.Equal(164, resolver.GetNamespacesInScope(System.Xml.XmlNamespaceScope.All).Count); } [InlineData("", "", FileFormatVersions.Office2007)] diff --git a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json index d5e51f21b..420bde12a 100644 --- a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json +++ b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json @@ -65323,9 +65323,18 @@ { "ElementType": "DocumentFormat.OpenXml.Office2021.Excel.Pivot.Xsdboolean" }, + { + "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheHasRichValuePivotCacheRichInfo" + }, + { + "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.RichInfoPivotCacheRichInfo" + }, { "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo" }, + { + "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean" + }, { "MinOccurs": 0, "ParticleType": "Any" From 74df7a695b892c821042b0be9bcfd0a4a368dd8e Mon Sep 17 00:00:00 2001 From: Michael Bowen Date: Fri, 30 Aug 2024 14:31:15 -0700 Subject: [PATCH 2/5] remove pivotCacheHasRichValue element --- ...fice_spreadsheetml_2022_pivotRichData.json | 23 +------ ...mlformats_org_spreadsheetml_2006_main.json | 10 +-- ...fice_spreadsheetml_2022_pivotRichData.json | 10 +-- .../Linq.NoNamespace.g.cs | 24 +++++++ .../Linq.R.g.cs | 4 +- .../Linq.X.g.cs | 2 +- .../Linq.XPRD.g.cs | 15 +---- ...fice_spreadsheetml_2022_pivotRichData.g.cs | 65 +++---------------- ...mlformats_org_spreadsheetml_2006_main.g.cs | 9 +-- 9 files changed, 46 insertions(+), 116 deletions(-) diff --git a/data/schemas/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json b/data/schemas/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json index 769db385f..a4c14b45a 100644 --- a/data/schemas/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json +++ b/data/schemas/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json @@ -3,28 +3,9 @@ "Types": [ { "Name": "xprd:CT_PivotCacheRichInfo/xprd:richInfo", - "ClassName": "RichInfoPivotCacheRichInfo", - "Summary": "Defines the RichInfoPivotCacheRichInfo Class.", - "BaseClass": "OpenXmlPivotCacheRichInfoElement", - "IsDerived": true, - "IsLeafElement": true, - "Version": "Microsoft365" - }, - { - "Name": "xprd:CT_PivotCacheRichInfo/xprd:pivotCacheHasRichValue", - "ClassName": "PivotCacheHasRichValuePivotCacheRichInfo", - "Summary": "Defines the PivotCacheHasRichValuePivotCacheRichInfo Class.", - "BaseClass": "OpenXmlPivotCacheRichInfoElement", - "IsDerived": true, - "IsLeafElement": true, - "Version": "Microsoft365" - }, - { - "Name": "xprd:CT_PivotCacheRichInfo/", - "ClassName": "OpenXmlPivotCacheRichInfoElement", - "Summary": "Defines the OpenXmlPivotCacheRichInfoElement Class.", + "ClassName": "PivotCacheRichInfo", + "Summary": "Defines the PivotCacheRichInfo Class.", "BaseClass": "OpenXmlLeafElement", - "IsAbstract": true, "IsLeafElement": true, "Version": "Microsoft365", "Attributes": [ diff --git a/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json b/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json index d7f0dd8e0..3667d437b 100644 --- a/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json +++ b/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json @@ -24271,13 +24271,9 @@ "Name": "xsd:boolean/xxpim:implicitMeasureSupport", "PropertyName": "Xsdboolean" }, - { - "Name": "xprd:CT_PivotCacheRichInfo/xprd:pivotCacheHasRichValue", - "PropertyName": "PivotCacheHasRichValuePivotCacheRichInfo" - }, { "Name": "xprd:CT_PivotCacheRichInfo/xprd:richInfo", - "PropertyName": "RichInfoPivotCacheRichInfo" + "PropertyName": "PivotCacheRichInfo" }, { "Name": "xxpvi:CT_CacheVersionInfo/xxpvi:cacheVersionInfo", @@ -24311,10 +24307,6 @@ "Name": "xsd:boolean/xxpim:implicitMeasureSupport", "InitialVersion": "Office2021" }, - { - "Name": "xprd:CT_PivotCacheRichInfo/xprd:pivotCacheHasRichValue", - "InitialVersion": "Microsoft365" - }, { "Name": "xprd:CT_PivotCacheRichInfo/xprd:richInfo", "InitialVersion": "Microsoft365" diff --git a/data/typed/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json b/data/typed/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json index b253216e1..155562bb2 100644 --- a/data/typed/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json +++ b/data/typed/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.json @@ -1,14 +1,6 @@ [ - { - "Name": "xprd:CT_PivotCacheRichInfo/", - "ClassName": "OpenXmlPivotCacheRichInfoElement" - }, - { - "Name": "xprd:CT_PivotCacheRichInfo/xprd:pivotCacheHasRichValue", - "ClassName": "PivotCacheHasRichValuePivotCacheRichInfo" - }, { "Name": "xprd:CT_PivotCacheRichInfo/xprd:richInfo", - "ClassName": "RichInfoPivotCacheRichInfo" + "ClassName": "PivotCacheRichInfo" } ] \ No newline at end of file diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.NoNamespace.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.NoNamespace.g.cs index c6bdee3bb..50aa14a5b 100644 --- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.NoNamespace.g.cs +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.NoNamespace.g.cs @@ -14903,6 +14903,18 @@ public static partial class NoNamespace /// public static readonly XName pivotButton = "pivotButton"; + /// + /// Represents the pivotCacheGuid XML attribute. + /// + /// + /// As an XML attribute, it: + /// + /// is contained in the following XML elements: . + /// corresponds to the following strongly-typed properties: PivotCacheRichInfo.PivotCacheGuid. + /// + /// + public static readonly XName pivotCacheGuid = "pivotCacheGuid"; + /// /// Represents the pivotCacheId XML attributes. /// @@ -14915,6 +14927,18 @@ public static partial class NoNamespace /// public static readonly XName pivotCacheId = "pivotCacheId"; + /// + /// Represents the pivotIgnoreInvalidCache XML attribute. + /// + /// + /// As an XML attribute, it: + /// + /// is contained in the following XML elements: . + /// corresponds to the following strongly-typed properties: PivotCacheRichInfo.PivotIgnoreInvalidCache. + /// + /// + public static readonly XName pivotIgnoreInvalidCache = "pivotIgnoreInvalidCache"; + /// /// Represents the pivotShowAs XML attribute. /// diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.R.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.R.g.cs index a575b340e..9bf584bda 100644 --- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.R.g.cs +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.R.g.cs @@ -81,8 +81,8 @@ public static partial class R /// /// As an XML attribute, it: /// - /// is contained in the following XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . - /// corresponds to the following strongly-typed properties: AltChunk.Id, ChartSheetPageSetup.Id, CommentRelationship.Id, ContentPart.Id, ContentPart.RelationshipId, Control.Id, ControlProperties.Id, CustomerData.Id, CustomerDataTags.Id, CustomProperty.Id, DataReference.Id, Drawing.Id, DrawingHeaderFooter.Id, EmbeddedObjectProperties.Id, ExternalBook.Id, ExternalData.Id, ExternalReference.Id, Fill.RelationshipId, GvmlContentPart.RelationshipId, HandoutMasterId.Id, Header.Id, HtmlPublishProperties.Id, Hyperlink.Id, HyperlinkRuby.Id, ImageData.RelationshipId, NotesMasterId.Id, ObjectEmbed.Id, ObjectLink.Id, OleLink.Id, OleObject.Id, OutlineViewSlideListEntry.Id, PageSetup.Id, Picture.Id, PictureAttributionSourceURL.Id, PivotCache.Id, PivotCacheDefinition.Id, PivotSelection.Id, PivotTableReference.Id, RangeSet.Id, SaveThroughXslt.Id, Sheet.Id, SlicerCache.Id, SlicerRef.Id, SlideId.RelationshipId, SlideLayoutId.RelationshipId, SlideListEntry.Id, SlideMasterId.RelationshipId, Stroke.RelationshipId, TablePart.Id, TimelineCacheReference.Id, TimelineReference.Id, ToolbarData.Id, WebExtensionPartReference.Id, WebExtensionReference.Id, WorksheetSource.Id. + /// is contained in the following XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . + /// corresponds to the following strongly-typed properties: AltChunk.Id, ChartSheetPageSetup.Id, CommentRelationship.Id, ContentPart.Id, ContentPart.RelationshipId, Control.Id, ControlProperties.Id, CustomerData.Id, CustomerDataTags.Id, CustomProperty.Id, DataReference.Id, Drawing.Id, DrawingHeaderFooter.Id, EmbeddedObjectProperties.Id, ExternalBook.Id, ExternalData.Id, ExternalReference.Id, Fill.RelationshipId, GvmlContentPart.RelationshipId, HandoutMasterId.Id, Header.Id, HtmlPublishProperties.Id, Hyperlink.Id, HyperlinkRuby.Id, ImageData.RelationshipId, NotesMasterId.Id, ObjectEmbed.Id, ObjectLink.Id, OleLink.Id, OleObject.Id, OutlineViewSlideListEntry.Id, PageSetup.Id, Picture.Id, PictureAttributionSourceURL.Id, PivotCache.Id, PivotCacheDefinition.Id, PivotCacheRichInfo.Id, PivotSelection.Id, PivotTableReference.Id, RangeSet.Id, SaveThroughXslt.Id, Sheet.Id, SlicerCache.Id, SlicerRef.Id, SlideId.RelationshipId, SlideLayoutId.RelationshipId, SlideListEntry.Id, SlideMasterId.RelationshipId, Stroke.RelationshipId, TablePart.Id, TimelineCacheReference.Id, TimelineReference.Id, ToolbarData.Id, WebExtensionPartReference.Id, WebExtensionReference.Id, WorksheetSource.Id. /// /// public static readonly XName id = r + "id"; diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs index b76f2c074..42a44237d 100644 --- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs @@ -1454,7 +1454,7 @@ public static partial class X /// As an XML element, it: /// /// has the following parent XML elements: , , , , , , , , , . - /// has the following child XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . + /// has the following child XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . /// has the following XML attributes: . /// corresponds to the following strongly-typed classes: CacheFieldExtension, CacheHierarchyExtension, CacheSourceExtension, CalculatedMemberExtension, ConditionalFormattingRuleExtension, ConnectionExtension, DataFieldExtension, Extension, PivotCacheDefinitionExtension, PivotFieldExtension, PivotFilterExtension, PivotHierarchyExtension, PivotTableDefinitionExtension, QueryTableExtension, SlicerCacheDefinitionExtension, StylesheetExtension, TableExtension, WorkbookExtension, WorksheetExtension. /// diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XPRD.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XPRD.g.cs index c7dd7c80d..7eecfe32f 100644 --- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XPRD.g.cs +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XPRD.g.cs @@ -15,18 +15,6 @@ public static partial class XPRD /// public static readonly XNamespace xprd = "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData"; - /// - /// Represents the xprd:pivotCacheHasRichValue XML element. - /// - /// - /// As an XML element, it: - /// - /// has the following parent XML elements: . - /// corresponds to the following strongly-typed classes: PivotCacheHasRichValuePivotCacheRichInfo. - /// - /// - public static readonly XName pivotCacheHasRichValue = xprd + "pivotCacheHasRichValue"; - /// /// Represents the xprd:richInfo XML element. /// @@ -34,7 +22,8 @@ public static partial class XPRD /// As an XML element, it: /// /// has the following parent XML elements: . - /// corresponds to the following strongly-typed classes: RichInfoPivotCacheRichInfo. + /// has the following XML attributes: , , . + /// corresponds to the following strongly-typed classes: PivotCacheRichInfo. /// /// public static readonly XName richInfo = xprd + "richInfo"; diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs index bf1f76409..07ac4be2f 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs @@ -17,66 +17,16 @@ namespace DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData { /// - /// Defines the RichInfoPivotCacheRichInfo Class. + /// Defines the PivotCacheRichInfo Class. /// This class is available in Microsoft365 and above. /// When the object is serialized out as xml, it's qualified name is xprd:richInfo. /// - public partial class RichInfoPivotCacheRichInfo : OpenXmlPivotCacheRichInfoElement + public partial class PivotCacheRichInfo : OpenXmlLeafElement { /// - /// Initializes a new instance of the RichInfoPivotCacheRichInfo class. + /// Initializes a new instance of the PivotCacheRichInfo class. /// - public RichInfoPivotCacheRichInfo() : base() - { - } - - internal override void ConfigureMetadata(ElementMetadata.Builder builder) - { - base.ConfigureMetadata(builder); - builder.SetSchema("xprd:richInfo"); - builder.Availability = FileFormatVersions.Microsoft365; - } - - /// - public override OpenXmlElement CloneNode(bool deep) => CloneImp(deep); - } - - /// - /// Defines the PivotCacheHasRichValuePivotCacheRichInfo Class. - /// This class is available in Microsoft365 and above. - /// When the object is serialized out as xml, it's qualified name is xprd:pivotCacheHasRichValue. - /// - public partial class PivotCacheHasRichValuePivotCacheRichInfo : OpenXmlPivotCacheRichInfoElement - { - /// - /// Initializes a new instance of the PivotCacheHasRichValuePivotCacheRichInfo class. - /// - public PivotCacheHasRichValuePivotCacheRichInfo() : base() - { - } - - internal override void ConfigureMetadata(ElementMetadata.Builder builder) - { - base.ConfigureMetadata(builder); - builder.SetSchema("xprd:pivotCacheHasRichValue"); - builder.Availability = FileFormatVersions.Microsoft365; - } - - /// - public override OpenXmlElement CloneNode(bool deep) => CloneImp(deep); - } - - /// - /// Defines the OpenXmlPivotCacheRichInfoElement Class. - /// This class is available in Microsoft365 and above. - /// When the object is serialized out as xml, it's qualified name is :. - /// - public abstract partial class OpenXmlPivotCacheRichInfoElement : OpenXmlLeafElement - { - /// - /// Initializes a new instance of the OpenXmlPivotCacheRichInfoElement class. - /// - protected OpenXmlPivotCacheRichInfoElement() : base() + public PivotCacheRichInfo() : base() { } @@ -116,7 +66,9 @@ public StringValue? Id internal override void ConfigureMetadata(ElementMetadata.Builder builder) { base.ConfigureMetadata(builder); - builder.AddElement() + builder.SetSchema("xprd:richInfo"); + builder.Availability = FileFormatVersions.Microsoft365; + builder.AddElement() .AddAttribute("pivotCacheGuid", a => a.PivotCacheGuid, aBuilder => { aBuilder.AddValidator(RequiredValidator.Instance); @@ -125,5 +77,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) .AddAttribute("pivotIgnoreInvalidCache", a => a.PivotIgnoreInvalidCache) .AddAttribute("r:id", a => a.Id); } + + /// + public override OpenXmlElement CloneNode(bool deep) => CloneImp(deep); } } \ No newline at end of file diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs index e78f3ffbe..7045b709a 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs @@ -45037,8 +45037,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) /// <x15:pivotCacheDecoupled> /// <x15:pivotCacheIdVersion> /// <x15:timelinePivotCacheDefinition> - /// <xprd:pivotCacheHasRichValue> - /// <xprd:richInfo> + /// <xprd:richInfo> /// <xxpim:implicitMeasureSupport> /// <xlpar:autoRefresh> /// <xxpvi:cacheVersionInfo> @@ -45095,8 +45094,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) builder.AddChild(); builder.AddChild(); builder.AddChild(); - builder.AddChild(); - builder.AddChild(); + builder.AddChild(); builder.AddChild(); builder.AddChild(); builder.AddChild(); @@ -45113,8 +45111,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) new ElementParticle(typeof(DocumentFormat.OpenXml.Office2013.Excel.TimelinePivotCacheDefinition), 1, 1, version: FileFormatVersions.Office2013), new ElementParticle(typeof(DocumentFormat.OpenXml.Office2013.Excel.PivotCacheIdVersion), 1, 1, version: FileFormatVersions.Office2013), new ElementParticle(typeof(DocumentFormat.OpenXml.Office2021.Excel.Pivot.Xsdboolean), 1, 1, version: FileFormatVersions.Office2021), - new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheHasRichValuePivotCacheRichInfo), 1, 1, version: FileFormatVersions.Microsoft365), - new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.RichInfoPivotCacheRichInfo), 1, 1, version: FileFormatVersions.Microsoft365), + new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheRichInfo), 1, 1, version: FileFormatVersions.Microsoft365), new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo), 1, 1, version: FileFormatVersions.Microsoft365), new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean), 1, 1, version: FileFormatVersions.Microsoft365), new AnyParticle(0, 1) From 46fc8f299cc412f27fcb9aa984492490ab772f7d Mon Sep 17 00:00:00 2001 From: Michael Bowen Date: Fri, 30 Aug 2024 14:59:50 -0700 Subject: [PATCH 3/5] fix tests --- .../ElementChildren.json | 10 +--------- .../data/Particles.json | 5 +---- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json index d9220ae32..349d8e349 100644 --- a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json +++ b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json @@ -22750,11 +22750,7 @@ "Children": [] }, { - "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheHasRichValuePivotCacheRichInfo", - "Children": [] - }, - { - "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.RichInfoPivotCacheRichInfo", + "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheRichInfo", "Children": [] }, { @@ -45142,10 +45138,6 @@ "Name": "implicitMeasureSupport", "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2020/pivotNov2020" }, - { - "Name": "pivotCacheHasRichValue", - "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData" - }, { "Name": "richInfo", "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2022/pivotRichData" diff --git a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json index 420bde12a..8476d0bf0 100644 --- a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json +++ b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json @@ -65324,10 +65324,7 @@ "ElementType": "DocumentFormat.OpenXml.Office2021.Excel.Pivot.Xsdboolean" }, { - "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheHasRichValuePivotCacheRichInfo" - }, - { - "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.RichInfoPivotCacheRichInfo" + "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheRichInfo" }, { "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo" From 03a86e66e297f3cc970e2fc4a72c4d1eda65b4b6 Mon Sep 17 00:00:00 2001 From: Michael Bowen Date: Wed, 13 Nov 2024 13:35:34 -0800 Subject: [PATCH 4/5] use remarks instead of remark --- ...microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs index 07ac4be2f..2b238bb7a 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotRichData.g.cs @@ -54,9 +54,9 @@ public BooleanValue? PivotIgnoreInvalidCache /// id, this property is only available in Microsoft365 and later. /// Represents the following attribute in the schema: r:id /// - /// + /// /// xmlns:r=http://schemas.openxmlformats.org/officeDocument/2006/relationships - /// + /// public StringValue? Id { get => GetAttribute(); From 29d0086e7e81b3bca264ef64cf26fbd963a41bb0 Mon Sep 17 00:00:00 2001 From: Michael Bowen Date: Thu, 14 Nov 2024 12:16:16 -0800 Subject: [PATCH 5/5] add October 2024 schema update --- data/namespaces.json | 5 ++ ...spreadsheetml_2024_pivotDynamicArrays.json | 26 +++++++++ ...office_word_2024_wordml_sdtformatlock.json | 3 + ...penxmlformats_org_drawingml_2006_main.json | 24 ++++---- ...mlformats_org_spreadsheetml_2006_main.json | 8 +++ data/typed/namespaces.json | 8 +++ ...spreadsheetml_2024_pivotDynamicArrays.json | 6 ++ ...office_word_2024_wordml_sdtformatlock.json | 1 + .../Namespaces.g.cs | 3 + .../Linq.NoNamespace.g.cs | 4 +- .../Linq.X.g.cs | 2 +- .../Linq.XLPDA.g.cs | 31 ++++++++++ ...spreadsheetml_2024_pivotDynamicArrays.g.cs | 58 +++++++++++++++++++ ...mlformats_org_spreadsheetml_2006_main.g.cs | 4 ++ .../ElementChildren.json | 8 +++ .../OpenXmlNamespaceTests.cs | 2 +- .../data/Particles.json | 3 + 17 files changed, 180 insertions(+), 16 deletions(-) create mode 100644 data/schemas/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.json create mode 100644 data/schemas/schemas_microsoft_com_office_word_2024_wordml_sdtformatlock.json create mode 100644 data/typed/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.json create mode 100644 data/typed/schemas_microsoft_com_office_word_2024_wordml_sdtformatlock.json create mode 100644 generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XLPDA.g.cs create mode 100644 generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.g.cs diff --git a/data/namespaces.json b/data/namespaces.json index c52f42623..eed7819c1 100644 --- a/data/namespaces.json +++ b/data/namespaces.json @@ -490,6 +490,11 @@ "Uri": "http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash", "Version": "Office2021" }, + { + "Prefix": "w16sdtfl", + "Uri": "http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock", + "Version": "Microsoft365" + }, { "Prefix": "w16se", "Uri": "http://schemas.microsoft.com/office/word/2015/wordml/symex", diff --git a/data/schemas/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.json b/data/schemas/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.json new file mode 100644 index 000000000..5ad61fd81 --- /dev/null +++ b/data/schemas/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.json @@ -0,0 +1,26 @@ +{ + "TargetNamespace": "http://schemas.microsoft.com/office/spreadsheetml/2024/pivotDynamicArrays", + "Types": [ + { + "Name": "xlpda:CT_PivotCacheDynamicArray/xlpda:pivotCacheDynamicArray", + "ClassName": "PivotCacheDynamicArray", + "Summary": "Defines the PivotCacheDynamicArray Class.", + "BaseClass": "OpenXmlLeafElement", + "IsLeafElement": true, + "Version": "Microsoft365", + "Attributes": [ + { + "QName": ":ref", + "Type": "StringValue", + "Version": "Microsoft365", + "PropertyComments": "ref", + "Validators": [ + { + "Name": "RequiredValidator" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/data/schemas/schemas_microsoft_com_office_word_2024_wordml_sdtformatlock.json b/data/schemas/schemas_microsoft_com_office_word_2024_wordml_sdtformatlock.json new file mode 100644 index 000000000..133f81a36 --- /dev/null +++ b/data/schemas/schemas_microsoft_com_office_word_2024_wordml_sdtformatlock.json @@ -0,0 +1,3 @@ +{ + "TargetNamespace": "http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock" +} \ No newline at end of file diff --git a/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json b/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json index c481c1a0e..297c3cc41 100644 --- a/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json +++ b/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json @@ -12517,18 +12517,6 @@ { "Name": "p14:CT_ShowEventRecordList/p14:showEvtLst" }, - { - "Name": "sl:CT_SchemaLibrary/sl:schemaLibrary" - }, - { - "Name": "m:CT_MathPr/m:mathPr" - }, - { - "Name": "m:CT_OMathPara/m:oMathPara" - }, - { - "Name": "m:CT_OMath/m:oMath" - }, { "Name": "w:CT_Recipients/w:recipients" }, @@ -12643,6 +12631,18 @@ { "Name": "w14:CT_SdtCheckbox/w14:checkbox" }, + { + "Name": "sl:CT_SchemaLibrary/sl:schemaLibrary" + }, + { + "Name": "m:CT_MathPr/m:mathPr" + }, + { + "Name": "m:CT_OMathPara/m:oMathPara" + }, + { + "Name": "m:CT_OMath/m:oMath" + }, { "Name": "v:CT_Shape/v:shape" }, diff --git a/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json b/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json index 3667d437b..ee7aa75fa 100644 --- a/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json +++ b/data/schemas/schemas_openxmlformats_org_spreadsheetml_2006_main.json @@ -24282,6 +24282,10 @@ { "Name": "xsd:boolean/xlpar:autoRefresh", "PropertyName": "Xsdboolean" + }, + { + "Name": "xlpda:CT_PivotCacheDynamicArray/xlpda:pivotCacheDynamicArray", + "PropertyName": "PivotCacheDynamicArray" } ], "Particle": { @@ -24319,6 +24323,10 @@ "Name": "xsd:boolean/xlpar:autoRefresh", "InitialVersion": "Microsoft365" }, + { + "Name": "xlpda:CT_PivotCacheDynamicArray/xlpda:pivotCacheDynamicArray", + "InitialVersion": "Microsoft365" + }, { "Kind": "Any", "Occurs": [ diff --git a/data/typed/namespaces.json b/data/typed/namespaces.json index ba3b0370c..b7e4c72d0 100644 --- a/data/typed/namespaces.json +++ b/data/typed/namespaces.json @@ -179,6 +179,10 @@ "Prefix": "xlpar", "Namespace": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh" }, + { + "Prefix": "xlpda", + "Namespace": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays" + }, { "Prefix": "wne", "Namespace": "DocumentFormat.OpenXml.Office.Word" @@ -191,6 +195,10 @@ "Prefix": "w16du", "Namespace": "DocumentFormat.OpenXml.Office.Word.Y2023.WordML.Word16DU" }, + { + "Prefix": "w16sdtfl", + "Namespace": "DocumentFormat.OpenXml.Office.Word.Y2024.WordML.SdtFormatLock" + }, { "Prefix": "xfpb", "Namespace": "DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag" diff --git a/data/typed/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.json b/data/typed/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.json new file mode 100644 index 000000000..556685071 --- /dev/null +++ b/data/typed/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.json @@ -0,0 +1,6 @@ +[ + { + "Name": "xlpda:CT_PivotCacheDynamicArray/xlpda:pivotCacheDynamicArray", + "ClassName": "PivotCacheDynamicArray" + } +] \ No newline at end of file diff --git a/data/typed/schemas_microsoft_com_office_word_2024_wordml_sdtformatlock.json b/data/typed/schemas_microsoft_com_office_word_2024_wordml_sdtformatlock.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/data/typed/schemas_microsoft_com_office_word_2024_wordml_sdtformatlock.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs b/generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs index 711de09da..e92bedec3 100644 --- a/generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs +++ b/generated/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Namespaces.g.cs @@ -119,6 +119,7 @@ internal partial class OpenXmlNamespaceResolver { "http://schemas.microsoft.com/office/word/2018/wordml", "w16cur" }, { "http://schemas.microsoft.com/office/word/2023/wordml/word16du", "w16du" }, { "http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash", "w16sdtdh" }, + { "http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock", "w16sdtfl" }, { "http://schemas.microsoft.com/office/word/2015/wordml/symex", "w16se" }, { "http://schemas.microsoft.com/office/webextensions/webextension/2010/11", "we" }, { "http://schemas.microsoft.com/office/webextensions/taskpanes/2010/11", "wetp" }, @@ -287,6 +288,7 @@ internal partial class OpenXmlNamespaceResolver { "w16cur", "http://schemas.microsoft.com/office/word/2018/wordml" }, { "w16du", "http://schemas.microsoft.com/office/word/2023/wordml/word16du" }, { "w16sdtdh", "http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" }, + { "w16sdtfl", "http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock" }, { "w16se", "http://schemas.microsoft.com/office/word/2015/wordml/symex" }, { "we", "http://schemas.microsoft.com/office/webextensions/webextension/2010/11" }, { "wetp", "http://schemas.microsoft.com/office/webextensions/taskpanes/2010/11" }, @@ -455,6 +457,7 @@ internal partial class OpenXmlNamespaceResolver { "w16cur", FileFormatVersions.Office2021 }, { "w16du", FileFormatVersions.Microsoft365 }, { "w16sdtdh", FileFormatVersions.Office2021 }, + { "w16sdtfl", FileFormatVersions.Microsoft365 }, { "w16se", FileFormatVersions.Office2016 }, { "we", FileFormatVersions.Office2013 }, { "wetp", FileFormatVersions.Office2013 }, diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.NoNamespace.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.NoNamespace.g.cs index 50aa14a5b..efab1a928 100644 --- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.NoNamespace.g.cs +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.NoNamespace.g.cs @@ -16061,8 +16061,8 @@ public static partial class NoNamespace /// /// As an XML attribute, it: /// - /// is contained in the following XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , . - /// corresponds to the following strongly-typed properties: AutoFilter.Reference, CellFormula.Reference, ColumnSortMap.Ref, Comment.Reference, DataReference.Reference, Effect.Reference, ForEach.Reference, Grammar.Reference, GroupInfo.Reference, Hyperlink.Reference, Location.Reference, MergeCell.Reference, Model.Reference, NsvFilter.Ref, OleSize.Reference, RangeSet.Reference, RevisionAutoFormat.Reference, RevisionQueryTable.Reference, RevisionRowColumn.Reference, RichSortCondition.Reference, RowSortMap.Ref, SheetDimension.Reference, SortCondition.Reference, SortState.Reference, Table.Reference, ThreadedComment.Ref, WorksheetSource.Reference. + /// is contained in the following XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . + /// corresponds to the following strongly-typed properties: AutoFilter.Reference, CellFormula.Reference, ColumnSortMap.Ref, Comment.Reference, DataReference.Reference, Effect.Reference, ForEach.Reference, Grammar.Reference, GroupInfo.Reference, Hyperlink.Reference, Location.Reference, MergeCell.Reference, Model.Reference, NsvFilter.Ref, OleSize.Reference, PivotCacheDynamicArray.Ref, RangeSet.Reference, RevisionAutoFormat.Reference, RevisionQueryTable.Reference, RevisionRowColumn.Reference, RichSortCondition.Reference, RowSortMap.Ref, SheetDimension.Reference, SortCondition.Reference, SortState.Reference, Table.Reference, ThreadedComment.Ref, WorksheetSource.Reference. /// /// public static readonly XName @ref = "ref"; diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs index 42a44237d..0934ba704 100644 --- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.X.g.cs @@ -1454,7 +1454,7 @@ public static partial class X /// As an XML element, it: /// /// has the following parent XML elements: , , , , , , , , , . - /// has the following child XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . + /// has the following child XML elements: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , . /// has the following XML attributes: . /// corresponds to the following strongly-typed classes: CacheFieldExtension, CacheHierarchyExtension, CacheSourceExtension, CalculatedMemberExtension, ConditionalFormattingRuleExtension, ConnectionExtension, DataFieldExtension, Extension, PivotCacheDefinitionExtension, PivotFieldExtension, PivotFilterExtension, PivotHierarchyExtension, PivotTableDefinitionExtension, QueryTableExtension, SlicerCacheDefinitionExtension, StylesheetExtension, TableExtension, WorkbookExtension, WorksheetExtension. /// diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XLPDA.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XLPDA.g.cs new file mode 100644 index 000000000..ac0aea003 --- /dev/null +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.XLPDA.g.cs @@ -0,0 +1,31 @@ +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Xml.Linq; + +namespace DocumentFormat.OpenXml.Linq +{ + /// + /// Declares XNamespace and XName fields for the xmlns:xlpda="http://schemas.microsoft.com/office/spreadsheetml/2024/pivotDynamicArrays" namespace. + /// + public static partial class XLPDA + { + /// + /// Defines the XML namespace associated with the xlpda prefix. + /// + public static readonly XNamespace xlpda = "http://schemas.microsoft.com/office/spreadsheetml/2024/pivotDynamicArrays"; + + /// + /// Represents the xlpda:pivotCacheDynamicArray XML element. + /// + /// + /// As an XML element, it: + /// + /// has the following parent XML elements: . + /// has the following XML attributes: . + /// corresponds to the following strongly-typed classes: PivotCacheDynamicArray. + /// + /// + public static readonly XName pivotCacheDynamicArray = xlpda + "pivotCacheDynamicArray"; + } +} diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.g.cs new file mode 100644 index 000000000..4fa85ab96 --- /dev/null +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2024_pivotDynamicArrays.g.cs @@ -0,0 +1,58 @@ +// + +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#nullable enable + +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Framework; +using DocumentFormat.OpenXml.Framework.Metadata; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Validation.Schema; +using System; +using System.Collections.Generic; +using System.IO.Packaging; + +namespace DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays +{ + /// + /// Defines the PivotCacheDynamicArray Class. + /// This class is available in Microsoft365 and above. + /// When the object is serialized out as xml, it's qualified name is xlpda:pivotCacheDynamicArray. + /// + public partial class PivotCacheDynamicArray : OpenXmlLeafElement + { + /// + /// Initializes a new instance of the PivotCacheDynamicArray class. + /// + public PivotCacheDynamicArray() : base() + { + } + + /// + /// ref, this property is only available in Microsoft365 and later. + /// Represents the following attribute in the schema: ref + /// + public StringValue? Ref + { + get => GetAttribute(); + set => SetAttribute(value); + } + + internal override void ConfigureMetadata(ElementMetadata.Builder builder) + { + base.ConfigureMetadata(builder); + builder.SetSchema("xlpda:pivotCacheDynamicArray"); + builder.Availability = FileFormatVersions.Microsoft365; + builder.AddElement() + .AddAttribute("ref", a => a.Ref, aBuilder => + { + aBuilder.AddValidator(RequiredValidator.Instance); + }); + } + + /// + public override OpenXmlElement CloneNode(bool deep) => CloneImp(deep); + } +} \ No newline at end of file diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs index e4e8f1333..7659fcd36 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs @@ -15,6 +15,7 @@ using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo; using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.ExternalCodeService; using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms; +using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays; using DocumentFormat.OpenXml.Office2010.Excel; using DocumentFormat.OpenXml.Office2013.Excel; using DocumentFormat.OpenXml.Office2013.ExcelAc; @@ -45037,6 +45038,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) /// <x15:pivotCacheDecoupled> /// <x15:pivotCacheIdVersion> /// <x15:timelinePivotCacheDefinition> + /// <xlpda:pivotCacheDynamicArray> /// <xprd:richInfo> /// <xxpim:implicitMeasureSupport> /// <xlpar:autoRefresh> @@ -45094,6 +45096,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) builder.AddChild(); builder.AddChild(); builder.AddChild(); + builder.AddChild(); builder.AddChild(); builder.AddChild(); builder.AddChild(); @@ -45114,6 +45117,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheRichInfo), 1, 1, version: FileFormatVersions.Microsoft365), new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo), 1, 1, version: FileFormatVersions.Microsoft365), new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean), 1, 1, version: FileFormatVersions.Microsoft365), + new ElementParticle(typeof(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays.PivotCacheDynamicArray), 1, 1, version: FileFormatVersions.Microsoft365), new AnyParticle(0, 1) }; } diff --git a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json index 349d8e349..daa8b453f 100644 --- a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json +++ b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json @@ -22871,6 +22871,10 @@ "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean", "Children": [] }, + { + "Element": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays.PivotCacheDynamicArray", + "Children": [] + }, { "Element": "DocumentFormat.OpenXml.Office.Word.AllocatedCommand", "Children": [] @@ -45149,6 +45153,10 @@ { "Name": "autoRefresh", "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2024/pivotAutoRefresh" + }, + { + "Name": "pivotCacheDynamicArray", + "Namespace": "http://schemas.microsoft.com/office/spreadsheetml/2024/pivotDynamicArrays" } ] }, diff --git a/test/DocumentFormat.OpenXml.Framework.Tests/OpenXmlNamespaceTests.cs b/test/DocumentFormat.OpenXml.Framework.Tests/OpenXmlNamespaceTests.cs index e88b816ac..43fc4efa4 100644 --- a/test/DocumentFormat.OpenXml.Framework.Tests/OpenXmlNamespaceTests.cs +++ b/test/DocumentFormat.OpenXml.Framework.Tests/OpenXmlNamespaceTests.cs @@ -12,7 +12,7 @@ public class OpenXmlNamespaceTests public void NamespaceCount() { var resolver = new OpenXmlNamespaceResolver(); - Assert.Equal(164, resolver.GetNamespacesInScope(System.Xml.XmlNamespaceScope.All).Count); + Assert.Equal(165, resolver.GetNamespacesInScope(System.Xml.XmlNamespaceScope.All).Count); } [InlineData("", "", FileFormatVersions.Office2007)] diff --git a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json index 8476d0bf0..eb729d3ab 100644 --- a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json +++ b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json @@ -65332,6 +65332,9 @@ { "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean" }, + { + "ElementType": "DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays.PivotCacheDynamicArray" + }, { "MinOccurs": 0, "ParticleType": "Any"