commit 62d8b8df57fc7768036e770c2be8112a15f40e35
author PJ Fanning <fanningpj@apache.org> Sat Aug 13 16:11:03 2022 +0000
committer PJ Fanning <fanningpj@apache.org> Sat Aug 13 16:11:03 2022 +0000
tree 49130f9d3d875e2a2e77980b0f6d7de14a0b3c76
parent 839594b73e201df99850dc07ab726893bf36d156

[bug-66212] try to remove table part for table when removing table

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

poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 1459bc8..3e19fe2 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -4312,10 +4312,16 @@
             removeRelation(getRelationById(toDelete.getKey()), true);
             tables.remove(toDelete.getKey());
             toDelete.getValue().onTableDelete();
-            OPCPackage opcPackage = getWorkbook().getPackage();
-            PackagePart packagePart = t.getPackagePart();
-            if (packagePart != null && opcPackage.containPart(packagePart.getPartName())) {
-                opcPackage.removePart(packagePart);
+            CTTableParts tblParts = worksheet.getTableParts();
+            int matchedPos = -1;
+            for (int i = 0; i < tblParts.sizeOfTablePartArray(); i++) {
+                if (toDelete.getKey().equals(tblParts.getTablePartArray(i).getId())) {
+                    matchedPos = i;
+                    break;
+                }
+            }
+            if (matchedPos != -1) {
+                tblParts.removeTablePart(matchedPos);
             }
         }
     }

poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java

diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
index 20aa24b..254f476 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
@@ -45,6 +45,7 @@
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTable;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableStyleInfo;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
 
 public final class TestXSSFTable {
 
@@ -726,4 +727,15 @@
             assertEquals(cols.get(4).getName(), updatedCols.get(4).getName());
         }
     }
+
+    @Test
+    void bug66212() throws IOException {
+        try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("table-sample.xlsx")) {
+            XSSFTable table = wb.getTable("Tabelle1");
+            XSSFSheet sheet = table.getXSSFSheet();
+            assertEquals(1, sheet.getCTWorksheet().getTableParts().sizeOfTablePartArray());
+            sheet.removeTable(table);
+            assertEquals(0, sheet.getCTWorksheet().getTableParts().sizeOfTablePartArray());
+        }
+    }
 }