From 88de2f8d510b0959bbb672b80656d207bd0bc927 Mon Sep 17 00:00:00 2001 From: xuri Date: Sat, 22 Aug 2020 18:58:43 +0800 Subject: Default row height compatibility with Apache OpenOffice and Kingsoft WPS, unit test update and typo fixed --- drawing.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'drawing.go') diff --git a/drawing.go b/drawing.go index ced747d..806c1b7 100644 --- a/drawing.go +++ b/drawing.go @@ -59,10 +59,10 @@ func (f *File) prepareChartSheetDrawing(xlsx *xlsxChartsheet, drawingID int, she func (f *File) addChart(formatSet *formatChart, comboCharts []*formatChart) { count := f.countCharts() xlsxChartSpace := xlsxChartSpace{ - XMLNSc: NameSpaceDrawingMLChart, - XMLNSa: NameSpaceDrawingML, + XMLNSc: NameSpaceDrawingMLChart.Value, + XMLNSa: NameSpaceDrawingML.Value, XMLNSr: SourceRelationship.Value, - XMLNSc16r2: SourceRelationshipChart201506, + XMLNSc16r2: SourceRelationshipChart201506.Value, Date1904: &attrValBool{Val: boolPtr(false)}, Lang: &attrValString{Val: stringPtr("en-US")}, RoundedCorners: &attrValBool{Val: boolPtr(false)}, @@ -1143,8 +1143,8 @@ func (f *File) drawingParser(path string) (*xlsxWsDr, int) { if f.Drawings[path] == nil { content := xlsxWsDr{} - content.A = NameSpaceDrawingML - content.Xdr = NameSpaceDrawingMLSpreadSheet + content.A = NameSpaceDrawingML.Value + content.Xdr = NameSpaceDrawingMLSpreadSheet.Value if _, ok = f.XLSX[path]; ok { // Append Model decodeWsDr := decodeWsDr{} if err = f.xmlNewDecoder(bytes.NewReader(namespaceStrictToTransitional(f.readXML(path)))). @@ -1210,9 +1210,9 @@ func (f *File) addDrawingChart(sheet, drawingXML, cell string, width, height, rI }, Graphic: &xlsxGraphic{ GraphicData: &xlsxGraphicData{ - URI: NameSpaceDrawingMLChart, + URI: NameSpaceDrawingMLChart.Value, Chart: &xlsxChart{ - C: NameSpaceDrawingMLChart, + C: NameSpaceDrawingMLChart.Value, R: SourceRelationship.Value, RID: "rId" + strconv.Itoa(rID), }, @@ -1250,9 +1250,9 @@ func (f *File) addSheetDrawingChart(drawingXML string, rID int, formatSet *forma }, Graphic: &xlsxGraphic{ GraphicData: &xlsxGraphicData{ - URI: NameSpaceDrawingMLChart, + URI: NameSpaceDrawingMLChart.Value, Chart: &xlsxChart{ - C: NameSpaceDrawingMLChart, + C: NameSpaceDrawingMLChart.Value, R: SourceRelationship.Value, RID: "rId" + strconv.Itoa(rID), }, -- cgit v1.2.1