From 8b3cf0260d33157578f9beb851414e2c4145b2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Thu, 2 Mar 2023 18:12:08 +0800 Subject: [PATCH] make lint happy --- apishape.go | 8 ++++---- cmd/main/main.go | 4 ++-- id.go | 1 + structcanvas.go | 3 +++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apishape.go b/apishape.go index 2918aa3..47701af 100644 --- a/apishape.go +++ b/apishape.go @@ -26,7 +26,7 @@ import ( ) // AddInlineShape adds wsp named drawing to paragraph -func (p *Paragraph) AddInlineShape(w, h int64, name, bwMode, prst string, ln *ALine) (*Run, error) { +func (p *Paragraph) AddInlineShape(w, h int64, name, bwMode, prst string, ln *ALine) *Run { idn := int(atomic.AddUintptr(&p.file.docID, 1)) id := strconv.Itoa(int(p.file.IncreaseID(name))) d := &Drawing{ @@ -77,11 +77,11 @@ func (p *Paragraph) AddInlineShape(w, h int64, name, bwMode, prst string, ln *AL Children: c, } p.Children = append(p.Children, run) - return run, nil + return run } // AddAnchorShape adds wsp named drawing to paragraph -func (p *Paragraph) AddAnchorShape(w, h int64, name, bwMode, prst string, ln *ALine) (*Run, error) { +func (p *Paragraph) AddAnchorShape(w, h int64, name, bwMode, prst string, ln *ALine) *Run { idn := int(atomic.AddUintptr(&p.file.docID, 1)) id := strconv.Itoa(int(p.file.IncreaseID(name))) d := &Drawing{ @@ -144,5 +144,5 @@ func (p *Paragraph) AddAnchorShape(w, h int64, name, bwMode, prst string, ln *AL Children: c, } p.Children = append(p.Children, run) - return run, nil + return run } diff --git a/cmd/main/main.go b/cmd/main/main.go index d6a391d..55cb3eb 100644 --- a/cmd/main/main.go +++ b/cmd/main/main.go @@ -125,7 +125,7 @@ func main() { p := w.AddParagraph().Justification("center") p.AddText("测试 AutoShape w:ln").Size("44") - p.AddAnchorShape(808355, 238760, "AutoShape", "auto", "straightConnector1", + _ = p.AddAnchorShape(808355, 238760, "AutoShape", "auto", "straightConnector1", &docx.ALine{ W: 9525, SolidFill: &docx.ASolidFill{SrgbClr: &docx.ASrgbClr{Val: "000000"}}, @@ -134,7 +134,7 @@ func main() { TailEnd: &docx.ATailEnd{}, }, ) - p.AddInlineShape(808355, 238760, "AutoShape", "auto", "straightConnector1", + _ = p.AddInlineShape(808355, 238760, "AutoShape", "auto", "straightConnector1", &docx.ALine{ W: 9525, SolidFill: &docx.ASolidFill{SrgbClr: &docx.ASrgbClr{Val: "000000"}}, diff --git a/id.go b/id.go index fb0bd60..31b6157 100644 --- a/id.go +++ b/id.go @@ -20,6 +20,7 @@ package docx +// IncreaseID by name func (f *Docx) IncreaseID(name string) (n uintptr) { f.slowIDsMu.Lock() n = f.slowIDs[name] diff --git a/structcanvas.go b/structcanvas.go index bd93cbf..8da1c83 100644 --- a/structcanvas.go +++ b/structcanvas.go @@ -26,6 +26,7 @@ import ( "strings" ) +// WordprocessingCanvas ... type WordprocessingCanvas struct { XMLName xml.Name `xml:"wpc:wpc,omitempty"` Background *WPCBackground @@ -81,6 +82,7 @@ func (c *WordprocessingCanvas) UnmarshalXML(d *xml.Decoder, start xml.StartEleme return nil } +// WPCBackground ... type WPCBackground struct { XMLName xml.Name `xml:"wpc:bg,omitempty"` NoFill *struct{} `xml:"a:noFill,omitempty"` @@ -113,6 +115,7 @@ func (b *WPCBackground) UnmarshalXML(d *xml.Decoder, start xml.StartElement) (er return nil } +// WPCWhole ... type WPCWhole struct { XMLName xml.Name `xml:"wpc:whole,omitempty"` Line *ALine