浏览代码

Fix the issue caused by missing tradition to strict conversion for `sharedStringsReader()`, relate issue #276

xuri 7 年之前
父节点
当前提交
90bdd3632f
共有 3 个文件被更改,包括 3 次插入7 次删除
  1. 2 2
      comment.go
  2. 0 4
      excelize_test.go
  3. 1 1
      rows.go

+ 2 - 2
comment.go

@@ -182,7 +182,7 @@ func (f *File) addDrawingVML(commentID int, drawingVML, cell string, lineCount,
 	c, ok := f.XLSX[drawingVML]
 	if ok {
 		d := decodeVmlDrawing{}
-		_ = xml.Unmarshal([]byte(c), &d)
+		_ = xml.Unmarshal(namespaceStrictToTransitional(c), &d)
 		for _, v := range d.Shape {
 			s := xlsxShape{
 				ID:          "_x0000_s1025",
@@ -252,7 +252,7 @@ func (f *File) addComment(commentsXML, cell string, formatSet *formatComment) {
 	c, ok := f.XLSX[commentsXML]
 	if ok {
 		d := xlsxComments{}
-		_ = xml.Unmarshal([]byte(c), &d)
+		_ = xml.Unmarshal(namespaceStrictToTransitional(c), &d)
 		comments.CommentList.Comment = append(comments.CommentList.Comment, d.CommentList.Comment...)
 	}
 	comments.CommentList.Comment = append(comments.CommentList.Comment, cmt)

+ 0 - 4
excelize_test.go

@@ -135,10 +135,6 @@ func TestOpenFile(t *testing.T) {
 	if err != nil {
 		t.Log(err)
 	}
-	_, err = xlsx.WriteToBuffer()
-	if err != nil {
-		t.Error(err)
-	}
 }
 
 func TestAddPicture(t *testing.T) {

+ 1 - 1
rows.go

@@ -249,7 +249,7 @@ func (f *File) sharedStringsReader() *xlsxSST {
 		if len(ss) == 0 {
 			ss = f.readXML("xl/SharedStrings.xml")
 		}
-		_ = xml.Unmarshal([]byte(ss), &sharedStrings)
+		_ = xml.Unmarshal(namespaceStrictToTransitional(ss), &sharedStrings)
 		f.SharedStrings = &sharedStrings
 	}
 	return f.SharedStrings