summaryrefslogtreecommitdiff
path: root/shape.go
diff options
context:
space:
mode:
authorxuri <xuri.me@gmail.com>2020-11-10 23:48:09 +0800
committerxuri <xuri.me@gmail.com>2020-11-11 01:03:56 +0800
commit2514bb16c682679485dfb5298e1a5797b97bdcd7 (patch)
treea53f0e7de3fa76b6462e2016e9a734cbd46b3a42 /shape.go
parent5dd0b4aec2931079e064f1fb393b034ce4934540 (diff)
Fix #724, standardize variable naming and update unit tests
Diffstat (limited to 'shape.go')
-rw-r--r--shape.go6
1 files changed, 3 insertions, 3 deletions
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 {