From 2514bb16c682679485dfb5298e1a5797b97bdcd7 Mon Sep 17 00:00:00 2001 From: xuri Date: Tue, 10 Nov 2020 23:48:09 +0800 Subject: Fix #724, standardize variable naming and update unit tests --- shape.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'shape.go') diff --git a/shape.go b/shape.go index 2600e90..2cc72ab 100644 --- a/shape.go +++ b/shape.go @@ -261,7 +261,7 @@ func (f *File) AddShape(sheet, cell, format string) error { return err } // Read sheet data. - xlsx, err := f.workSheetReader(sheet) + ws, err := f.workSheetReader(sheet) if err != nil { return err } @@ -270,9 +270,9 @@ func (f *File) AddShape(sheet, cell, format string) error { drawingXML := "xl/drawings/drawing" + strconv.Itoa(drawingID) + ".xml" sheetRelationshipsDrawingXML := "../drawings/drawing" + strconv.Itoa(drawingID) + ".xml" - if xlsx.Drawing != nil { + if ws.Drawing != nil { // The worksheet already has a shape or chart relationships, use the relationships drawing ../drawings/drawing%d.xml. - sheetRelationshipsDrawingXML = f.getSheetRelationshipsTargetByID(sheet, xlsx.Drawing.RID) + sheetRelationshipsDrawingXML = f.getSheetRelationshipsTargetByID(sheet, ws.Drawing.RID) drawingID, _ = strconv.Atoi(strings.TrimSuffix(strings.TrimPrefix(sheetRelationshipsDrawingXML, "../drawings/drawing"), ".xml")) drawingXML = strings.Replace(sheetRelationshipsDrawingXML, "..", "xl", -1) } else { -- cgit v1.2.1