diff options
author | Eng Zer Jun <engzerjun@gmail.com> | 2022-06-12 00:19:12 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-12 00:19:12 +0800 |
commit | 6bcf5e4ede160af2ad04f5e69636211a5ced132d (patch) | |
tree | 836568f4c83f24d87acbd26f172f967c7a6a1118 /shape.go | |
parent | f5d3d59d8c65d9396893ae0156fef21592f6f425 (diff) |
refactor: replace strings.Replace with strings.ReplaceAll (#1250)
strings.ReplaceAll(s, old, new) is a wrapper function for
strings.Replace(s, old, new, -1). But strings.ReplaceAll is more
readable and removes the hardcoded -1.
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Diffstat (limited to 'shape.go')
-rw-r--r-- | shape.go | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -297,7 +297,7 @@ func (f *File) AddShape(sheet, cell, format string) error { // The worksheet already has a shape or chart relationships, use the relationships drawing ../drawings/drawing%d.xml. sheetRelationshipsDrawingXML = f.getSheetRelationshipsTargetByID(sheet, ws.Drawing.RID) drawingID, _ = strconv.Atoi(strings.TrimSuffix(strings.TrimPrefix(sheetRelationshipsDrawingXML, "../drawings/drawing"), ".xml")) - drawingXML = strings.Replace(sheetRelationshipsDrawingXML, "..", "xl", -1) + drawingXML = strings.ReplaceAll(sheetRelationshipsDrawingXML, "..", "xl") } else { // Add first shape for given sheet. sheetRels := "xl/worksheets/_rels/" + strings.TrimPrefix(f.sheetMap[trimSheetName(sheet)], "xl/worksheets/") + ".rels" @@ -448,7 +448,7 @@ func (f *File) addDrawingShape(sheet, drawingXML, cell string, formatSet *format Lang: "en-US", }, } - srgbClr := strings.Replace(strings.ToUpper(p.Font.Color), "#", "", -1) + srgbClr := strings.ReplaceAll(strings.ToUpper(p.Font.Color), "#", "") if len(srgbClr) == 6 { paragraph.R.RPr.SolidFill = &aSolidFill{ SrgbClr: &attrValString{ @@ -484,7 +484,7 @@ func setShapeRef(color string, i int) *aRef { return &aRef{ Idx: i, SrgbClr: &attrValString{ - Val: stringPtr(strings.Replace(strings.ToUpper(color), "#", "", -1)), + Val: stringPtr(strings.ReplaceAll(strings.ToUpper(color), "#", "")), }, } } |