From: Alain Béarez <abearez@apache.org>
Date: Thu, 28 Nov 2019 00:51:43 +0000 (+0000)
Subject: Fix addition and removal of columns in XSLTTable
X-Git-Tag: REL_4_1_2~124
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=da5d7d44d5a307233beaafcf063268294e89d33b;p=poi.git

Fix addition and removal of columns in XSLTTable

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1870523 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
index de0ff27bef..c5260109cd 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
@@ -179,6 +179,9 @@ public class XSLFTable extends XSLFGraphicFrame implements Iterable<XSLFTableRow
         long width = _table.getTblGrid().getGridColArray(_table.getTblGrid().sizeOfGridColArray() - 1).getW();
         CTTableCol col = _table.getTblGrid().addNewGridCol();
         col.setW(width);
+        for(CTTableRow row : _table.getTrList()) {
+            row.addNewTc();
+        }
         updateRowColIndexes();
     }
 
@@ -194,6 +197,9 @@ public class XSLFTable extends XSLFGraphicFrame implements Iterable<XSLFTableRow
         long width = _table.getTblGrid().getGridColArray(colIdx).getW();
         CTTableCol col = _table.getTblGrid().insertNewGridCol(colIdx);
         col.setW(width);
+        for(CTTableRow row : _table.getTrList()) {
+            row.insertNewTc(colIdx);
+        }
         updateRowColIndexes();
     }
 
@@ -204,6 +210,9 @@ public class XSLFTable extends XSLFGraphicFrame implements Iterable<XSLFTableRow
      */
     public void removeColumn(int colIdx) {
         _table.getTblGrid().removeGridCol(colIdx);
+        for(CTTableRow row : _table.getTrList()) {
+            row.removeTc(colIdx);
+        }
         updateRowColIndexes();
     }
 
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
index d993b70b90..ce4352f405 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
@@ -71,6 +71,7 @@ public class TestXSLFTable {
             tab.insertColumn(0);
             assertEquals(tab.getColumnWidth(1), tab.getColumnWidth(0), 0.00001);
             tab.addColumn();
+            tab.getCell(0, data[0].length + 1);
             assertEquals(tab.getColumnWidth(tab.getNumberOfColumns() - 2), tab.getColumnWidth(tab.getNumberOfColumns() - 1), 0.00001);
             tab.removeColumn(0);
             tab.removeColumn(tab.getNumberOfColumns() - 1);