Fix splitting cell with rowspan bug

The cells in column weren't shifted for original renderer as they
should after creating different rows array for overflow renderer.

DEVSIX-1320

Autoported commit.
Original commit hash: [7731715]

Author: IdamkinI

itext.tests/itext.layout.tests/itext/layout/TableBorderTest.cs

@@ -1276,10 +1276,10 @@ public virtual void TableWithHeaderFooterTest16() {
 
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
-        [NUnit.Framework.Ignore("DEVSIX-1320")]
         [NUnit.Framework.Test]
-        public virtual void TableWithHeaderFooterTest17() {
-            String testName = "tableWithHeaderFooterTest17.pdf";
+        [LogMessage(iText.IO.LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)]
+        public virtual void SplitRowspanKeepTogetherTest() {
+            String testName = "splitRowspanKeepTogetherTest.pdf";
             String outFileName = destinationFolder + testName;
             String cmpFileName = sourceFolder + "cmp_" + testName;
             PdfDocument pdfDoc = new PdfDocument(new PdfWriter(outFileName));

itext.tests/itext.layout.tests/resources/itext/layout/TableBorderTest/cmp_splitRowspanKeepTogetherTest.pdf

@@ -667,19 +667,20 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                                 if (1 == minRowspan) {
                                     // Here we use the same cell, but create a new renderer which doesn't have any children,
                                     // therefore it won't have any content.
-                                    Cell overflowCell = ((Cell)currentRow[col].GetModelElement()).Clone(true);
+                                    CellRenderer overflowCell = (CellRenderer)((Cell)currentRow[col].GetModelElement()).Clone(true).GetRenderer
+                                        ();
                                     // we will change properties
-                                    CellRenderer originalCellRenderer = currentRow[col];
+                                    overflowCell.SetParent(this);
+                                    overflowCell.DeleteProperty(Property.HEIGHT);
+                                    overflowCell.DeleteProperty(Property.MIN_HEIGHT);
+                                    overflowCell.DeleteProperty(Property.MAX_HEIGHT);
+                                    overflowRows.SetCell(0, col, null);
+                                    overflowRows.SetCell(targetOverflowRowIndex[col] - row, col, overflowCell);
                                     currentRow[col].isLastRendererForModelElement = false;
                                     childRenderers.Add(currentRow[col]);
+                                    CellRenderer originalCell = currentRow[col];
                                     currentRow[col] = null;
-                                    rows[targetOverflowRowIndex[col]][col] = originalCellRenderer;
-                                    overflowRows.SetCell(0, col, null);
-                                    overflowRows.SetCell(targetOverflowRowIndex[col] - row, col, (CellRenderer)overflowCell.GetRenderer().SetParent
-                                        (this));
-                                    overflowRows.GetCell(targetOverflowRowIndex[col] - row, col).DeleteProperty(Property.HEIGHT);
-                                    overflowRows.GetCell(targetOverflowRowIndex[col] - row, col).DeleteProperty(Property.MIN_HEIGHT);
-                                    overflowRows.GetCell(targetOverflowRowIndex[col] - row, col).DeleteProperty(Property.MAX_HEIGHT);
+                                    rows[targetOverflowRowIndex[col]][col] = originalCell;
                                 }
                                 else {
                                     childRenderers.Add(currentRow[col]);
@@ -688,15 +689,20 @@ public override LayoutResult Layout(LayoutContext layoutContext) {
                                     for (; i < row + minRowspan && i + 1 < rows.Count && splitResult[1].rows[i + 1 - row][col] != null; i++) {
                                         overflowRows.SetCell(i - row, col, splitResult[1].rows[i + 1 - row][col]);
                                         overflowRows.SetCell(i + 1 - row, col, null);
+                                        rows[i][col] = rows[i + 1][col];
+                                        rows[i + 1][col] = null;
                                     }
                                     // the number of cells behind is less then minRowspan-1
                                     // so we should process the last cell in the column as in the case 1 == minRowspan
                                     if (i != row + minRowspan - 1 && null != rows[i][col]) {
-                                        Cell overflowCell = ((Cell)rows[i][col].GetModelElement());
-                                        overflowRows.GetCell(i - row, col).isLastRendererForModelElement = false;
+                                        CellRenderer overflowCell = (CellRenderer)((Cell)rows[i][col].GetModelElement()).GetRenderer().SetParent(this
+                                            );
+                                        rows[i][col].isLastRendererForModelElement = false;
                                         overflowRows.SetCell(i - row, col, null);
-                                        overflowRows.SetCell(targetOverflowRowIndex[col] - row, col, (CellRenderer)overflowCell.GetRenderer().SetParent
-                                            (this));
+                                        overflowRows.SetCell(targetOverflowRowIndex[col] - row, col, overflowCell);
+                                        CellRenderer originalCell = rows[i][col];
+                                        rows[i][col] = null;
+                                        rows[targetOverflowRowIndex[col]][col] = originalCell;
                                     }
                                 }
                                 overflowRows.GetCell(targetOverflowRowIndex[col] - row, col).occupiedArea = cellOccupiedArea;

itext/itext.layout/itext/layout/renderer/TableRenderer.cs

@@ -1 +1 @@
-9b2dfd99f1a709dc3b4b5df17e0dc53dd9a536e2
+7731715cfcd4033907185060dbc786e00064517b