diff --git a/structpara.go b/structpara.go index 5c79a37..0cd8a98 100644 --- a/structpara.go +++ b/structpara.go @@ -163,10 +163,10 @@ func (p *ParagraphProperties) UnmarshalXML(d *xml.Decoder, start xml.StartElemen type Paragraph struct { XMLName xml.Name `xml:"w:p,omitempty"` - RsidR string `xml:"w:rsidR,attr,omitempty"` - RsidRPr string `xml:"w:rsidRPr,attr,omitempty"` - RsidRDefault string `xml:"w:rsidRDefault,attr,omitempty"` - RsidP string `xml:"w:rsidP,attr,omitempty"` + // RsidR string `xml:"w:rsidR,attr,omitempty"` + // RsidRPr string `xml:"w:rsidRPr,attr,omitempty"` + // RsidRDefault string `xml:"w:rsidRDefault,attr,omitempty"` + // RsidP string `xml:"w:rsidP,attr,omitempty"` Properties *ParagraphProperties Children []interface{} @@ -220,7 +220,7 @@ func (p *Paragraph) String() string { // UnmarshalXML ... func (p *Paragraph) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { - for _, attr := range start.Attr { + /*for _, attr := range start.Attr { switch attr.Name.Local { case "rsidR": p.RsidR = attr.Value @@ -233,7 +233,7 @@ func (p *Paragraph) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { default: // ignore other attributes } - } + }*/ children := make([]interface{}, 0, 64) for { t, err := d.Token() diff --git a/structrun.go b/structrun.go index 8f68fe0..2b4e75e 100644 --- a/structrun.go +++ b/structrun.go @@ -33,8 +33,8 @@ import ( type Run struct { XMLName xml.Name `xml:"w:r,omitempty"` Space string `xml:"xml:space,attr,omitempty"` - RsidR string `xml:"w:rsidR,attr,omitempty"` - RsidRPr string `xml:"w:rsidRPr,attr,omitempty"` + // RsidR string `xml:"w:rsidR,attr,omitempty"` + // RsidRPr string `xml:"w:rsidRPr,attr,omitempty"` RunProperties *RunProperties `xml:"w:rPr,omitempty"` @@ -51,10 +51,10 @@ func (r *Run) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { switch attr.Name.Local { case "space": r.Space = attr.Value - case "rsidR": + /*case "rsidR": r.RsidR = attr.Value case "rsidRPr": - r.RsidRPr = attr.Value + r.RsidRPr = attr.Value*/ default: // ignore other attributes } diff --git a/structtable.go b/structtable.go index cdec32c..601bf0d 100644 --- a/structtable.go +++ b/structtable.go @@ -401,10 +401,10 @@ func (g *WGridCol) UnmarshalXML(d *xml.Decoder, start xml.StartElement) (err err // WTableRow represents a row within a table. type WTableRow struct { - XMLName xml.Name `xml:"w:tr,omitempty"` - RsidR string `xml:"w:rsidR,attr,omitempty"` - RsidRPr string `xml:"w:rsidRPr,attr,omitempty"` - RsidTr string `xml:"w:rsidTr,attr,omitempty"` + XMLName xml.Name `xml:"w:tr,omitempty"` + // RsidR string `xml:"w:rsidR,attr,omitempty"` + // RsidRPr string `xml:"w:rsidRPr,attr,omitempty"` + // RsidTr string `xml:"w:rsidTr,attr,omitempty"` TableRowProperties *WTableRowProperties TableCells []*WTableCell @@ -413,7 +413,7 @@ type WTableRow struct { // UnmarshalXML ... func (w *WTableRow) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { - for _, attr := range start.Attr { + /*for _, attr := range start.Attr { switch attr.Name.Local { case "rsidR": w.RsidR = attr.Value @@ -424,7 +424,7 @@ func (w *WTableRow) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { default: // ignore other attributes } - } + }*/ for { t, err := d.Token()