Migradoc/DocumentObjectModel/Tables: Replaced several NInt properties with int?, when relevant for tables.

NOTE: Part of table rendering speedup.

Author: Florian Krabbenhoeft

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Tables/Cell.cs

@@ -338,22 +338,22 @@ public Shading Shading
         /// </summary>
         public int MergeRight
         {
-            get { return this.mergeRight.Value; }
-            set { this.mergeRight.Value = value; }
+            get { return this.mergeRight ?? 0; }
+            set { this.mergeRight = value; }
         }
         [DV]
-        internal NInt mergeRight = NInt.NullValue;
+        internal int? mergeRight;
 
         /// <summary>
         /// Gets or sets the number of cells to be merged down.
         /// </summary>
         public int MergeDown
         {
-            get { return this.mergeDown.Value; }
-            set { this.mergeDown.Value = value; }
+            get { return this.mergeDown ?? 0; }
+            set { this.mergeDown = value; }
         }
         [DV]
-        internal NInt mergeDown = NInt.NullValue;
+        internal int? mergeDown;
 
         /// <summary>
         /// Gets the collection of document objects that defines the cell.
@@ -405,10 +405,10 @@ internal override void Serialize(Serializer serializer)
             if (!this.IsNull("Format"))
                 this.format.Serialize(serializer, "Format", null);
 
-            if (!this.mergeDown.IsNull)
+            if (this.mergeDown.HasValue)
                 serializer.WriteSimpleAttribute("MergeDown", this.MergeDown);
 
-            if (!this.mergeRight.IsNull)
+            if (this.mergeRight.HasValue)
                 serializer.WriteSimpleAttribute("MergeRight", this.MergeRight);
 
             if (!this.verticalAlignment.IsNull)

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Tables/Column.cs

@@ -115,16 +115,16 @@ public int Index
     {
       get
       {
-        if (IsNull("Index"))
+        if (!index.HasValue)
         {
           Columns clms = this.Parent as Columns;
-          SetValue("Index", clms.IndexOf(this));
+          SetValue("Index", index = clms.IndexOf(this));
         }
-        return index;
+        return index ?? 0;
       }
     }
     [DV]
-    internal NInt index = NInt.NullValue;
+    internal int? index;
 
     /// <summary>
     /// Gets a cell by its row index. The first cell has index 0.
@@ -134,7 +134,7 @@ public Cell this[int index]
       get
       {
         //Check.ArgumentOutOfRange(index >= 0 && index < table.Rows.Count, "index");
-        return Table.Rows[index][this.index];
+        return Table.Rows[index][this.index ?? 0];
       }
     }
 
@@ -230,11 +230,11 @@ public Borders Borders
     /// </summary>
     public int KeepWith
     {
-      get { return this.keepWith.Value; }
-      set { this.keepWith.Value = value; }
+      get { return this.keepWith ?? 0; }
+      set { this.keepWith = value; }
     }
     [DV]
-    internal NInt keepWith = NInt.NullValue;
+    internal int? keepWith;
 
     /// <summary>
     /// Gets or sets a value which define whether the column is a header.
@@ -309,7 +309,7 @@ internal override void Serialize(Serializer serializer)
       if (!this.width.IsNull)
         serializer.WriteSimpleAttribute("Width", this.Width);
 
-      if (!this.keepWith.IsNull)
+      if (this.keepWith.HasValue)
         serializer.WriteSimpleAttribute("KeepWith", this.KeepWith);
 
       if (!this.IsNull("Borders"))

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Tables/Row.cs

@@ -124,9 +124,9 @@ public int Index
         if (!index.HasValue)
         {
           Rows rws = this.parent as Rows;
-          SetValue("Index", rws.IndexOf(this));
+          SetValue("Index", index = rws.IndexOf(this));
         }
-        return index.Value;
+        return index ?? 0;
       }
     }
     [DV]
@@ -286,11 +286,11 @@ public Shading Shading
     /// </summary>
     public int KeepWith
     {
-      get { return this.keepWith.Value; }
-      set { this.keepWith.Value = value; }
+      get { return this.keepWith ?? 0; }
+      set { this.keepWith = value; }
     }
     [DV]
-    internal NInt keepWith = NInt.NullValue;
+    internal int? keepWith;
 
     /// <summary>
     /// Gets the Cells collection of the table.
@@ -360,7 +360,7 @@ internal override void Serialize(Serializer serializer)
       if (!this.verticalAlignment.IsNull)
         serializer.WriteSimpleAttribute("VerticalAlignment", this.VerticalAlignment);
 
-      if (!this.keepWith.IsNull)
+      if (this.keepWith.HasValue)
         serializer.WriteSimpleAttribute("KeepWith", this.KeepWith);
 
       //Borders & Shading

MigraDocCore.DocumentObjectModel/MigraDoc.DocumentObjectModel.Visitors/MergedCellList.cs

@@ -189,7 +189,7 @@ public Borders GetEffectiveBorders(Cell cell)
 
       if (cell.mergeRight > 0)
       {
-        Cell rightBorderCell = cell.Table[cell.Row.Index, cell.Column.Index + cell.mergeRight];
+        Cell rightBorderCell = cell.Table[cell.Row.Index, cell.Column.Index + (cell.mergeRight ?? 0)];
         if (rightBorderCell.borders != null && rightBorderCell.borders.right != null)
           borders.Right = rightBorderCell.borders.right.Clone();
         else
@@ -198,7 +198,7 @@ public Borders GetEffectiveBorders(Cell cell)
 
       if (cell.mergeDown > 0)
       {
-        Cell bottomBorderCell = cell.Table[cell.Row.Index + cell.mergeDown, cell.Column.Index];
+        Cell bottomBorderCell = cell.Table[cell.Row.Index + (cell.mergeDown ?? 0), cell.Column.Index];
         if (bottomBorderCell.borders != null && bottomBorderCell.borders.bottom != null)
           borders.Bottom = bottomBorderCell.borders.bottom.Clone();
         else