From ddeed48fc19e814e1ec2c04580108f7b865cf181 Mon Sep 17 00:00:00 2001
From: Ri Xu <xuri.me@gmail.com>
Date: Tue, 20 Dec 2016 20:46:19 +0800
Subject: - Fix issue background image and table missing after save; - Update
 test template for this fix

---
 sheet.go            |   2 ++
 test/Workbook1.xlsx | Bin 18395 -> 21643 bytes
 xmlWorksheet.go     |  58 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/sheet.go b/sheet.go
index 36488d5..088a651 100644
--- a/sheet.go
+++ b/sheet.go
@@ -125,6 +125,8 @@ func replaceRelationshipsNameSpace(workbookMarshal string) string {
 func replaceRelationshipsID(workbookMarshal string) string {
 	rids := strings.Replace(workbookMarshal, `<drawing rid="" />`, ``, -1)
 	rids = strings.Replace(rids, `<hyperlinks></hyperlinks>`, ``, -1)
+	rids = strings.Replace(rids, `<tableParts count="0"></tableParts>`, ``, -1)
+	rids = strings.Replace(rids, `<picture></picture>`, ``, -1)
 	return strings.Replace(rids, `<drawing rid="`, `<drawing r:id="`, -1)
 }
 
diff --git a/test/Workbook1.xlsx b/test/Workbook1.xlsx
index 93b90f2..ecc7a4f 100644
Binary files a/test/Workbook1.xlsx and b/test/Workbook1.xlsx differ
diff --git a/xmlWorksheet.go b/xmlWorksheet.go
index 349350e..02794e4 100644
--- a/xmlWorksheet.go
+++ b/xmlWorksheet.go
@@ -23,6 +23,8 @@ type xlsxWorksheet struct {
 	PageSetUp     xlsxPageSetUp     `xml:"pageSetup"`
 	HeaderFooter  xlsxHeaderFooter  `xml:"headerFooter"`
 	Drawing       xlsxDrawing       `xml:"drawing"`
+	Picture       xlsxPicture       `xml:"picture"`
+	TableParts    xlsxTableParts    `xml:"tableParts"`
 }
 
 // xlsxDrawing change r:id to rid in the namespace.
@@ -292,3 +294,59 @@ type xlsxHyperlink struct {
 	Display  string `xml:"display,attr,omitempty"`
 	RID      string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"`
 }
+
+// xlsxTableParts directly maps the tableParts element in the namespace
+// http://schemas.openxmlformats.org/spreadsheetml/2006/main -
+// The table element has several attributes applied to identify the table
+// and the data range it covers. The table id attribute needs to be unique
+// across all table parts, the same goes for the name and displayName. The
+// displayName has the further restriction that it must be unique across
+// all defined names in the workbook. Later on we will see that you can
+// define names for many elements, such as cells or formulas. The name
+// value is used for the object model in Microsoft Office Excel. The
+// displayName is used for references in formulas. The ref attribute is
+// used to identify the cell range that the table covers. This includes
+// not only the table data, but also the table header containing column
+// names.
+// To add columns to your table you add new tableColumn elements to the
+// tableColumns container. Similar to the shared string table the
+// collection keeps a count attribute identifying the number of columns.
+// Besides the table definition in the table part there is also the need
+// to identify which tables are displayed in the worksheet. The worksheet
+// part has a separate element tableParts to store this information. Each
+// table part is referenced through the relationship ID and again a count
+// of the number of table parts is maintained. The following markup sample
+// is taken from the documents accompanying this book. The sheet data
+// element has been removed to reduce the size of the sample. To reference
+// the table, just add the tableParts element, of course after having
+// created and stored the table part.
+// Example:
+//
+//    <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+//        ...
+//        <tableParts count="1">
+// 		      <tablePart r:id="rId1" />
+//        </tableParts>
+//    </worksheet>
+//
+type xlsxTableParts struct {
+	Count      int             `xml:"count,attr"`
+	TableParts []xlsxTablePart `xml:"tablePart"`
+}
+
+// xlsxTablePart directly maps the tablePart element in the namespace
+// http://schemas.openxmlformats.org/spreadsheetml/2006/main
+type xlsxTablePart struct {
+	RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"`
+}
+
+// xlsxPicture directly maps the picture element in the namespace
+// http://schemas.openxmlformats.org/spreadsheetml/2006/main -
+// Background sheet image.
+// Example:
+//
+//    <picture r:id="rId1"/>
+//
+type xlsxPicture struct {
+	RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"` // Relationship Id pointing to the image part.
+}
-- 
cgit v1.2.1