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 /rows.go | |
| parent | 3c8c8c55c8128c5bb94fe28451f58fbc5fb4a118 (diff) | |
Default row height compatibility with Apache OpenOffice and Kingsoft WPS, unit test update and typo fixed
Diffstat (limited to 'rows.go')
| -rw-r--r-- | rows.go | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -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 |