Skip to content

Commit 6e90fa6

Browse files
authored
Replace bytes.NewReader(stringToBytes(s)) with strings.NewReader(s) (qax-os#610)
1 parent 66d0272 commit 6e90fa6

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

drawing.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ func (f *File) deleteDrawing(col, row int, drawingXML, drawingType string) (err
12881288
}
12891289
for idx := 0; idx < len(wsDr.TwoCellAnchor); idx++ {
12901290
deTwoCellAnchor = new(decodeTwoCellAnchor)
1291-
if err = f.xmlNewDecoder(bytes.NewReader(stringToBytes("<decodeTwoCellAnchor>" + wsDr.TwoCellAnchor[idx].GraphicFrame + "</decodeTwoCellAnchor>"))).
1291+
if err = f.xmlNewDecoder(strings.NewReader("<decodeTwoCellAnchor>" + wsDr.TwoCellAnchor[idx].GraphicFrame + "</decodeTwoCellAnchor>")).
12921292
Decode(deTwoCellAnchor); err != nil && err != io.EOF {
12931293
err = fmt.Errorf("xml decode error: %s", err)
12941294
return

picture.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ func (f *File) getPicture(row, col int, drawingXML, drawingRelationships string)
512512
err = nil
513513
for _, anchor := range deWsDr.TwoCellAnchor {
514514
deTwoCellAnchor = new(decodeTwoCellAnchor)
515-
if err = f.xmlNewDecoder(bytes.NewReader(stringToBytes("<decodeTwoCellAnchor>" + anchor.Content + "</decodeTwoCellAnchor>"))).
515+
if err = f.xmlNewDecoder(strings.NewReader("<decodeTwoCellAnchor>" + anchor.Content + "</decodeTwoCellAnchor>")).
516516
Decode(deTwoCellAnchor); err != nil && err != io.EOF {
517517
err = fmt.Errorf("xml decode error: %s", err)
518518
return

sparkline.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package excelize
1111

1212
import (
13-
"bytes"
1413
"encoding/xml"
1514
"errors"
1615
"io"
@@ -509,14 +508,14 @@ func (f *File) appendSparkline(ws *xlsxWorksheet, group *xlsxX14SparklineGroup,
509508
sparklineGroupsBytes, sparklineGroupBytes, extLstBytes []byte
510509
)
511510
decodeExtLst = new(decodeWorksheetExt)
512-
if err = f.xmlNewDecoder(bytes.NewReader([]byte("<extLst>" + ws.ExtLst.Ext + "</extLst>"))).
511+
if err = f.xmlNewDecoder(strings.NewReader("<extLst>" + ws.ExtLst.Ext + "</extLst>")).
513512
Decode(decodeExtLst); err != nil && err != io.EOF {
514513
return
515514
}
516515
for idx, ext = range decodeExtLst.Ext {
517516
if ext.URI == ExtURISparklineGroups {
518517
decodeSparklineGroups = new(decodeX14SparklineGroups)
519-
if err = f.xmlNewDecoder(bytes.NewReader(stringToBytes(ext.Content))).
518+
if err = f.xmlNewDecoder(strings.NewReader(ext.Content)).
520519
Decode(decodeSparklineGroups); err != nil && err != io.EOF {
521520
return
522521
}

0 commit comments

Comments
 (0)