fumiama/go-docx
1
0
Fork 0
mirror of https://github.com/fumiama/go-docx.git synced 2026-06-05 07:40:24 +08:00
Code Activity

fix(structtable): add float fallback when parsing numeric value (#10)

Browse Source
This commit is contained in:
Kwan Jun Wen
2023-07-10 13:54:27 +08:00
committed by GitHub
parent 765b00bcf9
commit 1a682f16d9
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
structtable.go
View File

@@ -392,7 +392,11 @@ func (g *WGridCol) UnmarshalXML(d *xml.Decoder, start xml.StartElement) (err err
case "w": case "w":
g.W, err = strconv.ParseInt(attr.Value, 10, 64) g.W, err = strconv.ParseInt(attr.Value, 10, 64)
if err != nil { if err != nil {
return w, err := strconv.ParseFloat(attr.Value, 64)
if err != nil {
return err
}
g.W = int64(w)
} }
default: default:
// ignore other attributes // ignore other attributes
@@ -494,7 +498,11 @@ func (t *WTableRowProperties) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) e
case "val": case "val":
th.Val, err = strconv.ParseInt(attr.Value, 10, 64) th.Val, err = strconv.ParseInt(attr.Value, 10, 64)
if err != nil { if err != nil {
return err w, err := strconv.ParseFloat(attr.Value, 64)
if err != nil {
return err
}
th.Val = int64(w)
} }
case "hRule": case "hRule":
th.Rule = attr.Value th.Rule = attr.Value
@@ -617,7 +625,11 @@ func (r *WTableCellProperties) UnmarshalXML(d *xml.Decoder, _ xml.StartElement)
} }
r.TableCellWidth.W, err = strconv.ParseInt(v, 10, 64) r.TableCellWidth.W, err = strconv.ParseInt(v, 10, 64)
if err != nil { if err != nil {
return err w, err := strconv.ParseFloat(v, 64)
if err != nil {
return err
}
r.TableCellWidth.W = int64(w)
} }
r.TableCellWidth.Type = getAtt(tt.Attr, "type") r.TableCellWidth.Type = getAtt(tt.Attr, "type")
case "vMerge": case "vMerge":