From 3f8f4f52e68d408da5a2e5108af3cc99bf8586bc Mon Sep 17 00:00:00 2001 From: xuri Date: Tue, 8 Feb 2022 00:08:06 +0800 Subject: This closes #1139, `SetCellDefault` support non-numeric value - Add default value on getting `View` property of sheet views - Add examples and unit test for set sheet views - Re-order field on sheet view options - Fix incorrect build-in number format: 42 - Simplify code for the `stylesReader` function --- styles.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'styles.go') diff --git a/styles.go b/styles.go index 5d373d3..7678b84 100644 --- a/styles.go +++ b/styles.go @@ -53,7 +53,7 @@ var builtInNumFmt = map[int]string{ 39: "#,##0.00;(#,##0.00)", 40: "#,##0.00;[red](#,##0.00)", 41: `_(* #,##0_);_(* \(#,##0\);_(* "-"_);_(@_)`, - 42: `_("$"* #,##0_);_("$* \(#,##0\);_("$"* "-"_);_(@_)`, + 42: `_("$"* #,##0_);_("$"* \(#,##0\);_("$"* "-"_);_(@_)`, 43: `_(* #,##0.00_);_(* \(#,##0.00\);_(* "-"??_);_(@_)`, 44: `_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)`, 45: "mm:ss", @@ -1074,16 +1074,13 @@ func is12HourTime(format string) bool { // stylesReader provides a function to get the pointer to the structure after // deserialization of xl/styles.xml. func (f *File) stylesReader() *xlsxStyleSheet { - var err error - if f.Styles == nil { f.Styles = new(xlsxStyleSheet) - if err = f.xmlNewDecoder(bytes.NewReader(namespaceStrictToTransitional(f.readXML(defaultXMLPathStyles)))). + if err := f.xmlNewDecoder(bytes.NewReader(namespaceStrictToTransitional(f.readXML(defaultXMLPathStyles)))). Decode(f.Styles); err != nil && err != io.EOF { log.Printf("xml decode error: %s", err) } } - return f.Styles } -- cgit v1.2.1