From ac564afa56a691e378ab9bb04cb14bb283886a16 Mon Sep 17 00:00:00 2001 From: xuri Date: Sun, 13 Nov 2022 00:40:04 +0800 Subject: Remove internal error log print, throw XML deserialize error --- styles.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'styles.go') diff --git a/styles.go b/styles.go index 08d6b0c..79bd6d3 100644 --- a/styles.go +++ b/styles.go @@ -17,7 +17,6 @@ import ( "encoding/xml" "fmt" "io" - "log" "math" "reflect" "strconv" @@ -3357,16 +3356,16 @@ func getPaletteColor(color string) string { // themeReader provides a function to get the pointer to the xl/theme/theme1.xml // structure after deserialization. -func (f *File) themeReader() *xlsxTheme { +func (f *File) themeReader() (*xlsxTheme, error) { if _, ok := f.Pkg.Load(defaultXMLPathTheme); !ok { - return nil + return nil, nil } theme := xlsxTheme{XMLNSa: NameSpaceDrawingML.Value, XMLNSr: SourceRelationship.Value} if err := f.xmlNewDecoder(bytes.NewReader(namespaceStrictToTransitional(f.readXML(defaultXMLPathTheme)))). Decode(&theme); err != nil && err != io.EOF { - log.Printf("xml decoder error: %s", err) + return &theme, err } - return &theme + return &theme, nil } // ThemeColor applied the color with tint value. -- cgit v1.2.1