optimize(drawing): use implicit a:graphicFrameLocks

fumiama · Sep 17, 2024 · f03badc · f03badc
1 parent 3e5e3f4
commit f03badc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/apidrawing.go b/apidrawing.go
@@ -63,6 +63,7 @@ func (p *Paragraph) AddInlineDrawing(pic []byte) (*Run, error) {
 			},
 			CNvGraphicFramePr: &WPCNvGraphicFramePr{
 				Locks: AGraphicFrameLocks{
+					XMLA:           XMLNS_DRAWINGML_MAIN,
 					NoChangeAspect: 1,
 				},
 			},
@@ -174,6 +175,7 @@ func (p *Paragraph) AddAnchorDrawing(pic []byte) (*Run, error) {
 			},
 			CNvGraphicFramePr: &WPCNvGraphicFramePr{
 				Locks: AGraphicFrameLocks{
+					XMLA:           XMLNS_DRAWINGML_MAIN,
 					NoChangeAspect: 1,
 				},
 			},

diff --git a/apishape.go b/apishape.go
@@ -40,7 +40,9 @@ func (p *Paragraph) AddInlineShape(w, h int64, name, bwMode, prst string, ln *AL
 				ID:   idn,
 				Name: name + " " + id,
 			},
-			CNvGraphicFramePr: &WPCNvGraphicFramePr{},
+			CNvGraphicFramePr: &WPCNvGraphicFramePr{
+				Locks: AGraphicFrameLocks{XMLA: XMLNS_DRAWINGML_MAIN},
+			},
 			Graphic: &AGraphic{
 				XMLA: XMLNS_DRAWINGML_MAIN,
 				GraphicData: &AGraphicData{
@@ -107,7 +109,9 @@ func (p *Paragraph) AddAnchorShape(w, h int64, name, bwMode, prst string, ln *AL
 				ID:   idn,
 				Name: name + " " + id,
 			},
-			CNvGraphicFramePr: &WPCNvGraphicFramePr{},
+			CNvGraphicFramePr: &WPCNvGraphicFramePr{
+				Locks: AGraphicFrameLocks{XMLA: XMLNS_DRAWINGML_MAIN},
+			},
 			Graphic: &AGraphic{
 				XMLA: XMLNS_DRAWINGML_MAIN,
 				GraphicData: &AGraphicData{

diff --git a/structdrawing.go b/structdrawing.go
@@ -450,6 +450,7 @@ func (w *WPCNvGraphicFramePr) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) e
 		if tt, ok := t.(xml.StartElement); ok {
 			switch tt.Name.Local {
 			case "graphicFrameLocks":
+				w.Locks.XMLA = getAtt(tt.Attr, "a")
 				v := getAtt(tt.Attr, "noChangeAspect")
 				if v == "" {
 					continue
@@ -472,7 +473,8 @@ func (w *WPCNvGraphicFramePr) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) e
 
 // AGraphicFrameLocks represents the locks applied to a graphic frame.
 type AGraphicFrameLocks struct {
-	XMLName        xml.Name `xml:"http://schemas.openxmlformats.org/drawingml/2006/main graphicFrameLocks,omitempty"`
+	XMLName        xml.Name `xml:"a:graphicFrameLocks,omitempty"`
+	XMLA           string   `xml:"xmlns:a,attr,omitempty"`
 	NoChangeAspect int      `xml:"noChangeAspect,attr,omitempty"`
 }