diff options
| author | xuri <xuri.me@gmail.com> | 2020-08-22 18:58:43 +0800 |
|---|---|---|
| committer | xuri <xuri.me@gmail.com> | 2020-08-22 18:58:43 +0800 |
| commit | 88de2f8d510b0959bbb672b80656d207bd0bc927 (patch) | |
| tree | 2f7c37bffac4ecad92aaf253877667ce2348a843 /drawing.go | |
| parent | 3c8c8c55c8128c5bb94fe28451f58fbc5fb4a118 (diff) | |
Default row height compatibility with Apache OpenOffice and Kingsoft WPS, unit test update and typo fixed
Diffstat (limited to 'drawing.go')
| -rw-r--r-- | drawing.go | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -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), }, |