This closes qax-os#1789, delete VML shape on delete comment (qax-os#1790

) - Improve delete cell comment shape compatibility with KingSoft WPS - Update unit test
go-chinese-site · Jan 24, 2024 · 9b07898 · 9b07898
1 parent 5399572
commit 9b07898
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 68 deletions.
diff --git a/vml.go b/vml.go
@@ -130,13 +130,14 @@ func (f *File) AddComment(sheet string, opts Comment) error {
 //
 //	err := f.DeleteComment("Sheet1", "A30")
 func (f *File) DeleteComment(sheet, cell string) error {
-	if err := checkSheetName(sheet); err != nil {
+	ws, err := f.workSheetReader(sheet)
+	if err != nil {
 		return err
 	}
-	sheetXMLPath, ok := f.getSheetXMLPath(sheet)
-	if !ok {
-		return ErrSheetNotExist{sheet}
+	if ws.LegacyDrawing == nil {
+		return err
 	}
+	sheetXMLPath, _ := f.getSheetXMLPath(sheet)
 	commentsXML := f.getSheetComments(filepath.Base(sheetXMLPath))
 	if !strings.HasPrefix(commentsXML, "/") {
 		commentsXML = "xl" + strings.TrimPrefix(commentsXML, "..")
@@ -164,6 +165,82 @@ func (f *File) DeleteComment(sheet, cell string) error {
 		}
 		f.Comments[commentsXML] = cmts
 	}
+	sheetRelationshipsDrawingVML := f.getSheetRelationshipsTargetByID(sheet, ws.LegacyDrawing.RID)
+	return f.deleteFormControl(sheetRelationshipsDrawingVML, cell, true)
+}
+
+// deleteFormControl provides the method to delete shape from
+// xl/drawings/vmlDrawing%d.xml by giving path, cell and shape type.
+func (f *File) deleteFormControl(sheetRelationshipsDrawingVML, cell string, isComment bool) error {
+	col, row, err := CellNameToCoordinates(cell)
+	if err != nil {
+		return err
+	}
+	vmlID, _ := strconv.Atoi(strings.TrimSuffix(strings.TrimPrefix(sheetRelationshipsDrawingVML, "../drawings/vmlDrawing"), ".vml"))
+	drawingVML := strings.ReplaceAll(sheetRelationshipsDrawingVML, "..", "xl")
+	vml := f.VMLDrawing[drawingVML]
+	if vml == nil {
+		vml = &vmlDrawing{
+			XMLNSv:  "urn:schemas-microsoft-com:vml",
+			XMLNSo:  "urn:schemas-microsoft-com:office:office",
+			XMLNSx:  "urn:schemas-microsoft-com:office:excel",
+			XMLNSmv: "http://macVmlSchemaUri",
+			ShapeLayout: &xlsxShapeLayout{
+				Ext: "edit", IDmap: &xlsxIDmap{Ext: "edit", Data: vmlID},
+			},
+			ShapeType: &xlsxShapeType{
+				Stroke: &xlsxStroke{JoinStyle: "miter"},
+				VPath:  &vPath{GradientShapeOK: "t", ConnectType: "rect"},
+			},
+		}
+		// Load exist VML shapes from xl/drawings/vmlDrawing%d.vml
+		d, err := f.decodeVMLDrawingReader(drawingVML)
+		if err != nil {
+			return err
+		}
+		if d != nil {
+			vml.ShapeType.ID = d.ShapeType.ID
+			vml.ShapeType.CoordSize = d.ShapeType.CoordSize
+			vml.ShapeType.Spt = d.ShapeType.Spt
+			vml.ShapeType.Path = d.ShapeType.Path
+			for _, v := range d.Shape {
+				s := xlsxShape{
+					ID:          v.ID,
+					Type:        v.Type,
+					Style:       v.Style,
+					Button:      v.Button,
+					Filled:      v.Filled,
+					FillColor:   v.FillColor,
+					InsetMode:   v.InsetMode,
+					Stroked:     v.Stroked,
+					StrokeColor: v.StrokeColor,
+					Val:         v.Val,
+				}
+				vml.Shape = append(vml.Shape, s)
+			}
+		}
+	}
+	cond := func(objectType string) bool {
+		if isComment {
+			return objectType == "Note"
+		}
+		return objectType != "Note"
+	}
+	for i, sp := range vml.Shape {
+		var shapeVal decodeShapeVal
+		if err = xml.Unmarshal([]byte(fmt.Sprintf("<shape>%s</shape>", sp.Val)), &shapeVal); err == nil &&
+			cond(shapeVal.ClientData.ObjectType) && shapeVal.ClientData.Anchor != "" {
+			leftCol, topRow, err := extractAnchorCell(shapeVal.ClientData.Anchor)
+			if err != nil {
+				return err
+			}
+			if leftCol == col-1 && topRow == row-1 {
+				vml.Shape = append(vml.Shape[:i], vml.Shape[i+1:]...)
+				break
+			}
+		}
+	}
+	f.VMLDrawing[drawingVML] = vml
 	return err
 }
 
@@ -375,74 +452,11 @@ func (f *File) DeleteFormControl(sheet, cell string) error {
 	if err != nil {
 		return err
 	}
-	col, row, err := CellNameToCoordinates(cell)
-	if err != nil {
-		return err
-	}
 	if ws.LegacyDrawing == nil {
 		return err
 	}
 	sheetRelationshipsDrawingVML := f.getSheetRelationshipsTargetByID(sheet, ws.LegacyDrawing.RID)
-	vmlID, _ := strconv.Atoi(strings.TrimSuffix(strings.TrimPrefix(sheetRelationshipsDrawingVML, "../drawings/vmlDrawing"), ".vml"))
-	drawingVML := strings.ReplaceAll(sheetRelationshipsDrawingVML, "..", "xl")
-	vml := f.VMLDrawing[drawingVML]
-	if vml == nil {
-		vml = &vmlDrawing{
-			XMLNSv:  "urn:schemas-microsoft-com:vml",
-			XMLNSo:  "urn:schemas-microsoft-com:office:office",
-			XMLNSx:  "urn:schemas-microsoft-com:office:excel",
-			XMLNSmv: "http://macVmlSchemaUri",
-			ShapeLayout: &xlsxShapeLayout{
-				Ext: "edit", IDmap: &xlsxIDmap{Ext: "edit", Data: vmlID},
-			},
-			ShapeType: &xlsxShapeType{
-				Stroke: &xlsxStroke{JoinStyle: "miter"},
-				VPath:  &vPath{GradientShapeOK: "t", ConnectType: "rect"},
-			},
-		}
-		// Load exist VML shapes from xl/drawings/vmlDrawing%d.vml
-		d, err := f.decodeVMLDrawingReader(drawingVML)
-		if err != nil {
-			return err
-		}
-		if d != nil {
-			vml.ShapeType.ID = d.ShapeType.ID
-			vml.ShapeType.CoordSize = d.ShapeType.CoordSize
-			vml.ShapeType.Spt = d.ShapeType.Spt
-			vml.ShapeType.Path = d.ShapeType.Path
-			for _, v := range d.Shape {
-				s := xlsxShape{
-					ID:          v.ID,
-					Type:        v.Type,
-					Style:       v.Style,
-					Button:      v.Button,
-					Filled:      v.Filled,
-					FillColor:   v.FillColor,
-					InsetMode:   v.InsetMode,
-					Stroked:     v.Stroked,
-					StrokeColor: v.StrokeColor,
-					Val:         v.Val,
-				}
-				vml.Shape = append(vml.Shape, s)
-			}
-		}
-	}
-	for i, sp := range vml.Shape {
-		var shapeVal decodeShapeVal
-		if err = xml.Unmarshal([]byte(fmt.Sprintf("<shape>%s</shape>", sp.Val)), &shapeVal); err == nil &&
-			shapeVal.ClientData.ObjectType != "Note" && shapeVal.ClientData.Anchor != "" {
-			leftCol, topRow, err := extractAnchorCell(shapeVal.ClientData.Anchor)
-			if err != nil {
-				return err
-			}
-			if leftCol == col-1 && topRow == row-1 {
-				vml.Shape = append(vml.Shape[:i], vml.Shape[i+1:]...)
-				break
-			}
-		}
-	}
-	f.VMLDrawing[drawingVML] = vml
-	return err
+	return f.deleteFormControl(sheetRelationshipsDrawingVML, cell, false)
 }
 
 // countVMLDrawing provides a function to get VML drawing files count storage

diff --git a/vml_test.go b/vml_test.go
@@ -122,6 +122,10 @@ func TestDeleteComment(t *testing.T) {
 	f.Comments["xl/comments2.xml"] = nil
 	f.Pkg.Store("xl/comments2.xml", MacintoshCyrillicCharset)
 	assert.EqualError(t, f.DeleteComment("Sheet2", "A41"), "XML syntax error on line 1: invalid UTF-8")
+
+	f = NewFile()
+	// Test delete comment on a no comments worksheet
+	assert.NoError(t, f.DeleteComment("Sheet1", "A1"))
 }
 
 func TestDecodeVMLDrawingReader(t *testing.T) {