From c922c32fb7571d3d40d3244e5635142bc390a3db Mon Sep 17 00:00:00 2001 From: xuri Date: Sat, 18 Jul 2020 15:15:16 +0800 Subject: support parse and generate XML element namespace dynamic, fix #651 --- drawing.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drawing.go') diff --git a/drawing.go b/drawing.go index 5e5bba9..ced747d 100644 --- a/drawing.go +++ b/drawing.go @@ -47,6 +47,7 @@ func (f *File) prepareChartSheetDrawing(xlsx *xlsxChartsheet, drawingID int, she // Only allow one chart in a chartsheet. sheetRels := "xl/chartsheets/_rels/" + strings.TrimPrefix(f.sheetMap[trimSheetName(sheet)], "xl/chartsheets/") + ".rels" rID := f.addRels(sheetRels, SourceRelationshipDrawingML, sheetRelationshipsDrawingXML, "") + f.addSheetNameSpace(sheet, SourceRelationship) xlsx.Drawing = &xlsxDrawing{ RID: "rId" + strconv.Itoa(rID), } @@ -60,7 +61,7 @@ func (f *File) addChart(formatSet *formatChart, comboCharts []*formatChart) { xlsxChartSpace := xlsxChartSpace{ XMLNSc: NameSpaceDrawingMLChart, XMLNSa: NameSpaceDrawingML, - XMLNSr: SourceRelationship, + XMLNSr: SourceRelationship.Value, XMLNSc16r2: SourceRelationshipChart201506, Date1904: &attrValBool{Val: boolPtr(false)}, Lang: &attrValString{Val: stringPtr("en-US")}, @@ -1212,7 +1213,7 @@ func (f *File) addDrawingChart(sheet, drawingXML, cell string, width, height, rI URI: NameSpaceDrawingMLChart, Chart: &xlsxChart{ C: NameSpaceDrawingMLChart, - R: SourceRelationship, + R: SourceRelationship.Value, RID: "rId" + strconv.Itoa(rID), }, }, @@ -1252,7 +1253,7 @@ func (f *File) addSheetDrawingChart(drawingXML string, rID int, formatSet *forma URI: NameSpaceDrawingMLChart, Chart: &xlsxChart{ C: NameSpaceDrawingMLChart, - R: SourceRelationship, + R: SourceRelationship.Value, RID: "rId" + strconv.Itoa(rID), }, }, -- cgit v1.2.1