From 3b2c80ddc37db87bf090f531ae6afcb70d49b759 Mon Sep 17 00:00:00 2001
From: Ri Xu <xuri.me@gmail.com>
Date: Sun, 16 Jul 2017 13:03:45 +0800
Subject: Trim blank cells which created by `completeCol()`, relate issue #81

---
 sheet.go       | 19 +++++++++++++++++++
 xmlWorkbook.go |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/sheet.go b/sheet.go
index 32b8926..e6d9b2c 100644
--- a/sheet.go
+++ b/sheet.go
@@ -72,10 +72,29 @@ func (f *File) workbookWriter() {
 func (f *File) worksheetWriter() {
 	for path, sheet := range f.Sheet {
 		if sheet != nil {
+			for k, v := range sheet.SheetData.Row {
+				f.Sheet[path].SheetData.Row[k].C = trimCell(v.C)
+			}
 			output, _ := xml.Marshal(sheet)
 			f.saveFileList(path, replaceWorkSheetsRelationshipsNameSpace(string(output)))
+			ok := f.checked[path]
+			if ok {
+				f.checked[path] = false
+			}
+		}
+	}
+}
+
+// trimCell provides function to trim blank cells which created by completeCol.
+func trimCell(column []xlsxC) []xlsxC {
+	col := []xlsxC{}
+	for _, c := range column {
+		if c.S == 0 && c.V == "" && c.F == nil && c.T == "" {
+			continue
 		}
+		col = append(col, c)
 	}
+	return col
 }
 
 // Read and update property of contents type of XLSX.
diff --git a/xmlWorkbook.go b/xmlWorkbook.go
index ddf8ce2..b04b173 100644
--- a/xmlWorkbook.go
+++ b/xmlWorkbook.go
@@ -203,7 +203,7 @@ type xlsxDefinedName struct {
 	FunctionGroupID   int    `xml:"functionGroupId,attr,omitempty"`
 	Help              string `xml:"help,attr,omitempty"`
 	Hidden            bool   `xml:"hidden,attr,omitempty"`
-	LocalSheetID      int    `xml:"localSheetId,attr"`
+	LocalSheetID      *int   `xml:"localSheetId,attr"`
 	Name              string `xml:"name,attr,omitempty"`
 	PublishToServer   bool   `xml:"publishToServer,attr,omitempty"`
 	ShortcutKey       string `xml:"shortcutKey,attr,omitempty"`
-- 
cgit v1.2.1