added macro functionality to shape (qax-os#1182)

jenbonzhang · Apr 15, 2022 · 8a3cd6f · 8a3cd6f
1 parent af5ebde
commit 8a3cd6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/shape.go b/shape.go
@@ -32,7 +32,8 @@ func parseFormatShapeSet(formatSet string) (*formatShape, error) {
 			XScale:           1.0,
 			YScale:           1.0,
 		},
-		Line: formatLine{Width: 1},
+		Line:  formatLine{Width: 1},
+		Macro: "",
 	}
 	err := json.Unmarshal([]byte(formatSet), &format)
 	return &format, err
@@ -369,6 +370,7 @@ func (f *File) addDrawingShape(sheet, drawingXML, cell string, formatSet *format
 	twoCellAnchor.From = &from
 	twoCellAnchor.To = &to
 	shape := xdrSp{
+		Macro: formatSet.Macro,
 		NvSpPr: &xdrNvSpPr{
 			CNvPr: &xlsxCNvPr{
 				ID:   cNvPrID,

diff --git a/xmlDrawing.go b/xmlDrawing.go
@@ -477,6 +477,7 @@ type formatPicture struct {
 
 // formatShape directly maps the format settings of the shape.
 type formatShape struct {
+	Macro     string                 `json:"macro"`
 	Type      string                 `json:"type"`
 	Width     int                    `json:"width"`
 	Height    int                    `json:"height"`