diff --git a/rows.go b/rows.go index 7bbc43ddf370aa0f4c31b602635fe2098291cb94..12d5ddf54dcd61bfa0366e7155771d611f6878db 100644 --- a/rows.go +++ b/rows.go @@ -290,10 +290,10 @@ func (f *File) GetRowHeight(sheet string, row int) (float64, error) { // after deserialization of xl/sharedStrings.xml. func (f *File) sharedStringsReader() *xlsxSST { var err error - wbPath := f.getWorkbookPath() - relPath := strings.TrimPrefix(filepath.Join(filepath.Dir(wbPath), "_rels", filepath.Base(wbPath)+".rels"), string(filepath.Separator)) f.Lock() defer f.Unlock() + wbPath := f.getWorkbookPath() + relPath := strings.TrimPrefix(filepath.Join(filepath.Dir(wbPath), "_rels", filepath.Base(wbPath)+".rels"), string(filepath.Separator)) if f.SharedStrings == nil { var sharedStrings xlsxSST ss := f.readXML("xl/sharedStrings.xml") diff --git a/xmlWorksheet.go b/xmlWorksheet.go index e5ea60db4d435bae7136240fc79356bc86646fba..26c8facedd9e84cb4e90da6b15dc95ebaae42f20 100644 --- a/xmlWorksheet.go +++ b/xmlWorksheet.go @@ -313,7 +313,7 @@ type xlsxSheetData struct { // xlsxRow directly maps the row element. The element expresses information // about an entire row of a worksheet, and contains all cell definitions for a // particular row in the worksheet. -type xlsxRow struct { // alignment word +type xlsxRow struct { C []xlsxC `xml:"c"` R int `xml:"r,attr,omitempty"` Spans string `xml:"spans,attr,omitempty"`