[bug-65120] PartAlreadyExistsException when creating cell comments (after some comments removed). Thanks to Raúl Wegmann

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

2 files changed, 28 insertions, 3 deletions

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index b93f165885..cdc404b028 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -601,8 +601,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet  {
         CTLegacyDrawing ctDrawing = getCTLegacyDrawing();
         if(ctDrawing == null) {
             if(autoCreate) {
-                //drawingNumber = #drawings.size() + 1
-                int drawingNumber = getPackagePart().getPackage().getPartsByContentType(XSSFRelation.VML_DRAWINGS.getContentType()).size() + 1;
+                int drawingNumber = getNextPartNumber(XSSFRelation.VML_DRAWINGS,
+                        getPackagePart().getPackage().getPartsByContentType(XSSFRelation.VML_DRAWINGS.getContentType()).size());
                 RelationPart rp = createRelationship(XSSFRelation.VML_DRAWINGS, XSSFFactory.getInstance(), drawingNumber, false);
                 drawing = rp.getDocumentPart();
                 String relId = rp.getRelationship().getId();
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
index 2071ca7962..1ca51d3dcc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
@@ -1887,7 +1887,7 @@ public final class TestXSSFSheet extends BaseTestXSheet {
      */
     @Test
     void testInsertCommentsToClonedSheet() throws IOException {
-    	try (Workbook wb = XSSFTestDataSamples.openSampleWorkbook("52425.xlsx")) {
+        try (Workbook wb = XSSFTestDataSamples.openSampleWorkbook("52425.xlsx")) {
             CreationHelper helper = wb.getCreationHelper();
             Sheet sheet2 = wb.createSheet("Sheet 2");
             Sheet sheet3 = wb.cloneSheet(0);
@@ -1995,4 +1995,29 @@ public final class TestXSSFSheet extends BaseTestXSheet {
             }
         }
     }
+
+    @Test
+    public void bug65120() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        CreationHelper creationHelper = wb.getCreationHelper();
+
+        Sheet sheet1 = wb.createSheet();
+        Cell cell1 = sheet1.createRow(0).createCell(0);
+        Comment comment1 = sheet1.createDrawingPatriarch().createCellComment(creationHelper.createClientAnchor());
+        cell1.setCellComment(comment1);
+
+        Sheet sheet2 = wb.createSheet();
+        Cell cell2 = sheet2.createRow(0).createCell(0);
+        Comment comment2 = sheet2.createDrawingPatriarch().createCellComment(creationHelper.createClientAnchor());
+        cell2.setCellComment(comment2);
+
+        wb.removeSheetAt(0);
+
+        Sheet sheet3 = wb.createSheet();
+        Cell cell3 = sheet3.createRow(0).createCell(0);
+        Comment comment3 = sheet3.createDrawingPatriarch().createCellComment(creationHelper.createClientAnchor());
+        cell3.setCellComment(comment3);
+
+        wb.close();
+    }
 }