- Fix issue comments missing after save;

- Update import PKG syntax in struct;
- Update test XLSX file (include table, charts, functions, comments and hyperlink on Sheet1)
This commit is contained in:
Ri Xu 2016-12-22 10:10:40 +08:00
parent ddeed48fc1
commit a08c8eb1ae
6 changed files with 18 additions and 9 deletions

View File

@ -127,6 +127,7 @@ func replaceRelationshipsID(workbookMarshal string) string {
rids = strings.Replace(rids, `<hyperlinks></hyperlinks>`, ``, -1)
rids = strings.Replace(rids, `<tableParts count="0"></tableParts>`, ``, -1)
rids = strings.Replace(rids, `<picture></picture>`, ``, -1)
rids = strings.Replace(rids, `<legacyDrawing></legacyDrawing>`, ``, -1)
return strings.Replace(rids, `<drawing rid="`, `<drawing r:id="`, -1)
}

Binary file not shown.

View File

@ -2,9 +2,7 @@
package excelize
import (
"encoding/xml"
)
import "encoding/xml"
type xlsxTypes struct {
XMLName xml.Name `xml:"http://schemas.openxmlformats.org/package/2006/content-types Types"`

View File

@ -2,9 +2,7 @@
package excelize
import (
"encoding/xml"
)
import "encoding/xml"
// xlsxSST directly maps the sst element from the namespace
// http://schemas.openxmlformats.org/spreadsheetml/2006/main currently

View File

@ -2,9 +2,7 @@
package excelize
import (
"encoding/xml"
)
import "encoding/xml"
const (
// sheet state values as defined by

View File

@ -23,6 +23,7 @@ type xlsxWorksheet struct {
PageSetUp xlsxPageSetUp `xml:"pageSetup"`
HeaderFooter xlsxHeaderFooter `xml:"headerFooter"`
Drawing xlsxDrawing `xml:"drawing"`
LegacyDrawing xlsxLegacyDrawing `xml:"legacyDrawing"`
Picture xlsxPicture `xml:"picture"`
TableParts xlsxTableParts `xml:"tableParts"`
}
@ -350,3 +351,16 @@ type xlsxTablePart struct {
type xlsxPicture struct {
RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"` // Relationship Id pointing to the image part.
}
// xlsxLegacyDrawing directly maps the legacyDrawing element in the namespace
// http://schemas.openxmlformats.org/spreadsheetml/2006/main -
// A comment is a rich text note that is attached to, and associated with,
// a cell, separate from other cell content. Comment content is stored
// separate from the cell, and is displayed in a drawing object (like a
// text box) that is separate from, but associated with, a cell. Comments
// are used as reminders, such as noting how a complex formula works, or
// to provide feedback to other users. Comments can also be used to explain
// assumptions made in a formula or to call out something special about the cell.
type xlsxLegacyDrawing struct {
RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"`
}