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

Author: IdamkinI

layout/src/main/java/com/itextpdf/layout/renderer/TableRenderer.java

@@ -667,32 +667,38 @@ public 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 = currentRow[col].getModelElement().clone(true); // we will change properties
-                                CellRenderer originalCellRenderer = currentRow[col];
+                                CellRenderer overflowCell = (CellRenderer) currentRow[col].getModelElement().clone(true).getRenderer(); // we will change properties
+                                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.get(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.get(targetOverflowRowIndex[col])[col] = originalCell;
                             } else {
                                 childRenderers.add(currentRow[col]);
                                 // shift all cells in the column up
                                 int i = row;
                                 for (; i < row + minRowspan && i + 1 < rows.size() && splitResult[1].rows.get(i + 1 - row)[col] != null; i++) {
                                     overflowRows.setCell(i - row, col, splitResult[1].rows.get(i + 1 - row)[col]);
                                     overflowRows.setCell(i + 1 - row, col, null);
+                                    rows.get(i)[col] = rows.get(i + 1)[col];
+                                    rows.get(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.get(i)[col]) {
-                                    Cell overflowCell = rows.get(i)[col].getModelElement();
-                                    overflowRows.getCell(i - row, col).isLastRendererForModelElement = false;
+                                    CellRenderer overflowCell = (CellRenderer) rows.get(i)[col].getModelElement().getRenderer().setParent(this);
+                                    rows.get(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.get(i)[col];
+                                    rows.get(i)[col] = null;
+                                    rows.get(targetOverflowRowIndex[col])[col] = originalCell;
                                 }
                             }
                             overflowRows.getCell(targetOverflowRowIndex[col] - row, col).occupiedArea = cellOccupiedArea;

layout/src/test/java/com/itextpdf/layout/TableBorderTest.java

@@ -1446,10 +1446,10 @@ public void tableWithHeaderFooterTest16() throws IOException, InterruptedExcepti
         Assert.assertNull(new CompareTool().compareByContent(outFileName, cmpFileName, destinationFolder, testName + "_diff"));
     }
 
-    @Ignore("DEVSIX-1320")
     @Test
-    public void tableWithHeaderFooterTest17() throws IOException, InterruptedException {
-        String testName = "tableWithHeaderFooterTest17.pdf";
+    @LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA)})
+    public void splitRowspanKeepTogetherTest() throws IOException, InterruptedException {
+        String testName = "splitRowspanKeepTogetherTest.pdf";
         String outFileName = destinationFolder + testName;
         String cmpFileName = sourceFolder + "cmp_" + testName;