From 219add2f0e4ae591141330648d410b60f5c0dbcf Mon Sep 17 00:00:00 2001
From: Eagle Xiang <eagle.xiang@outlook.com>
Date: Thu, 28 Jan 2021 21:13:23 +0800
Subject: [PATCH] =?UTF-8?q?value=20fields=20xlsxPatternFill.FgColor=20&=20?=
 =?UTF-8?q?xlsxPatternFill.BgColor=20cause=20=E2=80=A6=20(#770)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* value fields xlsxPatternFill.FgColor & xlsxPatternFill.BgColor cause ineffective omitempty tags

* remove useless omitempty tag on xlsxPatternFill.FgColor and xlsxPatternFill.BgColor
---
 styles.go    | 6 ++++++
 xmlStyles.go | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/styles.go b/styles.go
index c2dc7fa..9fd0f18 100644
--- a/styles.go
+++ b/styles.go
@@ -2432,8 +2432,14 @@ func newFills(style *Style, fg bool) *xlsxFill {
 		var pattern xlsxPatternFill
 		pattern.PatternType = patterns[style.Fill.Pattern]
 		if fg {
+			if pattern.FgColor == nil {
+				pattern.FgColor = new(xlsxColor)
+			}
 			pattern.FgColor.RGB = getPaletteColor(style.Fill.Color[0])
 		} else {
+			if pattern.BgColor == nil {
+				pattern.BgColor = new(xlsxColor)
+			}
 			pattern.BgColor.RGB = getPaletteColor(style.Fill.Color[0])
 		}
 		fill.PatternFill = &pattern
diff --git a/xmlStyles.go b/xmlStyles.go
index 2884800..db85b15 100644
--- a/xmlStyles.go
+++ b/xmlStyles.go
@@ -120,9 +120,9 @@ type xlsxFill struct {
 // For cell fills with patterns specified, then the cell fill color is
 // specified by the bgColor element.
 type xlsxPatternFill struct {
-	PatternType string    `xml:"patternType,attr,omitempty"`
-	FgColor     xlsxColor `xml:"fgColor,omitempty"`
-	BgColor     xlsxColor `xml:"bgColor,omitempty"`
+	PatternType string     `xml:"patternType,attr,omitempty"`
+	FgColor     *xlsxColor `xml:"fgColor"`
+	BgColor     *xlsxColor `xml:"bgColor"`
 }
 
 // xlsxGradientFill defines a gradient-style cell fill. Gradient cell fills can