try to make CommentsTable more extensible

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

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 0223f609265f209ff74d6391562e6f1282f87dd3..494fa98a9e0ed73d52ea7a71abde7c079c244907 100644 (file)
--- 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
@@ -16,8 +16,8 @@
 ==================================================================== */
 package org.apache.poi.xssf.model;
 
+import org.apache.poi.ss.usermodel.ClientAnchor;
 import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFComment;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 
@@ -84,7 +84,7 @@ public interface Comments {
      * @return new XSSFComment
      * @since POI 5.2.0
      */
-    XSSFComment createNewComment(XSSFSheet sheet, XSSFClientAnchor clientAnchor);
+    XSSFComment createNewComment(XSSFSheet 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 9b3a2f888bfcdad3b56d6f6cd4d8c9d1e164410e..816533e9073d52e9d242212d3799333832a817a2 100644 (file)
--- 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
@@ -27,6 +27,7 @@ import java.util.Map;
 
 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.util.CellAddress;
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.Removal;
@@ -256,10 +257,10 @@ public class CommentsTable extends POIXMLDocumentPart implements Comments {
      * @since POI 5.2.0
      */
     @Override
-    public XSSFComment createNewComment(XSSFSheet sheet, XSSFClientAnchor clientAnchor) {
+    public XSSFComment createNewComment(XSSFSheet sheet, ClientAnchor clientAnchor) {
         XSSFVMLDrawing vml = sheet.getVMLDrawing(true);
         com.microsoft.schemas.vml.CTShape vmlShape = vml.newCommentShape();
-        if (clientAnchor.isSet()) {
+        if (clientAnchor instanceof XSSFClientAnchor && ((XSSFClientAnchor)clientAnchor).isSet()) {
             // convert offsets from emus to pixels since we get a
             // DrawingML-anchor
             // but create a VML Drawing