Default row height compatibility with Apache OpenOffice and Kingsoft WPS, unit test update and typo fixed

xuri · xuri · commit 88de2f8d510b · 2020-08-22T18:58:43.000+08:00
diff --git a/cell.go b/cell.go
@@ -517,7 +517,7 @@ func (f *File) SetCellHyperLink(sheet, axis, link, linkType string) error {
 //        }
 //        if err := f.SetCellRichText("Sheet1", "A1", []excelize.RichTextRun{
 //            {
-//                Text: "blod",
+//                Text: "bold",
 //                Font: &excelize.Font{
 //                    Bold:   true,
 //                    Color:  "2354e8",
diff --git a/cell_test.go b/cell_test.go
@@ -190,7 +190,7 @@ func TestSetCellRichText(t *testing.T) {
 	assert.NoError(t, f.SetColWidth("Sheet1", "A", "A", 44))
 	richTextRun := []RichTextRun{
 		{
-			Text: "blod",
+			Text: "bold",
 			Font: &Font{
 				Bold:   true,
 				Color:  "2354e8",
diff --git a/col.go b/col.go
@@ -25,6 +25,7 @@ import (
 // Define the default cell size and EMU unit of measurement.
 const (
 	defaultColWidthPixels  float64 = 64
+	defaultRowHeight       float64 = 15
 	defaultRowHeightPixels float64 = 20
 	EMU                    int     = 9525
 )
diff --git 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),
 				},
diff --git a/merge.go b/merge.go
@@ -97,6 +97,7 @@ func (f *File) MergeCell(sheet, hcell, vcell string) error {
 	} else {
 		xlsx.MergeCells = &xlsxMergeCells{Cells: []*xlsxMergeCell{{Ref: ref}}}
 	}
+	xlsx.MergeCells.Count = len(xlsx.MergeCells.Cells)
 	return err
 }
 
@@ -146,6 +147,7 @@ func (f *File) UnmergeCell(sheet string, hcell, vcell string) error {
 		i++
 	}
 	xlsx.MergeCells.Cells = xlsx.MergeCells.Cells[:i]
+	xlsx.MergeCells.Count = len(xlsx.MergeCells.Cells)
 	return nil
 }
 
diff --git a/rows.go b/rows.go
@@ -262,21 +262,24 @@ func (f *File) GetRowHeight(sheet string, row int) (float64, error) {
 	if row < 1 {
 		return defaultRowHeightPixels, newInvalidRowNumberError(row)
 	}
-
-	xlsx, err := f.workSheetReader(sheet)
+	var ht = defaultRowHeight
+	ws, err := f.workSheetReader(sheet)
 	if err != nil {
-		return defaultRowHeightPixels, err
+		return ht, err
 	}
-	if row > len(xlsx.SheetData.Row) {
-		return defaultRowHeightPixels, nil // it will be better to use 0, but we take care with BC
+	if ws.SheetFormatPr != nil {
+		ht = ws.SheetFormatPr.DefaultRowHeight
+	}
+	if row > len(ws.SheetData.Row) {
+		return ht, nil // it will be better to use 0, but we take care with BC
 	}
-	for _, v := range xlsx.SheetData.Row {
+	for _, v := range ws.SheetData.Row {
 		if v.R == row && v.Ht != 0 {
 			return v.Ht, nil
 		}
 	}
 	// Optimisation for when the row heights haven't changed.
-	return defaultRowHeightPixels, nil
+	return ht, nil
 }
 
 // sharedStringsReader provides a function to get the pointer to the structure
diff --git a/rows_test.go b/rows_test.go
@@ -112,12 +112,12 @@ func TestRowHeight(t *testing.T) {
 	// Test get row height that rows index over exists rows.
 	height, err = xlsx.GetRowHeight(sheet1, 5)
 	assert.NoError(t, err)
-	assert.Equal(t, defaultRowHeightPixels, height)
+	assert.Equal(t, defaultRowHeight, height)
 
 	// Test get row height that rows heights haven't changed.
 	height, err = xlsx.GetRowHeight(sheet1, 3)
 	assert.NoError(t, err)
-	assert.Equal(t, defaultRowHeightPixels, height)
+	assert.Equal(t, defaultRowHeight, height)
 
 	// Test set and get row height on not exists worksheet.
 	assert.EqualError(t, xlsx.SetRowHeight("SheetN", 1, 111.0), "sheet SheetN is not exist")
diff --git a/sheet.go b/sheet.go
@@ -1630,13 +1630,19 @@ func (f *File) relsReader(path string) *xlsxRelationships {
 func prepareSheetXML(xlsx *xlsxWorksheet, col int, row int) {
 	rowCount := len(xlsx.SheetData.Row)
 	sizeHint := 0
+	var ht float64
+	var customHeight bool
+	if xlsx.SheetFormatPr != nil {
+		ht = xlsx.SheetFormatPr.DefaultRowHeight
+		customHeight = true
+	}
 	if rowCount > 0 {
 		sizeHint = len(xlsx.SheetData.Row[rowCount-1].C)
 	}
 	if rowCount < row {
 		// append missing rows
 		for rowIdx := rowCount; rowIdx < row; rowIdx++ {
-			xlsx.SheetData.Row = append(xlsx.SheetData.Row, xlsxRow{R: rowIdx + 1, C: make([]xlsxC, 0, sizeHint)})
+			xlsx.SheetData.Row = append(xlsx.SheetData.Row, xlsxRow{R: rowIdx + 1, CustomHeight: customHeight, Ht: ht, C: make([]xlsxC, 0, sizeHint)})
 		}
 	}
 	rowData := &xlsx.SheetData.Row[row-1]
diff --git a/sparkline.go b/sparkline.go
@@ -441,7 +441,7 @@ func (f *File) AddSparkline(sheet string, opt *SparklineOption) (err error) {
 		}
 	} else {
 		groups = &xlsxX14SparklineGroups{
-			XMLNSXM:         NameSpaceSpreadSheetExcel2006Main,
+			XMLNSXM:         NameSpaceSpreadSheetExcel2006Main.Value,
 			SparklineGroups: []*xlsxX14SparklineGroup{group},
 		}
 		if sparklineGroupsBytes, err = xml.Marshal(groups); err != nil {
@@ -525,7 +525,7 @@ func (f *File) appendSparkline(ws *xlsxWorksheet, group *xlsxX14SparklineGroup,
 				return
 			}
 			groups = &xlsxX14SparklineGroups{
-				XMLNSXM: NameSpaceSpreadSheetExcel2006Main,
+				XMLNSXM: NameSpaceSpreadSheetExcel2006Main.Value,
 				Content: decodeSparklineGroups.Content + string(sparklineGroupBytes),
 			}
 			if sparklineGroupsBytes, err = xml.Marshal(groups); err != nil {
diff --git a/xmlDrawing.go b/xmlDrawing.go
@@ -13,12 +13,22 @@ package excelize
 
 import "encoding/xml"
 
-// Source relationship and namespace.
+// Source relationship and namespace list, associated prefixes and schema in which it was
+// introduced.
 var (
-	SourceRelationship              = xml.Attr{Name: xml.Name{Local: "r", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/officeDocument/2006/relationships"}
-	SourceRelationshipCompatibility = xml.Attr{Name: xml.Name{Local: "mc", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/markup-compatibility/2006"}
-	NameSpaceSpreadSheet            = xml.Attr{Name: xml.Name{Local: "xmlns"}, Value: "http://schemas.openxmlformats.org/spreadsheetml/2006/main"}
-	NameSpaceSpreadSheetX14         = xml.Attr{Name: xml.Name{Local: "x14", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"}
+	SourceRelationship                = xml.Attr{Name: xml.Name{Local: "r", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/officeDocument/2006/relationships"}
+	SourceRelationshipCompatibility   = xml.Attr{Name: xml.Name{Local: "mc", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/markup-compatibility/2006"}
+	SourceRelationshipChart20070802   = xml.Attr{Name: xml.Name{Local: "c14", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/drawing/2007/8/2/chart"}
+	SourceRelationshipChart2014       = xml.Attr{Name: xml.Name{Local: "c16", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/drawing/2014/chart"}
+	SourceRelationshipChart201506     = xml.Attr{Name: xml.Name{Local: "c16r2", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/drawing/2015/06/chart"}
+	NameSpaceSpreadSheet              = xml.Attr{Name: xml.Name{Local: "xmlns"}, Value: "http://schemas.openxmlformats.org/spreadsheetml/2006/main"}
+	NameSpaceSpreadSheetX14           = xml.Attr{Name: xml.Name{Local: "x14", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"}
+	NameSpaceDrawingML                = xml.Attr{Name: xml.Name{Local: "a", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/drawingml/2006/main"}
+	NameSpaceDrawingMLChart           = xml.Attr{Name: xml.Name{Local: "c", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/drawingml/2006/chart"}
+	NameSpaceDrawingMLSpreadSheet     = xml.Attr{Name: xml.Name{Local: "xdr", Space: "xmlns"}, Value: "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"}
+	NameSpaceSpreadSheetX15           = xml.Attr{Name: xml.Name{Local: "x15", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"}
+	NameSpaceSpreadSheetExcel2006Main = xml.Attr{Name: xml.Name{Local: "xne", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/excel/2006/main"}
+	NameSpaceMacExcel2008Main         = xml.Attr{Name: xml.Name{Local: "mx", Space: "xmlns"}, Value: "http://schemas.microsoft.com/office/mac/excel/2008/main"}
 )
 
 // Source relationship and namespace.
@@ -37,15 +47,6 @@ const (
 	SourceRelationshipPivotCache                 = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition"
 	SourceRelationshipSharedStrings              = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings"
 	SourceRelationshipVBAProject                 = "http://schemas.microsoft.com/office/2006/relationships/vbaProject"
-	SourceRelationshipChart201506                = "http://schemas.microsoft.com/office/drawing/2015/06/chart"
-	SourceRelationshipChart20070802              = "http://schemas.microsoft.com/office/drawing/2007/8/2/chart"
-	SourceRelationshipChart2014                  = "http://schemas.microsoft.com/office/drawing/2014/chart"
-	NameSpaceDrawingML                           = "http://schemas.openxmlformats.org/drawingml/2006/main"
-	NameSpaceDrawingMLChart                      = "http://schemas.openxmlformats.org/drawingml/2006/chart"
-	NameSpaceDrawingMLSpreadSheet                = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
-	NameSpaceSpreadSheetX15                      = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"
-	NameSpaceSpreadSheetExcel2006Main            = "http://schemas.microsoft.com/office/excel/2006/main"
-	NameSpaceMacExcel2008Main                    = "http://schemas.microsoft.com/office/mac/excel/2008/main"
 	NameSpaceXML                                 = "http://www.w3.org/XML/1998/namespace"
 	NameSpaceXMLSchemaInstance                   = "http://www.w3.org/2001/XMLSchema-instance"
 	StrictSourceRelationship                     = "http://purl.oclc.org/ooxml/officeDocument/relationships"

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ func TestSetCellRichText(t *testing.T) {`
`190`	`190`	`assert.NoError(t, f.SetColWidth("Sheet1", "A", "A", 44))`
`191`	`191`	`richTextRun := []RichTextRun{`
`192`	`192`	`{`
`193`		`- Text: "blod",`
	`193`	`+ Text: "bold",`
`194`	`194`	`Font: &Font{`
`195`	`195`	`Bold: true,`
`196`	`196`	`Color: "2354e8",`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`	`// Define the default cell size and EMU unit of measurement.`
`26`	`26`	`const (`
`27`	`27`	`defaultColWidthPixels float64 = 64`
	`28`	`+ defaultRowHeight float64 = 15`
`28`	`29`	`defaultRowHeightPixels float64 = 20`
`29`	`30`	`EMU int = 9525`
`30`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ func (f *File) MergeCell(sheet, hcell, vcell string) error {`
`97`	`97`	`} else {`
`98`	`98`	`xlsx.MergeCells = &xlsxMergeCells{Cells: []*xlsxMergeCell{{Ref: ref}}}`
`99`	`99`	`}`
	`100`	`+ xlsx.MergeCells.Count = len(xlsx.MergeCells.Cells)`
`100`	`101`	`return err`
`101`	`102`	`}`
`102`	`103`
`@@ -146,6 +147,7 @@ func (f *File) UnmergeCell(sheet string, hcell, vcell string) error {`
`146`	`147`	`i++`
`147`	`148`	`}`
`148`	`149`	`xlsx.MergeCells.Cells = xlsx.MergeCells.Cells[:i]`
	`150`	`+ xlsx.MergeCells.Count = len(xlsx.MergeCells.Cells)`
`149`	`151`	`return nil`
`150`	`152`	`}`
`151`	`153`
Original file line number	Diff line number	Diff line change
`@@ -262,21 +262,24 @@ func (f *File) GetRowHeight(sheet string, row int) (float64, error) {`
`262`	`262`	`if row < 1 {`
`263`	`263`	`return defaultRowHeightPixels, newInvalidRowNumberError(row)`
`264`	`264`	`}`
`265`		`-`
`266`		`- xlsx, err := f.workSheetReader(sheet)`
	`265`	`+ var ht = defaultRowHeight`
	`266`	`+ ws, err := f.workSheetReader(sheet)`
`267`	`267`	`if err != nil {`
`268`		`- return defaultRowHeightPixels, err`
	`268`	`+ return ht, err`
`269`	`269`	`}`
`270`		`- if row > len(xlsx.SheetData.Row) {`
`271`		`- return defaultRowHeightPixels, nil // it will be better to use 0, but we take care with BC`
	`270`	`+ if ws.SheetFormatPr != nil {`
	`271`	`+ ht = ws.SheetFormatPr.DefaultRowHeight`
	`272`	`+ }`
	`273`	`+ if row > len(ws.SheetData.Row) {`
	`274`	`+ return ht, nil // it will be better to use 0, but we take care with BC`
`272`	`275`	`}`
`273`		`- for _, v := range xlsx.SheetData.Row {`
	`276`	`+ for _, v := range ws.SheetData.Row {`
`274`	`277`	`if v.R == row && v.Ht != 0 {`
`275`	`278`	`return v.Ht, nil`
`276`	`279`	`}`
`277`	`280`	`}`
`278`	`281`	`// Optimisation for when the row heights haven't changed.`
`279`		`- return defaultRowHeightPixels, nil`
	`282`	`+ return ht, nil`
`280`	`283`	`}`
`281`	`284`
`282`	`285`	`// sharedStringsReader provides a function to get the pointer to the structure`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ func (f File) AddSparkline(sheet string, opt SparklineOption) (err error) {`
`441`	`441`	`}`
`442`	`442`	`} else {`
`443`	`443`	`groups = &xlsxX14SparklineGroups{`
`444`		`- XMLNSXM: NameSpaceSpreadSheetExcel2006Main,`
	`444`	`+ XMLNSXM: NameSpaceSpreadSheetExcel2006Main.Value,`
`445`	`445`	`SparklineGroups: []*xlsxX14SparklineGroup{group},`
`446`	`446`	`}`
`447`	`447`	`if sparklineGroupsBytes, err = xml.Marshal(groups); err != nil {`
`@@ -525,7 +525,7 @@ func (f File) appendSparkline(ws xlsxWorksheet, group *xlsxX14SparklineGroup,`
`525`	`525`	`return`
`526`	`526`	`}`
`527`	`527`	`groups = &xlsxX14SparklineGroups{`
`528`		`- XMLNSXM: NameSpaceSpreadSheetExcel2006Main,`
	`528`	`+ XMLNSXM: NameSpaceSpreadSheetExcel2006Main.Value,`
`529`	`529`	`Content: decodeSparklineGroups.Content + string(sparklineGroupBytes),`
`530`	`530`	`}`
`531`	`531`	`if sparklineGroupsBytes, err = xml.Marshal(groups); err != nil {`