diff --git a/CHANGELOG.md b/CHANGELOG.md index 45749864a..429cfd322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - `OpenXmlPart`/`OpenXmlContainer`/`OpenXmlPackage` and derived types now have internal constructors (these had internal abstract methods so most likely weren't subclassed externally) - `OpenXmlElementList` is now a struct that implements `IEnumerable` and `IReadOnlyList` (where available) - Individual implementations of `OpenXmlPartReader` are available now for each package type (i.e. `WordprocessingDocumentPartReader`, `SpreadsheetDocumentPartReader`, `PresentationDocumentPartReader`), and the previous `TypedOpenXmlPartReader` has been removed. +- Changed DocumentFormat.OpenXml.PresetTextWrap to DocumentFormat.OpenXml.PresetTextWarp ## [2.20.0] diff --git a/data/schemas/schemas_microsoft_com_office_drawing_2012_chartStyle.json b/data/schemas/schemas_microsoft_com_office_drawing_2012_chartStyle.json index 4e3bfe9b8..63b030ba4 100644 --- a/data/schemas/schemas_microsoft_com_office_drawing_2012_chartStyle.json +++ b/data/schemas/schemas_microsoft_com_office_drawing_2012_chartStyle.json @@ -2179,7 +2179,7 @@ "Children": [ { "Name": "a:CT_PresetTextShape/a:prstTxWarp", - "PropertyName": "PresetTextWrap", + "PropertyName": "PresetTextWarp", "PropertyComments": "Preset Text Shape" }, { diff --git a/data/schemas/schemas_microsoft_com_office_drawing_2013_main_command.json b/data/schemas/schemas_microsoft_com_office_drawing_2013_main_command.json index 6b97971a1..20c15263a 100644 --- a/data/schemas/schemas_microsoft_com_office_drawing_2013_main_command.json +++ b/data/schemas/schemas_microsoft_com_office_drawing_2013_main_command.json @@ -1878,7 +1878,7 @@ "Children": [ { "Name": "a:CT_PresetTextShape/a:prstTxWarp", - "PropertyName": "PresetTextWrap", + "PropertyName": "PresetTextWarp", "PropertyComments": "Preset Text Shape" }, { diff --git a/data/schemas/schemas_microsoft_com_office_word_2010_wordprocessingShape.json b/data/schemas/schemas_microsoft_com_office_word_2010_wordprocessingShape.json index 5c051d515..50a33dfca 100644 --- a/data/schemas/schemas_microsoft_com_office_word_2010_wordprocessingShape.json +++ b/data/schemas/schemas_microsoft_com_office_word_2010_wordprocessingShape.json @@ -929,7 +929,7 @@ "Children": [ { "Name": "a:CT_PresetTextShape/a:prstTxWarp", - "PropertyName": "PresetTextWrap", + "PropertyName": "PresetTextWarp", "PropertyComments": "Preset Text Shape" }, { diff --git a/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json b/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json index f820867d6..97e31a5d6 100644 --- a/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json +++ b/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json @@ -5610,7 +5610,7 @@ }, { "Name": "a:CT_PresetTextShape/a:prstTxWarp", - "ClassName": "PresetTextWrap", + "ClassName": "PresetTextWarp", "Summary": "Preset Text Warp.", "CompositeType": "OneSequence", "BaseClass": "OpenXmlCompositeElement", @@ -16109,7 +16109,7 @@ "Children": [ { "Name": "a:CT_PresetTextShape/a:prstTxWarp", - "PropertyName": "PresetTextWrap", + "PropertyName": "PresetTextWarp", "PropertyComments": "Preset Text Shape" }, { diff --git a/data/typed/schemas_openxmlformats_org_drawingml_2006_main.json b/data/typed/schemas_openxmlformats_org_drawingml_2006_main.json index 8d3815411..1bb759de4 100644 --- a/data/typed/schemas_openxmlformats_org_drawingml_2006_main.json +++ b/data/typed/schemas_openxmlformats_org_drawingml_2006_main.json @@ -1165,7 +1165,7 @@ }, { "Name": "a:CT_PresetTextShape/a:prstTxWarp", - "ClassName": "PresetTextWrap" + "ClassName": "PresetTextWarp" }, { "Name": "a:CT_AdjPoint2D/a:pt", diff --git a/gen/DocumentFormat.OpenXml.Generator.Models/Schematron/CategoryIdentifier.cs b/gen/DocumentFormat.OpenXml.Generator.Models/Schematron/CategoryIdentifier.cs index 778378d80..4d0e7a85c 100644 --- a/gen/DocumentFormat.OpenXml.Generator.Models/Schematron/CategoryIdentifier.cs +++ b/gen/DocumentFormat.OpenXml.Generator.Models/Schematron/CategoryIdentifier.cs @@ -47,9 +47,9 @@ private static void Initialize() // root.Category = "1.1"; - // Category modality is compsed by a keywords sequence. + // Category modality is composed by a keywords sequence. // Only operator and function name are treated as keyword in schematron. - // Single category may have mutiple modalities due to optional parameters. + // Single category may have multiple modalities due to optional parameters. AddCategoryModality("1.1", new string[] { "@" }, -1, -1); AddCategoryModality("1.2", new string[] { "fn:matches", "@" }, -1, -1); diff --git a/gen/DocumentFormat.OpenXml.Generator.Models/Schematron/SyntaxAnalysor.cs b/gen/DocumentFormat.OpenXml.Generator.Models/Schematron/SyntaxAnalysor.cs index 70f3a82de..7c219d0fc 100644 --- a/gen/DocumentFormat.OpenXml.Generator.Models/Schematron/SyntaxAnalysor.cs +++ b/gen/DocumentFormat.OpenXml.Generator.Models/Schematron/SyntaxAnalysor.cs @@ -85,11 +85,11 @@ private static void InitializeWeightDictionary() /// /// Identify keyword from specified text. /// - /// Source text from which this method will indentify keyword. + /// Source text from which this method will identify keyword. /// /// Index of specified text. - /// As input, it specifies start index of idenfication. - /// As output, it specifies index of matched keyword's last character in soure text. + /// As input, it specifies start index of identification. + /// As output, it specifies index of matched keyword's last character in source text. /// i.e. if test="A KEYWORD B", matchedKeyword="KEYWORD" then pos=8 (index of 'D' in "A KEYWORD B"). /// /// Keyword candidates. diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs index 2277fd414..a32fc05ba 100644 --- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs +++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs @@ -3000,7 +3000,7 @@ public static class A /// has the following parent XML elements: , , . /// has the following child XML elements: . /// has the following XML attributes: . - /// corresponds to the following strongly-typed classes: PresetTextWrap. + /// corresponds to the following strongly-typed classes: PresetTextWarp. /// /// public static readonly XName prstTxWarp = a + "prstTxWarp"; 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 cea8046d6..004e8aa50 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 @@ -15534,7 +15534,7 @@ public static class NoNamespace /// As an XML attribute, it: /// /// is contained in the following XML elements: , , , , , . - /// corresponds to the following strongly-typed properties: Camera.Preset, PatternFill.Preset, PresetGeometry.Preset, PresetShadow.Preset, PresetTextWrap.Preset, PresetTransition.Preset. + /// corresponds to the following strongly-typed properties: Camera.Preset, PatternFill.Preset, PresetGeometry.Preset, PresetShadow.Preset, PresetTextWarp.Preset, PresetTransition.Preset. /// /// public static readonly XName prst = "prst"; diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chartStyle.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chartStyle.cs index e6d3d710d..99360f791 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chartStyle.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chartStyle.cs @@ -2174,7 +2174,7 @@ public DocumentFormat.OpenXml.Drawing.Outline? Outline /// /// <a:flatTx> /// <a:extLst> - /// <a:prstTxWarp> + /// <a:prstTxWarp> /// <a:scene3d> /// <a:sp3d> /// <a:noAutofit> @@ -2412,7 +2412,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) builder.Availability = FileFormatVersions.Office2013; builder.AddChild(); builder.AddChild(); - builder.AddChild(); + builder.AddChild(); builder.AddChild(); builder.AddChild(); builder.AddChild(); @@ -2461,7 +2461,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) .AddAttribute("compatLnSpc", a => a.CompatibleLineSpacing); builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1) { - new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.PresetTextWrap), 0, 1), + new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.PresetTextWarp), 0, 1), new CompositeParticle.Builder(ParticleType.Group, 0, 1) { new CompositeParticle.Builder(ParticleType.Choice, 1, 1) @@ -2491,9 +2491,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) /// /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main /// - public DocumentFormat.OpenXml.Drawing.PresetTextWrap? PresetTextWrap + public DocumentFormat.OpenXml.Drawing.PresetTextWarp? PresetTextWarp { - get => GetElement(); + get => GetElement(); set => SetElement(value); } diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2013_main_command.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2013_main_command.cs index b0d806c9c..50742c078 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2013_main_command.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2013_main_command.cs @@ -2796,7 +2796,7 @@ public DocumentFormat.OpenXml.Drawing.SpaceAfter? SpaceAfter /// /// <a:flatTx> /// <a:extLst> - /// <a:prstTxWarp> + /// <a:prstTxWarp> /// <a:scene3d> /// <a:sp3d> /// <a:noAutofit> @@ -3034,7 +3034,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) builder.Availability = FileFormatVersions.Office2016; builder.AddChild(); builder.AddChild(); - builder.AddChild(); + builder.AddChild(); builder.AddChild(); builder.AddChild(); builder.AddChild(); @@ -3083,7 +3083,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) .AddAttribute("compatLnSpc", a => a.CompatibleLineSpacing); builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1) { - new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.PresetTextWrap), 0, 1), + new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.PresetTextWarp), 0, 1), new CompositeParticle.Builder(ParticleType.Group, 0, 1) { new CompositeParticle.Builder(ParticleType.Choice, 1, 1) @@ -3113,9 +3113,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) /// /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main /// - public DocumentFormat.OpenXml.Drawing.PresetTextWrap? PresetTextWrap + public DocumentFormat.OpenXml.Drawing.PresetTextWarp? PresetTextWarp { - get => GetElement(); + get => GetElement(); set => SetElement(value); } diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingShape.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingShape.cs index 0d321e45c..014bffa13 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingShape.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingShape.cs @@ -1070,7 +1070,7 @@ public DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionLis /// /// <a:flatTx> /// <a:extLst> - /// <a:prstTxWarp> + /// <a:prstTxWarp> /// <a:scene3d> /// <a:sp3d> /// <a:noAutofit> @@ -1308,7 +1308,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) builder.Availability = FileFormatVersions.Office2010; builder.AddChild(); builder.AddChild(); - builder.AddChild(); + builder.AddChild(); builder.AddChild(); builder.AddChild(); builder.AddChild(); @@ -1357,7 +1357,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) .AddAttribute("compatLnSpc", a => a.CompatibleLineSpacing); builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1) { - new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.PresetTextWrap), 0, 1), + new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.PresetTextWarp), 0, 1), new CompositeParticle.Builder(ParticleType.Group, 0, 1) { new CompositeParticle.Builder(ParticleType.Choice, 1, 1) @@ -1387,9 +1387,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) /// /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main /// - public DocumentFormat.OpenXml.Drawing.PresetTextWrap? PresetTextWrap + public DocumentFormat.OpenXml.Drawing.PresetTextWarp? PresetTextWarp { - get => GetElement(); + get => GetElement(); set => SetElement(value); } diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_main.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_main.cs index 0265fdc1d..c5df80234 100644 --- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_main.cs +++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_main.cs @@ -7144,36 +7144,36 @@ public DocumentFormat.OpenXml.Drawing.AdjustValueList? AdjustValueList /// <a:avLst> /// /// - public partial class PresetTextWrap : OpenXmlCompositeElement + public partial class PresetTextWarp : OpenXmlCompositeElement { /// - /// Initializes a new instance of the PresetTextWrap class. + /// Initializes a new instance of the PresetTextWarp class. /// - public PresetTextWrap() : base() + public PresetTextWarp() : base() { } /// - /// Initializes a new instance of the PresetTextWrap class with the specified child elements. + /// Initializes a new instance of the PresetTextWarp class with the specified child elements. /// /// Specifies the child elements. - public PresetTextWrap(IEnumerable childElements) : base(childElements) + public PresetTextWarp(IEnumerable childElements) : base(childElements) { } /// - /// Initializes a new instance of the PresetTextWrap class with the specified child elements. + /// Initializes a new instance of the PresetTextWarp class with the specified child elements. /// /// Specifies the child elements. - public PresetTextWrap(params OpenXmlElement[] childElements) : base(childElements) + public PresetTextWarp(params OpenXmlElement[] childElements) : base(childElements) { } /// - /// Initializes a new instance of the PresetTextWrap class from outer XML. + /// Initializes a new instance of the PresetTextWarp class from outer XML. /// /// Specifies the outer XML of the element. - public PresetTextWrap(string outerXml) : base(outerXml) + public PresetTextWarp(string outerXml) : base(outerXml) { } @@ -7192,7 +7192,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) base.ConfigureMetadata(builder); builder.SetSchema("a:prstTxWarp"); builder.AddChild(); - builder.AddElement() + builder.AddElement() .AddAttribute("prst", a => a.Preset, aBuilder => { aBuilder.AddValidator(RequiredValidator.Instance); @@ -7218,7 +7218,7 @@ public DocumentFormat.OpenXml.Drawing.AdjustValueList? AdjustValueList } /// - public override OpenXmlElement CloneNode(bool deep) => CloneImp(deep); + public override OpenXmlElement CloneNode(bool deep) => CloneImp(deep); } /// @@ -20794,7 +20794,7 @@ public DocumentFormat.OpenXml.Drawing.ChildExtents? ChildExtents /// /// <a:flatTx> /// <a:extLst> - /// <a:prstTxWarp> + /// <a:prstTxWarp> /// <a:scene3d> /// <a:sp3d> /// <a:noAutofit> @@ -21031,7 +21031,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) builder.SetSchema("a:bodyPr"); builder.AddChild(); builder.AddChild(); - builder.AddChild(); + builder.AddChild(); builder.AddChild(); builder.AddChild(); builder.AddChild(); @@ -21080,7 +21080,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) .AddAttribute("compatLnSpc", a => a.CompatibleLineSpacing); builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1) { - new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.PresetTextWrap), 0, 1), + new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.PresetTextWarp), 0, 1), new CompositeParticle.Builder(ParticleType.Group, 0, 1) { new CompositeParticle.Builder(ParticleType.Choice, 1, 1) @@ -21110,9 +21110,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder) /// /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main /// - public DocumentFormat.OpenXml.Drawing.PresetTextWrap? PresetTextWrap + public DocumentFormat.OpenXml.Drawing.PresetTextWarp? PresetTextWarp { - get => GetElement(); + get => GetElement(); set => SetElement(value); } diff --git a/src/DocumentFormat.OpenXml.Features/ElementEvents/ElementEventFeatureExtensions.cs b/src/DocumentFormat.OpenXml.Features/ElementEvents/ElementEventFeatureExtensions.cs index e44352e42..2dfa3258f 100644 --- a/src/DocumentFormat.OpenXml.Features/ElementEvents/ElementEventFeatureExtensions.cs +++ b/src/DocumentFormat.OpenXml.Features/ElementEvents/ElementEventFeatureExtensions.cs @@ -7,7 +7,7 @@ namespace DocumentFormat.OpenXml.Features { internal static class ElementEventFeatureExtensions { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Regsitered for disposal")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Registered for disposal")] public static void AddElementEventFeature(this OpenXmlPackage package) { if (package.Features.Get() is null) diff --git a/src/DocumentFormat.OpenXml.Features/ParagraphId/ParagraphIdFeatureExtensions.cs b/src/DocumentFormat.OpenXml.Features/ParagraphId/ParagraphIdFeatureExtensions.cs index e75b4a3c8..5ba817871 100644 --- a/src/DocumentFormat.OpenXml.Features/ParagraphId/ParagraphIdFeatureExtensions.cs +++ b/src/DocumentFormat.OpenXml.Features/ParagraphId/ParagraphIdFeatureExtensions.cs @@ -17,7 +17,7 @@ public static class ParagraphIdFeatureExtensions /// /// Document to add feature to. /// Options of how paragraph ids should be generated. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Regsitered for disposal")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Registered for disposal")] public static void AddParagraphIdFeature(this WordprocessingDocument doc, ParagraphIdOptions? options = default) { options ??= new(); diff --git a/src/DocumentFormat.OpenXml.Features/ParagraphId/ParagraphIdOptions.cs b/src/DocumentFormat.OpenXml.Features/ParagraphId/ParagraphIdOptions.cs index f0440c9e4..b5fad7e8f 100644 --- a/src/DocumentFormat.OpenXml.Features/ParagraphId/ParagraphIdOptions.cs +++ b/src/DocumentFormat.OpenXml.Features/ParagraphId/ParagraphIdOptions.cs @@ -9,7 +9,7 @@ namespace DocumentFormat.OpenXml.Features public class ParagraphIdOptions { /// - /// Gets a value indicating whether or not paragraph ids should be autogenerated on elements. + /// Gets a value indicating whether or not paragraph ids should be auto-generated on elements. /// public bool AutoGenerateIds { get; init; } = true; diff --git a/src/DocumentFormat.OpenXml.Features/ParagraphId/SharedParagraphIdFeatureExtensions.cs b/src/DocumentFormat.OpenXml.Features/ParagraphId/SharedParagraphIdFeatureExtensions.cs index 6be498d04..5167b5b96 100644 --- a/src/DocumentFormat.OpenXml.Features/ParagraphId/SharedParagraphIdFeatureExtensions.cs +++ b/src/DocumentFormat.OpenXml.Features/ParagraphId/SharedParagraphIdFeatureExtensions.cs @@ -46,12 +46,12 @@ public static ISharedFeature AddSharedParagraphId } /// - /// Registers a document to use a shared paragragraph collection, which potentially may ensure uniqueness among many documents. + /// Registers a document to use a shared paragraph collection, which potentially may ensure uniqueness among many documents. /// /// Shared collection feature. /// Document to register with shared paragraph collection. /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Regsitered for disposal")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Registered for disposal")] public static ISharedFeature Add(this ISharedFeature shared, WordprocessingDocument doc) { if (shared is null) diff --git a/src/DocumentFormat.OpenXml.Framework/ExperimentalApis.cs b/src/DocumentFormat.OpenXml.Framework/ExperimentalApis.cs index b27aaa46c..166ed5b69 100644 --- a/src/DocumentFormat.OpenXml.Framework/ExperimentalApis.cs +++ b/src/DocumentFormat.OpenXml.Framework/ExperimentalApis.cs @@ -10,6 +10,6 @@ internal static class ExperimentalApis internal static class PackageApis { public const string DiagnosticId = "OOXML0001"; - public const string Message = "IPackage related APIs are currently experimental. Future versions may (or may not) change their shape before stabalizing."; + public const string Message = "IPackage related APIs are currently experimental. Future versions may (or may not) change their shape before stabilizing."; } } diff --git a/src/DocumentFormat.OpenXml.Framework/Features/PartRootEventExtensions.cs b/src/DocumentFormat.OpenXml.Framework/Features/PartRootEventExtensions.cs index cd30264ca..08ad9880e 100644 --- a/src/DocumentFormat.OpenXml.Framework/Features/PartRootEventExtensions.cs +++ b/src/DocumentFormat.OpenXml.Framework/Features/PartRootEventExtensions.cs @@ -12,7 +12,7 @@ namespace DocumentFormat.OpenXml.Features public static class PartRootEventExtensions { /// - /// Adds a feature to track eventing for a package lifecycle events. + /// Adds a feature to track eventing for package life cycle events. /// /// Container to add the feature to. public static void AddPartRootEventsFeature(this OpenXmlPartContainer container) diff --git a/src/DocumentFormat.OpenXml.Framework/Framework/Schema/README.md b/src/DocumentFormat.OpenXml.Framework/Framework/Schema/README.md index 46a708f0d..01b7bc33d 100644 --- a/src/DocumentFormat.OpenXml.Framework/Framework/Schema/README.md +++ b/src/DocumentFormat.OpenXml.Framework/Framework/Schema/README.md @@ -12,7 +12,7 @@ Each element in the SDK is derived from the XSD definitions for OpenXML document The particles within this SDK are of the following types: - *Element:* Defines the actual child element. -- *Group:* Defines a reuseable group of child elements that are combined into the parent composite particle. +- *Group:* Defines a reusable group of child elements that are combined into the parent composite particle. - *Sequence:* Defines a list of items where order matters. - *All:* Defines a list of items where order does not matter. - *Choice:* Defines a list of items where only one of them may occur. diff --git a/src/DocumentFormat.OpenXml.Framework/OpenXmlCompositeElement.cs b/src/DocumentFormat.OpenXml.Framework/OpenXmlCompositeElement.cs index ab6e6ae36..07e5db5b9 100644 --- a/src/DocumentFormat.OpenXml.Framework/OpenXmlCompositeElement.cs +++ b/src/DocumentFormat.OpenXml.Framework/OpenXmlCompositeElement.cs @@ -696,7 +696,7 @@ private protected override void Populate(XmlReader xmlReader, OpenXmlLoadMode lo if (newnode is not OpenXmlUnknownElement) { - // The following method will load teh element in MCMode.Full + // The following method will load the element in MCMode.Full // since the node is already MC-processed when loading as unknown type, full loading the outerXml is fine newnode.OuterXml = node.OuterXml; diff --git a/src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs b/src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs index 9ab02ff75..950e3de92 100644 --- a/src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs +++ b/src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs @@ -196,7 +196,7 @@ private protected Framework.Metadata.ElementState RawState internal IElementMetadata Metadata => Features.GetRequired(); /// - /// Gets an array of fixed attributes which will be parsed out if they are not yet parsed. If parsing is not requried, please + /// Gets an array of fixed attributes which will be parsed out if they are not yet parsed. If parsing is not required, please /// use . /// internal Framework.Metadata.ElementState ParsedState diff --git a/src/DocumentFormat.OpenXml.Framework/OpenXmlElementExtensionMethods.cs b/src/DocumentFormat.OpenXml.Framework/OpenXmlElementExtensionMethods.cs index bd3814c80..5d7a505ea 100644 --- a/src/DocumentFormat.OpenXml.Framework/OpenXmlElementExtensionMethods.cs +++ b/src/DocumentFormat.OpenXml.Framework/OpenXmlElementExtensionMethods.cs @@ -146,7 +146,7 @@ internal static bool CanContainChild(this OpenXmlElement parent, OpenXmlElement } /// - /// Trys to create an OpenXmlElement from the specified namespace URI and local name. + /// Tries to create an OpenXmlElement from the specified namespace URI and local name. /// /// The parent element. /// The specified file format version. diff --git a/src/DocumentFormat.OpenXml.Framework/OpenXmlPartReader.cs b/src/DocumentFormat.OpenXml.Framework/OpenXmlPartReader.cs index 69a700cad..351344502 100644 --- a/src/DocumentFormat.OpenXml.Framework/OpenXmlPartReader.cs +++ b/src/DocumentFormat.OpenXml.Framework/OpenXmlPartReader.cs @@ -46,7 +46,7 @@ public OpenXmlPartReader(OpenXmlPart openXmlPart) /// /// Initializes a new instance of the class. /// - /// The ro read. + /// The to read. /// Options on how to read the part. public OpenXmlPartReader(OpenXmlPart openXmlPart, OpenXmlPartReaderOptions options) : this(GetPartStream(openXmlPart), openXmlPart.Features, options.UpdateForPart(openXmlPart)) @@ -719,7 +719,7 @@ private bool ReadRoot() Debug.Assert(_elementStack.Count == 0); // TODO: should we take care of entity? ]> - // TODO: is it OK that we skip all prolog ( DOCTYPE, Comment, PT ) ? + // TODO: is it OK that we skip all prologue ( DOCTYPE, Comment, PT ) ? _xmlReader.MoveToContent(); while (!_xmlReader.EOF && _xmlReader.NodeType != XmlNodeType.Element) diff --git a/src/DocumentFormat.OpenXml.Framework/Packaging/IPackage.cs b/src/DocumentFormat.OpenXml.Framework/Packaging/IPackage.cs index c3a1df93a..e022f4787 100644 --- a/src/DocumentFormat.OpenXml.Framework/Packaging/IPackage.cs +++ b/src/DocumentFormat.OpenXml.Framework/Packaging/IPackage.cs @@ -61,7 +61,7 @@ public interface IPackage /// /// Deletes a part with a given URI from the package. /// - /// The URI fo the part to delete. + /// The URI of the part to delete. void DeletePart(Uri uri); /// diff --git a/src/DocumentFormat.OpenXml.Framework/Packaging/OpenXmlPart.cs b/src/DocumentFormat.OpenXml.Framework/Packaging/OpenXmlPart.cs index 657e6f3cb..706518853 100644 --- a/src/DocumentFormat.OpenXml.Framework/Packaging/OpenXmlPart.cs +++ b/src/DocumentFormat.OpenXml.Framework/Packaging/OpenXmlPart.cs @@ -350,7 +350,7 @@ internal IPackagePart PackagePart /// Gets a value that indicates the maximum allowable number of characters in an Open XML part. A zero (0) value specifies that the part can have an unlimited number of characters. A non-zero value specifies the maximum allowable number of characters in the part. /// /// - /// This property allows you to mitigate denial of service attacks where the attacker submits package with extremely large Opexn XML part. By limiting the size of a part, you can detect the attack and recover reliably. + /// This property allows you to mitigate denial of service attacks where the attacker submits package with extremely large Open XML part. By limiting the size of a part, you can detect the attack and recover reliably. /// internal long MaxCharactersInPart { diff --git a/src/DocumentFormat.OpenXml.Framework/Resources/ExceptionMessages.Designer.cs b/src/DocumentFormat.OpenXml.Framework/Resources/ExceptionMessages.Designer.cs index e4c6e28a5..6eedab315 100644 --- a/src/DocumentFormat.OpenXml.Framework/Resources/ExceptionMessages.Designer.cs +++ b/src/DocumentFormat.OpenXml.Framework/Resources/ExceptionMessages.Designer.cs @@ -892,7 +892,7 @@ internal static string UnknowMCContent { } /// - /// Looks up a localized string similar to An unknown error occured. Original message: '{0}'. + /// Looks up a localized string similar to An unknown error occurred. Original message: '{0}'. /// internal static string UnknownError { get { diff --git a/src/DocumentFormat.OpenXml.Framework/Resources/ExceptionMessages.resx b/src/DocumentFormat.OpenXml.Framework/Resources/ExceptionMessages.resx index 79b74dcd9..3fa9aae68 100644 --- a/src/DocumentFormat.OpenXml.Framework/Resources/ExceptionMessages.resx +++ b/src/DocumentFormat.OpenXml.Framework/Resources/ExceptionMessages.resx @@ -397,7 +397,7 @@ Schemas with ParticleType.Any is not supported - An unknown error occured. Original message: '{0}' + An unknown error occurred. Original message: '{0}' Feature {0} is not available in this collection. diff --git a/src/DocumentFormat.OpenXml.Framework/Validation/ValidationContext.cs b/src/DocumentFormat.OpenXml.Framework/Validation/ValidationContext.cs index bad376f8a..0afb04b7f 100644 --- a/src/DocumentFormat.OpenXml.Framework/Validation/ValidationContext.cs +++ b/src/DocumentFormat.OpenXml.Framework/Validation/ValidationContext.cs @@ -47,7 +47,7 @@ public ValidationContext(IOpenXmlNamespaceResolver resolver, ValidationSettings public bool Valid => Errors.Count == 0; /// - /// If a is used and is cancelled, this will throw. Otherwise, it will + /// If a is used and is canceled, this will throw. Otherwise, it will /// check the number of errors against the . /// /// true if error count is too high. diff --git a/src/DocumentFormat.OpenXml/Packaging/SpreadsheetDocument.cs b/src/DocumentFormat.OpenXml/Packaging/SpreadsheetDocument.cs index 4d0f04a10..88e58525d 100644 --- a/src/DocumentFormat.OpenXml/Packaging/SpreadsheetDocument.cs +++ b/src/DocumentFormat.OpenXml/Packaging/SpreadsheetDocument.cs @@ -260,7 +260,7 @@ public void ChangeDocumentType(SpreadsheetDocumentType newType) /// /// The class of the part. /// The content type of the part. Must match the defined content type if the part is fixed content type. - /// The relationship id. The id will be automaticly generated if this param is null. + /// The relationship id. The id will be automatically generated if this param is null. /// The added part. /// When the part is not allowed to be referenced by this part. /// When the part is fixed content type and the passed in contentType does not match the defined content type. diff --git a/src/DocumentFormat.OpenXml/Packaging/WordprocessingDocument.cs b/src/DocumentFormat.OpenXml/Packaging/WordprocessingDocument.cs index bdc611869..fba1dd641 100644 --- a/src/DocumentFormat.OpenXml/Packaging/WordprocessingDocument.cs +++ b/src/DocumentFormat.OpenXml/Packaging/WordprocessingDocument.cs @@ -300,7 +300,7 @@ public void ChangeDocumentType(WordprocessingDocumentType newType) /// /// The class of the part. /// The content type of the part. Must match the defined content type if the part is fixed content type. - /// The relationship id. The id will be automaticly generated if this param is null. + /// The relationship id. The id will be automatically generated if this param is null. /// The added part. /// When the part is not allowed to be referenced by this part. /// When the part is fixed content type and the passed in contentType does not match the defined content type. diff --git a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json index 7febd1ec3..8f7e426e5 100644 --- a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json +++ b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json @@ -13461,7 +13461,7 @@ ] }, { - "Element": "DocumentFormat.OpenXml.Drawing.PresetTextWrap", + "Element": "DocumentFormat.OpenXml.Drawing.PresetTextWarp", "Children": [ { "Name": "avLst", @@ -63472,4 +63472,4 @@ "Element": "DocumentFormat.OpenXml.Wordprocessing.Zoom", "Children": [] } -] \ No newline at end of file +] diff --git a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json index 919ff4555..12049350b 100644 --- a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json +++ b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json @@ -1592,7 +1592,7 @@ "Value": { "ChildrenParticles": [ { - "ElementType": "DocumentFormat.OpenXml.Drawing.PresetTextWrap", + "ElementType": "DocumentFormat.OpenXml.Drawing.PresetTextWarp", "MinOccurs": 0 }, { @@ -16778,7 +16778,7 @@ ] }, { - "Key": "DocumentFormat.OpenXml.Drawing.PresetTextWrap", + "Key": "DocumentFormat.OpenXml.Drawing.PresetTextWarp", "Value": [ { "Key": "Office2007, Office2010, Office2013, Office2016, Office2019, Office2021, Microsoft365", @@ -39616,7 +39616,7 @@ "Value": { "ChildrenParticles": [ { - "ElementType": "DocumentFormat.OpenXml.Drawing.PresetTextWrap", + "ElementType": "DocumentFormat.OpenXml.Drawing.PresetTextWarp", "MinOccurs": 0 }, { @@ -44175,7 +44175,7 @@ "Value": { "ChildrenParticles": [ { - "ElementType": "DocumentFormat.OpenXml.Drawing.PresetTextWrap", + "ElementType": "DocumentFormat.OpenXml.Drawing.PresetTextWarp", "MinOccurs": 0 }, { @@ -49808,7 +49808,7 @@ "Value": { "ChildrenParticles": [ { - "ElementType": "DocumentFormat.OpenXml.Drawing.PresetTextWrap", + "ElementType": "DocumentFormat.OpenXml.Drawing.PresetTextWarp", "MinOccurs": 0 }, { diff --git a/test/DocumentFormat.OpenXml.Tests.Assets/TestAssets.TestDataStorage.cs b/test/DocumentFormat.OpenXml.Tests.Assets/TestAssets.TestDataStorage.cs index f3da901b9..bbb775c32 100644 --- a/test/DocumentFormat.OpenXml.Tests.Assets/TestAssets.TestDataStorage.cs +++ b/test/DocumentFormat.OpenXml.Tests.Assets/TestAssets.TestDataStorage.cs @@ -180,7 +180,7 @@ public static class PowerPoint public const string HCrestoredLeft_NormalViewRestoredTop_sz_100000_pptx = "TestDataStorage.O14ISOStrict.PowerPoint.[HC]restoredLeft-NormalViewRestoredTop-sz-100000.pptx"; public const string HCsndtgt_SoundTarget_builtIn_pptx = "TestDataStorage.O14ISOStrict.PowerPoint.[HC]sndtgt-SoundTarget-builtIn.pptx"; public const string HCtavlst_Time_tav_tm_pptx = "TestDataStorage.O14ISOStrict.PowerPoint.[HC]tavlst-Time-tav-tm.pptx"; - public const string HCval_Boolean_Varient_boolVal_pptx = "TestDataStorage.O14ISOStrict.PowerPoint.[HC]val-Boolean Varient-boolVal.pptx"; + public const string HCval_Boolean_Variant_boolVal_pptx = "TestDataStorage.O14ISOStrict.PowerPoint.[HC]val-Boolean Variant-boolVal.pptx"; public const string HCviewPr_PresentationViewProperties_showComments_1_pptx = "TestDataStorage.O14ISOStrict.PowerPoint.[HC]viewPr-PresentationViewProperties-showComments-1.pptx"; } } @@ -289,13 +289,13 @@ public static class Smallset public const string AllSlidesConverterSc = "TestDataStorage.v2FxTestFiles.presentation.AllSlidesConverterSC.pptx"; public const string AllSlidesConverterTc = "TestDataStorage.v2FxTestFiles.presentation.AllSlidesConverterTC.pptx"; public const string AutoShapes_2D_Default_styles = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_2D (Default Styles).pptx"; - public const string AutoShapes_2D_Reflection = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_2D_Reflectioin (full).pptx"; + public const string AutoShapes_2D_Reflection = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_2D_Reflection (full).pptx"; public const string AutoShapes_2D_Shadow = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_2D_Shadow (Offset, Diagonal).pptx"; public const string AutoShapes_2D_Soft_Edges = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_2D_Soft Edges (5 Point).pptx"; public const string AutoShapes_3D_Bevel_Circle_Shadow = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_3D_Bevel (Circle)+Shadow (Offset, Diagonal).pptx"; public const string AutoShapes_3D_Bevel_Circle_Soft_Edges = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_3D_Bevel (Circle)+Soft Edges (5 Point).pptx"; public const string AutoShapes_3D_Bevel_Circle = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_3D_Bevel (Circle).pptx"; - public const string AutoShapes_3D_Bevel_Riblet_Reflection = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_3D_Bevel (Riblet)+Reflectioin (full).pptx"; + public const string AutoShapes_3D_Bevel_Riblet_Reflection = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_3D_Bevel (Riblet)+Reflection (full).pptx"; public const string AutoShapes_3D_Rotation_Parallel = "TestDataStorage.v2FxTestFiles.presentation.AutoShapes_3D_Rotation_Parallel (Isometric Right Up).pptx"; public const string Block_hyperlink_crash = "TestDataStorage.v2FxTestFiles.presentation.block_hyperlink_crash.pptx"; public const string Chart_2D_Animation_Box_In_One_Object = "TestDataStorage.v2FxTestFiles.presentation.Chart_2D+Animation (Box In, as one object).pptx"; diff --git a/test/DocumentFormat.OpenXml.Tests.Assets/assets/TestDataStorage/v2FxTestFiles/presentation/AutoShapes_2D_Reflectioin (full).pptx b/test/DocumentFormat.OpenXml.Tests.Assets/assets/TestDataStorage/v2FxTestFiles/presentation/AutoShapes_2D_Reflection (full).pptx similarity index 100% rename from test/DocumentFormat.OpenXml.Tests.Assets/assets/TestDataStorage/v2FxTestFiles/presentation/AutoShapes_2D_Reflectioin (full).pptx rename to test/DocumentFormat.OpenXml.Tests.Assets/assets/TestDataStorage/v2FxTestFiles/presentation/AutoShapes_2D_Reflection (full).pptx diff --git a/test/DocumentFormat.OpenXml.Tests.Assets/assets/TestDataStorage/v2FxTestFiles/presentation/AutoShapes_3D_Bevel (Riblet)+Reflectioin (full).pptx b/test/DocumentFormat.OpenXml.Tests.Assets/assets/TestDataStorage/v2FxTestFiles/presentation/AutoShapes_3D_Bevel (Riblet)+Reflection (full).pptx similarity index 100% rename from test/DocumentFormat.OpenXml.Tests.Assets/assets/TestDataStorage/v2FxTestFiles/presentation/AutoShapes_3D_Bevel (Riblet)+Reflectioin (full).pptx rename to test/DocumentFormat.OpenXml.Tests.Assets/assets/TestDataStorage/v2FxTestFiles/presentation/AutoShapes_3D_Bevel (Riblet)+Reflection (full).pptx diff --git a/test/DocumentFormat.OpenXml.Tests/ConformanceTest/CommentEx/Commons.cs b/test/DocumentFormat.OpenXml.Tests/ConformanceTest/CommentEx/Commons.cs index 9ce9145eb..a38750955 100644 --- a/test/DocumentFormat.OpenXml.Tests/ConformanceTest/CommentEx/Commons.cs +++ b/test/DocumentFormat.OpenXml.Tests/ConformanceTest/CommentEx/Commons.cs @@ -15,7 +15,7 @@ namespace DocumentFormat.OpenXml.Tests.CommentEx public static class Commons { /// - /// Comment object, Get support mothod. + /// Comment object, Get support method. /// /// Target comment include commentsPart /// Comment ID @@ -31,7 +31,7 @@ public static Comment GetComment(WordprocessingCommentsPart commentsPart, string } /// - /// CommentEx object, Get support mothod. + /// CommentEx object, Get support method. /// /// Target comment include commentsPart /// Target comment include commentsExPart diff --git a/test/DocumentFormat.OpenXml.Tests/Extensions/OpenXmlPartExtensions.cs b/test/DocumentFormat.OpenXml.Tests/Extensions/OpenXmlPartExtensions.cs index c1d94f300..f6c5a82aa 100644 --- a/test/DocumentFormat.OpenXml.Tests/Extensions/OpenXmlPartExtensions.cs +++ b/test/DocumentFormat.OpenXml.Tests/Extensions/OpenXmlPartExtensions.cs @@ -136,10 +136,10 @@ private static void AddChildIdPartPairs(IList list, OpenXmlPartConta } /// - /// Check if current part is reflectable (with xml content). + /// Check if current part is reflect-able (with xml content). /// /// Current part - /// return true if it has non-null root element, otherwise rturn false. + /// return true if it has non-null root element, otherwise return false. public static bool IsReflectable(this OpenXmlPart part) { if (part is null) diff --git a/test/DocumentFormat.OpenXml.Tests/GeneratedClass001.cs b/test/DocumentFormat.OpenXml.Tests/GeneratedClass001.cs index 577b1aac2..d2c37130d 100644 --- a/test/DocumentFormat.OpenXml.Tests/GeneratedClass001.cs +++ b/test/DocumentFormat.OpenXml.Tests/GeneratedClass001.cs @@ -690,7 +690,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties3 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 91440, TopInset = 45720, RightInset = 91440, BottomInset = 45720, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Center, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap1 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap1 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList4 = new A.AdjustValueList(); presetTextWrap1.Append(adjustValueList4); @@ -830,7 +830,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties4 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 91440, TopInset = 45720, RightInset = 91440, BottomInset = 45720, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Center, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap2 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap2 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList6 = new A.AdjustValueList(); presetTextWrap2.Append(adjustValueList6); @@ -1001,7 +1001,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties5 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 91440, TopInset = 45720, RightInset = 91440, BottomInset = 45720, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Center, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap3 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap3 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList8 = new A.AdjustValueList(); presetTextWrap3.Append(adjustValueList8); @@ -3038,7 +3038,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties6 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 91440, TopInset = 45720, RightInset = 91440, BottomInset = 45720, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Bottom, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap4 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap4 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList12 = new A.AdjustValueList(); presetTextWrap4.Append(adjustValueList12); @@ -3331,7 +3331,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties7 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 274320, TopInset = 45720, RightInset = 274320, BottomInset = 45720, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Center, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap5 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap5 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList14 = new A.AdjustValueList(); presetTextWrap5.Append(adjustValueList14); @@ -3637,7 +3637,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties8 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 182880, TopInset = 182880, RightInset = 182880, BottomInset = 365760, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Bottom, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap6 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap6 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList16 = new A.AdjustValueList(); presetTextWrap6.Append(adjustValueList16); @@ -3934,7 +3934,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties9 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 91440, TopInset = 45720, RightInset = 91440, BottomInset = 45720, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Center, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap7 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap7 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList18 = new A.AdjustValueList(); presetTextWrap7.Append(adjustValueList18); @@ -4136,7 +4136,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties10 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 91440, TopInset = 45720, RightInset = 91440, BottomInset = 45720, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Center, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap8 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap8 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList20 = new A.AdjustValueList(); presetTextWrap8.Append(adjustValueList20); @@ -4482,7 +4482,7 @@ private void GenerateMainDocumentPart1Content(MainDocumentPart mainDocumentPart1 Wps.TextBodyProperties textBodyProperties11 = new Wps.TextBodyProperties() { Rotation = 0, UseParagraphSpacing = false, VerticalOverflow = A.TextVerticalOverflowValues.Overflow, HorizontalOverflow = A.TextHorizontalOverflowValues.Overflow, Vertical = A.TextVerticalValues.Horizontal, Wrap = A.TextWrappingValues.Square, LeftInset = 91440, TopInset = 45720, RightInset = 91440, BottomInset = 45720, ColumnCount = 1, ColumnSpacing = 0, RightToLeftColumns = false, FromWordArt = false, Anchor = A.TextAnchoringTypeValues.Top, AnchorCenter = false, ForceAntiAlias = false, CompatibleLineSpacing = true }; - A.PresetTextWrap presetTextWrap9 = new A.PresetTextWrap() { Preset = A.TextShapeValues.TextNoShape }; + A.PresetTextWarp presetTextWrap9 = new A.PresetTextWarp() { Preset = A.TextShapeValues.TextNoShape }; A.AdjustValueList adjustValueList22 = new A.AdjustValueList(); presetTextWrap9.Append(adjustValueList22);