同步2月版本

src/DocumentFormat.OpenXml.Flatten/DocumentFormat.OpenXml.Flatten/Compatibilities/Packaging/CompatiblePackage.cs

@@ -511,7 +511,7 @@
             // The following test will filter out an atomic content type file, with name
             // "[Content_Types].xml", as well as an interleaved one, with piece names such as
             // "[Content_Types].xml/[0].piece" or "[Content_Types].xml/[5].last.piece".
             if (zipItemName.StartsWith(ContentTypeHelper.ContentTypeFileName, StringComparison.OrdinalIgnoreCase))
                 return false;
             else
             {
@@ -588,7 +588,7 @@
                 //with the rules for comparing/normalizing partnames.
                 //Refer to PackUriHelper.ValidatedPartUri.GetNormalizedPartUri method.
                 //Currently normalization just involves upper-casing ASCII and hence the simplification.
                 return (string.CompareOrdinal(extensionA.ToUpperInvariant(), extensionB.ToUpperInvariant()) == 0);
             }
 
             int IEqualityComparer<string>.GetHashCode(string extension)
@@ -599,7 +599,7 @@
                 //with the rules for comparing/normalizing partnames.
                 //Refer to PackUriHelper.ValidatedPartUri.GetNormalizedPartUri method.
                 //Currently normalization just involves upper-casing ASCII and hence the simplification.
                 return extension.ToUpperInvariant().GetHashCode();
             }
         }
 
@@ -689,7 +689,6 @@
                 }
             }
 
-
             //Returns the content type for the part, if present, else returns null.
             internal CompatiblePackage.ContentType? GetContentType(CompatiblePackage.PackUriHelper.ValidatedPartUri partUri)
             {
@@ -912,7 +911,6 @@
                     }
                 }
 
-
                 // If an atomic file was found, open a stream on it.
                 if (_contentTypeZipArchiveEntry != null)
                 {
@@ -978,7 +976,7 @@
 
                 // The part Uris are stored in the Override Dictionary in their original form , but they are compared
                 // in a normalized manner using PartUriComparer.
                 _overrideDictionary.Add(partUri, new CompatiblePackage.ContentType(contentTypeAttributeValue!));
 
                 //Skip the EndElement for Override Tag
                 if (!reader.IsEmptyElement)
@@ -1016,7 +1014,7 @@
 
                 // The part Uris are stored in the Override Dictionary in their original form , but they are compared
                 // in a normalized manner using PartUriComparer.
-                _overrideDictionary.Add(partUri, contentType);
+                _overrideDictionary?.Add(partUri, contentType);
                 _dirty = true;
             }
 
@@ -1059,7 +1057,6 @@
                         ((IXmlLineInfo) reader).LineNumber, ((IXmlLineInfo) reader).LinePosition);
             }
 
-
             //Validate if the required Content type XML attribute is present
             //Content type of a part can be empty
             private void ThrowIfXmlAttributeMissing(string attributeName, string? attributeValue, string tagName,
@@ -1075,7 +1072,6 @@
 
             internal Dictionary<string, CompatiblePackage.ContentType> GetDefaultDictionary() => _defaultDictionary;
 
-
             private Dictionary<CompatiblePackage.PackUriHelper.ValidatedPartUri, CompatiblePackage.ContentType>? _overrideDictionary;
             private readonly Dictionary<string, CompatiblePackage.ContentType> _defaultDictionary;
             private readonly ZipArchive _zipArchive;
@@ -1105,8 +1101,11 @@
         class ValidatedPartUriIgnoreCaseEqualityComparer : IEqualityComparer<
             CompatiblePackage.PackUriHelper.ValidatedPartUri>
         {
-            public bool Equals(PackUriHelper.ValidatedPartUri x, PackUriHelper.ValidatedPartUri y)
+            public bool Equals(PackUriHelper.ValidatedPartUri? x, PackUriHelper.ValidatedPartUri? y)
             {
+                if (x is null && y is null) return true;
+                if (x is null || y is null) return false;
+
                 return StringComparer.OrdinalIgnoreCase.Equals(x.NormalizedPartUriString, y.NormalizedPartUriString);
             }
 

src/DocumentFormat.OpenXml.Flatten/DocumentFormat.OpenXml.Flatten/Compatibilities/Packaging/EmptyPackagePart.cs

@@ -84,11 +84,42 @@ protected override string GetContentTypeCore()
                 return new CompatiblePackage.ContentType("application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml");
             }
 
-            if (Regex.IsMatch(uri, @"/ppt/diagrams/drawing\d+\.xml"))
+            if (uri.StartsWith("/ppt/diagrams/", StringComparison.OrdinalIgnoreCase))
             {
-                // /ppt/diagrams/drawing0.xml
-                // application/vnd.ms-office.drawingml.diagramDrawing+xml
-                return new CompatiblePackage.ContentType("application/vnd.ms-office.drawingml.diagramDrawing+xml");
+                if (Regex.IsMatch(uri, @"/ppt/diagrams/drawing\d+\.xml"))
+                {
+                    // /ppt/diagrams/drawing0.xml
+                    // application/vnd.ms-office.drawingml.diagramDrawing+xml
+                    return new CompatiblePackage.ContentType("application/vnd.ms-office.drawingml.diagramDrawing+xml");
+                }
+
+                if (Regex.IsMatch(uri, @"/ppt/diagrams/layout\d+\.xml"))
+                {
+                    // /ppt/diagrams/layout1.xml
+                    // application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml
+                    return new CompatiblePackage.ContentType("application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml");
+                }
+
+                if (Regex.IsMatch(uri, @"/ppt/diagrams/data\d+\.xml"))
+                {
+                    // /ppt/diagrams/data1.xml
+                    // application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml
+                    return new CompatiblePackage.ContentType("application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml");
+                }
+
+                if (Regex.IsMatch(uri, @"/ppt/diagrams/colors\d+\.xml"))
+                {
+                    // /ppt/diagrams/colors1.xml
+                    // application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml
+                    return new CompatiblePackage.ContentType("application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml");
+                }
+
+                if (Regex.IsMatch(uri, @"/ppt/diagrams/quickStyle\d+\.xml"))
+                {
+                    // /ppt/diagrams/quickStyle1.xml
+                    // application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml
+                    return new CompatiblePackage.ContentType("application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml");
+                }
             }
 
             if (Regex.IsMatch(uri, @"/tags/tag\d+\.xml"))

src/DocumentFormat.OpenXml.Flatten/DocumentFormat.OpenXml.Flatten/ElementConverters/SmartArt/SmartArtElementFlattenConverter.cs

@@ -69,6 +69,14 @@ protected override GraphicFrame Convert(GraphicFrame element, ElementContext con
         private void FlattenDrawingElementFromData(GraphicFrame xmlElement, DiagramDataPart diagramDataPart, DiagramColorsPart? colorsPart, in ElementContext context)
         {
             var dataModelRoot = diagramDataPart.DataModelRoot;
+
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+            if (dataModelRoot is null)
+            {
+                // 这个 dataModelRoot 是可空的，请看内部 issues/627
+                return;
+            }
+
             var connectionList = dataModelRoot.ConnectionList;
             var pointList = dataModelRoot.PointList;
             if (connectionList is null || pointList is null)

src/DocumentFormat.OpenXml.Flatten/DocumentFormat.OpenXml.Flatten/OpenMcdf/OpenMcdf/Readonly/ByteArrayPool.cs

@@ -1,4 +1,5 @@
-// ReSharper disable once CheckNamespace 特别的命名空间
+#nullable enable
+// ReSharper disable once CheckNamespace 特别的命名空间
 
 namespace OpenMcdf
 {