From 910724058c7e7c4a069a28857a42ee659676e494 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Fri, 19 Nov 2021 18:09:57 +0000
Subject: [PATCH] try to make CommentsTable more extensible

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1895182 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/poi/xssf/model/Comments.java   |  6 +++---
 .../org/apache/poi/xssf/model/CommentsTable.java   | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java
index 494fa98a9e..7e8929e2da 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java
@@ -17,9 +17,9 @@
 package org.apache.poi.xssf.model;
 
 import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellAddress;
 import org.apache.poi.xssf.usermodel.XSSFComment;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
 
 import java.util.Iterator;
 
@@ -54,7 +54,7 @@ public interface Comments {
      * @return cell comment if one exists, otherwise returns null
      * @since POI 5.2.0
      */
-    public XSSFComment findCellComment(XSSFSheet sheet, CellAddress cellAddress);
+    public XSSFComment findCellComment(Sheet sheet, CellAddress cellAddress);
 
     /**
      * Remove the comment at cellRef location, if one exists
@@ -84,7 +84,7 @@ public interface Comments {
      * @return new XSSFComment
      * @since POI 5.2.0
      */
-    XSSFComment createNewComment(XSSFSheet sheet, ClientAnchor clientAnchor);
+    XSSFComment createNewComment(Sheet sheet, ClientAnchor clientAnchor);
 
     /**
      * Called after the reference is updated, so that
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
index 816533e907..dcb35e7643 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
@@ -25,9 +25,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import com.microsoft.schemas.vml.CTShape;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellAddress;
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.Removal;
@@ -212,13 +214,13 @@ public class CommentsTable extends POIXMLDocumentPart implements Comments {
      * @since POI 5.2.0
      */
     @Override
-    public XSSFComment findCellComment(XSSFSheet sheet, CellAddress cellAddress) {
+    public XSSFComment findCellComment(Sheet sheet, CellAddress cellAddress) {
         CTComment ctComment = getCTComment(cellAddress);
         if(ctComment == null) {
             return null;
         }
 
-        XSSFVMLDrawing vml = sheet.getVMLDrawing(false);
+        XSSFVMLDrawing vml = sheet instanceof XSSFSheet ? ((XSSFSheet)sheet).getVMLDrawing(false) : null;
         return new XSSFComment(this, ctComment,
                 vml == null ? null : vml.findCommentShape(cellAddress.getRow(), cellAddress.getColumn()));
     }
@@ -257,10 +259,10 @@ public class CommentsTable extends POIXMLDocumentPart implements Comments {
      * @since POI 5.2.0
      */
     @Override
-    public XSSFComment createNewComment(XSSFSheet sheet, ClientAnchor clientAnchor) {
-        XSSFVMLDrawing vml = sheet.getVMLDrawing(true);
-        com.microsoft.schemas.vml.CTShape vmlShape = vml.newCommentShape();
-        if (clientAnchor instanceof XSSFClientAnchor && ((XSSFClientAnchor)clientAnchor).isSet()) {
+    public XSSFComment createNewComment(Sheet sheet, ClientAnchor clientAnchor) {
+        XSSFVMLDrawing vml = sheet instanceof XSSFSheet ? ((XSSFSheet)sheet).getVMLDrawing(true) : null;
+        CTShape vmlShape = vml == null ? null : vml.newCommentShape();
+        if (vmlShape != null && clientAnchor instanceof XSSFClientAnchor && ((XSSFClientAnchor)clientAnchor).isSet()) {
             // convert offsets from emus to pixels since we get a
             // DrawingML-anchor
             // but create a VML Drawing
-- 
2.39.5