OrgGo/unioffice
1
0
Fork 0
mirror of https://github.com/unidoc/unioffice.git synced 2025-04-27 13:48:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

spreadsheet: don't allow extra content on Workbook

Browse Source 
Fixes #107
This commit is contained in:
Todd 2017-10-05 08:12:39 -04:00
parent 0805be88ba
commit 7343e2d31f
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
schema/soo/sml/CT_ConditionalFormatting.go
View File

@ -20,7 +20,7 @@ import (
type CT_ConditionalFormatting struct { type CT_ConditionalFormatting struct {
// PivotTable Conditional Formatting // PivotTable Conditional Formatting
PivotAttr *bool PivotAttr *bool
// Sequence of Refernces // Sequence of References
SqrefAttr *ST_Sqref SqrefAttr *ST_Sqref
// Conditional Formatting Rule // Conditional Formatting Rule
CfRule []*CT_CfRule CfRule []*CT_CfRule

11
schema/soo/sml/CT_Workbook.go
View File

@ -58,7 +58,6 @@ type CT_Workbook struct {
WebPublishObjects *CT_WebPublishObjects WebPublishObjects *CT_WebPublishObjects
// Future Feature Data Storage Area // Future Feature Data Storage Area
ExtLst *CT_ExtensionList ExtLst *CT_ExtensionList
Extra []gooxml.Any
} }
func NewCT_Workbook() *CT_Workbook { func NewCT_Workbook() *CT_Workbook {
@ -152,11 +151,6 @@ func (m *CT_Workbook) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
seextLst := xml.StartElement{Name: xml.Name{Local: "ma:extLst"}} seextLst := xml.StartElement{Name: xml.Name{Local: "ma:extLst"}}
e.EncodeElement(m.ExtLst, seextLst) e.EncodeElement(m.ExtLst, seextLst)
} }
for _, any := range m.Extra {
if err := any.MarshalXML(e, xml.StartElement{}); err != nil {
return err
}
}
e.EncodeToken(xml.EndElement{Name: start.Name}) e.EncodeToken(xml.EndElement{Name: start.Name})
return nil return nil
} }
@ -274,11 +268,10 @@ lCT_Workbook:
return err return err
} }
default: default:
any := &gooxml.XSDAny{} gooxml.Log("skipping unsupported element on CT_Workbook %v", el.Name)
if err := d.DecodeElement(any, &el); err != nil { if err := d.Skip(); err != nil {
return err return err
} }
m.Extra = append(m.Extra, any)
} }
case xml.EndElement: case xml.EndElement:
break lCT_Workbook break lCT_Workbook

5
schema/soo/sml/Workbook.go
View File

@ -149,11 +149,10 @@ lWorkbook:
return err return err
} }
default: default:
any := &gooxml.XSDAny{} gooxml.Log("skipping unsupported element on Workbook %v", el.Name)
if err := d.DecodeElement(any, &el); err != nil { if err := d.Skip(); err != nil {
return err return err
} }
m.Extra = append(m.Extra, any)
} }
case xml.EndElement: case xml.EndElement:
break lWorkbook break lWorkbook

1
xsdany.go
View File

@ -39,6 +39,7 @@ var wellKnownSchemas = map[string]string{
"wpi": "http://schemas.microsoft.com/office/word/2010/wordprocessingInk", "wpi": "http://schemas.microsoft.com/office/word/2010/wordprocessingInk",
"wps": "http://schemas.microsoft.com/office/word/2010/wordprocessingShape", "wps": "http://schemas.microsoft.com/office/word/2010/wordprocessingShape",
"xsi": "http://www.w3.org/2001/XMLSchema-instance", "xsi": "http://www.w3.org/2001/XMLSchema-instance",
"x15ac": "http://schemas.microsoft.com/office/spreadsheetml/2010/11/ac",
} }
var wellKnownSchemasInv = func() map[string]string { var wellKnownSchemasInv = func() map[string]string {