From 3f89c6e9799c9c82af1305f080416c53d19e64c1 Mon Sep 17 00:00:00 2001 From: xuri Date: Sun, 29 Mar 2020 18:44:24 +0800 Subject: remove ineffectual variable assignments and simplify code --- excelize.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'excelize.go') diff --git a/excelize.go b/excelize.go index 3dd4311..520cbb7 100644 --- a/excelize.go +++ b/excelize.go @@ -156,6 +156,10 @@ func (f *File) workSheetReader(sheet string) (xlsx *xlsxWorksheet, err error) { return } if xlsx = f.Sheet[name]; f.Sheet[name] == nil { + if strings.HasPrefix(name, "xl/chartsheets") { + err = fmt.Errorf("sheet %s is chart sheet", sheet) + return + } xlsx = new(xlsxWorksheet) if err = f.xmlNewDecoder(bytes.NewReader(namespaceStrictToTransitional(f.readXML(name)))). Decode(xlsx); err != nil && err != io.EOF { @@ -227,9 +231,9 @@ func (f *File) addRels(relPath, relType, target, targetMode string) int { return rID } -// replaceWorkSheetsRelationshipsNameSpaceBytes provides a function to replace +// replaceRelationshipsNameSpaceBytes provides a function to replace // XML tags to self-closing for compatible Microsoft Office Excel 2007. -func replaceWorkSheetsRelationshipsNameSpaceBytes(contentMarshal []byte) []byte { +func replaceRelationshipsNameSpaceBytes(contentMarshal []byte) []byte { var oldXmlns = []byte(` xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">`) var newXmlns = []byte(templateNamespaceIDMap) contentMarshal = bytes.Replace(contentMarshal, oldXmlns, newXmlns, -1) -- cgit v1.2.1