Commit for patch 24.5.1

Author: sabir-aspose

FileFormat.Words/OpenXML.Words.Data.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using DF = DocumentFormat.OpenXml;
@@ -22,7 +22,7 @@ private OoxmlDocData(WordprocessingDocument doc)
         {
             lock (_lockObject)
             {
-                _ooxmlDoc = OwDocument.CreateInstance();
+                _ooxmlDoc = OwDocument.CreateInstance(doc);
                 _staticDocCount++;
                 _staticDocDict.TryAdd(_staticDocCount,doc);
             }
@@ -58,7 +58,9 @@ internal void Insert(FF.IElement newElement, int position,Document doc)
                 _staticDocDict.TryGetValue(doc.GetInstanceInfo(), out WordprocessingDocument staticDoc);
 
                 if (staticDoc?.MainDocumentPart?.Document?.Body == null) throw new FileFormatException("Package or Document or Body is null",new NullReferenceException());
-                
+
+                _ooxmlDoc = OwDocument.CreateInstance(staticDoc);
+
                 var enumerable = staticDoc.MainDocumentPart.Document.Body.Elements().ToList();
                 var originalElements = new List<DF.OpenXmlElement>(enumerable);
 
@@ -105,7 +107,9 @@ internal void Update(FF.IElement newElement, int position,Document doc)
                 _staticDocDict.TryGetValue(doc.GetInstanceInfo(), out WordprocessingDocument staticDoc);
 
                 if (staticDoc?.MainDocumentPart?.Document?.Body == null) throw new FileFormatException("Package or Document or Body is null", new NullReferenceException());
-                
+
+                _ooxmlDoc = OwDocument.CreateInstance(staticDoc);
+
                 var enumerable = staticDoc.MainDocumentPart.Document.Body.Elements().ToList();
                 var originalElements = new List<DF.OpenXmlElement>(enumerable);
 
@@ -183,6 +187,8 @@ internal void Append(FF.IElement newElement,Document doc)
 
                 if (staticDoc?.MainDocumentPart?.Document?.Body == null) throw new FileFormatException("Package or Document or Body is null", new NullReferenceException());
 
+                _ooxmlDoc = OwDocument.CreateInstance(staticDoc);
+
                 var enumerable = staticDoc.MainDocumentPart.Document.Body.Elements().ToList();
                 var originalElements = new List<DF.OpenXmlElement>(enumerable);
 

FileFormat.Words/OpenXML.Words.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;
@@ -55,6 +55,38 @@ private OwDocument()
                 }
             }
         }
+        private OwDocument(WordprocessingDocument pkg)
+        {
+            lock (_lockObject)
+            {
+                try
+                {
+                    //_ms = new MemoryStream();
+                    _pkgDocument = pkg;
+                    _mainPart = pkg.MainDocumentPart;
+                    //_mainPart.Document = new WP.Document();
+                    //var tmp = new OT.DefaultTemplate();
+                    //tmp.CreateMainDocumentPart(_mainPart);
+                    //CreateProperties(_pkgDocument);
+
+                    _numberingPart = _mainPart.NumberingDefinitionsPart;
+
+                    if (_numberingPart != null)
+                    {
+                        _IDs = new List<int>();
+                        foreach (var abstractNum in _numberingPart.Numbering.Elements<WP.AbstractNum>())
+                        {
+                            _IDs.Add(abstractNum.AbstractNumberId);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var errorMessage = OWD.OoxmlDocData.ConstructMessage(ex, "Initialize OOXML Element(s)");
+                    throw new FileFormatException(errorMessage, ex);
+                }
+            }
+        }
 
         #region Create Core Properties for OpenXML Word Document
         internal void CreateProperties(WordprocessingDocument pkgDocument)
@@ -92,6 +124,11 @@ public static OwDocument CreateInstance()
             return new OwDocument();
         }
 
+        public static OwDocument CreateInstance(WordprocessingDocument pkg)
+        {
+            return new OwDocument(pkg);
+        }
+
         #region Create OpenXML Word Document Contents Based on FileFormat.Words.IElements
 
         #region Main Method
@@ -694,7 +731,8 @@ internal FF.Paragraph LoadParagraph(WP.Paragraph wpPara, int id)
                     {
                         if (_numberingPart != null)
                         {
-                            if (ffP.NumberingId != null && ffP.NumberingLevel != null)
+                            if (paraProps.NumberingProperties.NumberingId.Val != null &&
+                                paraProps.NumberingProperties.NumberingLevelReference.Val != null)
                             {
                                 ffP.NumberingId = paraProps.NumberingProperties.NumberingId.Val;
                                 ffP.NumberingLevel = paraProps.NumberingProperties.NumberingLevelReference.Val + 1;