Encapsulation Worksheet constructor and added a Factory class for Worksheet Object creation.

Author: Fahad Adeel

FileFormat.Cells/Workbook.cs

@@ -57,7 +57,8 @@ public Workbook()
             worksheetPart.Worksheet = new DocumentFormat.OpenXml.Spreadsheet.Worksheet(sheetData);
 
             // Adding your Worksheet object to Worksheets list
-            var newWorksheet = new Worksheet(worksheetPart, worksheetPart.Worksheet);
+            //var newWorksheet = new Worksheet(worksheetPart, worksheetPart.Worksheet);
+            var newWorksheet = Worksheet.WorksheetFactory.CreateInstance(worksheetPart, worksheetPart.Worksheet);
             this.Worksheets.Add(newWorksheet);
 
             this.stylesPart = this.spreadsheetDocument.WorkbookPart.AddNewPart<WorkbookStylesPart>();
@@ -124,7 +125,7 @@ private void InitializeWorksheets()
                 var worksheetPart = (WorksheetPart)(this.workbookpart.GetPartById(sheet.Id));
                 var worksheet = worksheetPart.Worksheet;
                 var sheetData = worksheet.Elements<SheetData>().FirstOrDefault() ?? new SheetData();
-                this.Worksheets.Add(new Worksheet(worksheetPart, worksheet));
+                this.Worksheets.Add(Worksheet.WorksheetFactory.CreateInstance(worksheetPart, worksheetPart.Worksheet));
             }
         }
 
@@ -227,7 +228,7 @@ public Worksheet AddSheet(string sheetName)
             newWorksheetPart.Worksheet = new DocumentFormat.OpenXml.Spreadsheet.Worksheet(sheetData);
 
             // Create a new Worksheet object and add it to Worksheets list
-            var newWorksheet = new Worksheet(newWorksheetPart, newWorksheetPart.Worksheet);
+            var newWorksheet = Worksheet.WorksheetFactory.CreateInstance(newWorksheetPart, newWorksheetPart.Worksheet);
             this.Worksheets.Add(newWorksheet);
 
             // Append a new sheet and associate it with the workbook
@@ -285,7 +286,7 @@ private void SyncWorksheets()
                 var wp = (WorksheetPart)(this.workbookpart.GetPartById(sh.Id));
                 var ws = wp.Worksheet;
                 var sd = ws.Elements<SheetData>().FirstOrDefault() ?? new SheetData();
-                this.Worksheets.Add(new Worksheet(wp, ws));
+                this.Worksheets.Add(Worksheet.WorksheetFactory.CreateInstance(wp, wp.Worksheet));
             }
         }
 

FileFormat.Cells/Worksheet.cs

@@ -25,7 +25,7 @@ public sealed class Worksheet
         /// </summary>
         /// <param name="worksheetPart">The worksheet part of the document.</param>
         /// <param name="worksheet">The underlying OpenXML worksheet instance.</param>
-        internal Worksheet(WorksheetPart worksheetPart, DocumentFormat.OpenXml.Spreadsheet.Worksheet worksheet)
+        private Worksheet(WorksheetPart worksheetPart, DocumentFormat.OpenXml.Spreadsheet.Worksheet worksheet)
         {
             _worksheetPart = worksheetPart ?? throw new ArgumentNullException(nameof(worksheetPart));
 
@@ -36,6 +36,14 @@ internal Worksheet(WorksheetPart worksheetPart, DocumentFormat.OpenXml.Spreadshe
             this.Cells = new CellIndexer(this);
         }
 
+        public class WorksheetFactory
+        {
+            public static Worksheet CreateInstance(WorksheetPart worksheetPart, DocumentFormat.OpenXml.Spreadsheet.Worksheet worksheet)
+            {
+                return new Worksheet(worksheetPart, worksheet);
+            }
+        }
+
         /// <summary>
         /// Gets or sets the name of the worksheet.
         /// </summary>

FileFormat.Cells_Tests/UnitTest1.cs

@@ -5,9 +5,9 @@
 public class UnitTest1
 {
 
-    string testFilePath = "/Users/fahadadeelqazi/Downloads/test_fahad_new_protected_image.xlsx";
-    private string imageInputPath = "/Users/fahadadeelqazi/Downloads/ImageCells.png";
-    string outputDirectory = "/Users/fahadadeelqazi/Downloads/";
+    string testFilePath = "Z:\\Downloads\\test_fahad_new_protected_image.xlsx";
+    private string imageInputPath = "Z:\\Downloads\\ImageCells.png";
+    string outputDirectory = "Z:\\Downloads\\";
 
     [TestInitialize]
     public void Setup()