diff --git a/src/file/drawing/drawing.spec.ts b/src/file/drawing/drawing.spec.ts index b97b6ea11e..52c76c791f 100644 --- a/src/file/drawing/drawing.spec.ts +++ b/src/file/drawing/drawing.spec.ts @@ -111,7 +111,7 @@ describe("Drawing", () => { { "pic:cNvPr": { _attr: { - desc: "", + descr: "", id: 0, name: "", }, @@ -166,14 +166,6 @@ describe("Drawing", () => { { _attr: {}, }, - { - "a:ext": { - _attr: { - cx: 952500, - cy: 952500, - }, - }, - }, { "a:off": { _attr: { @@ -182,6 +174,14 @@ describe("Drawing", () => { }, }, }, + { + "a:ext": { + _attr: { + cx: 952500, + cy: 952500, + }, + }, + }, ], }, { @@ -341,7 +341,7 @@ describe("Drawing", () => { { "pic:cNvPr": { _attr: { - desc: "", + descr: "", id: 0, name: "", }, @@ -396,14 +396,6 @@ describe("Drawing", () => { { _attr: {}, }, - { - "a:ext": { - _attr: { - cx: 952500, - cy: 952500, - }, - }, - }, { "a:off": { _attr: { @@ -412,6 +404,14 @@ describe("Drawing", () => { }, }, }, + { + "a:ext": { + _attr: { + cx: 952500, + cy: 952500, + }, + }, + }, ], }, { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts index cac3312dde..8d8951c12c 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts @@ -8,6 +8,6 @@ export class NonVisualPropertiesAttributes extends XmlAttributeComponent<{ protected readonly xmlKeys = { id: "id", name: "name", - descr: "desc", + descr: "descr", }; } diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts index 3d46b1875a..3cf724d656 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts @@ -24,14 +24,6 @@ describe("Form", () => { { _attr: {}, }, - { - "a:ext": { - _attr: { - cx: 100, - cy: 100, - }, - }, - }, { "a:off": { _attr: { @@ -40,6 +32,14 @@ describe("Form", () => { }, }, }, + { + "a:ext": { + _attr: { + cx: 100, + cy: 100, + }, + }, + }, ], }); }); @@ -70,14 +70,6 @@ describe("Form", () => { flipV: true, }, }, - { - "a:ext": { - _attr: { - cx: 100, - cy: 100, - }, - }, - }, { "a:off": { _attr: { @@ -86,6 +78,14 @@ describe("Form", () => { }, }, }, + { + "a:ext": { + _attr: { + cx: 100, + cy: 100, + }, + }, + }, ], }); }); diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts index 5311b83911..163af208d6 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts @@ -34,8 +34,8 @@ export class Form extends XmlComponent { this.extents = new Extents(options.emus.x, options.emus.y); - this.root.push(this.extents); this.root.push(new Offset()); + this.root.push(this.extents); } public setXY(x: number, y: number): void { diff --git a/src/file/paragraph/run/image-run.spec.ts b/src/file/paragraph/run/image-run.spec.ts index a5572f48a9..de36455840 100644 --- a/src/file/paragraph/run/image-run.spec.ts +++ b/src/file/paragraph/run/image-run.spec.ts @@ -168,7 +168,7 @@ describe("ImageRun", () => { { "pic:cNvPr": { _attr: { - desc: "", + descr: "", id: 0, name: "", }, @@ -224,14 +224,6 @@ describe("ImageRun", () => { rot: 2700000, }, }, - { - "a:ext": { - _attr: { - cx: 1905000, - cy: 1905000, - }, - }, - }, { "a:off": { _attr: { @@ -240,6 +232,14 @@ describe("ImageRun", () => { }, }, }, + { + "a:ext": { + _attr: { + cx: 1905000, + cy: 1905000, + }, + }, + }, ], }, { @@ -418,7 +418,7 @@ describe("ImageRun", () => { { "pic:cNvPr": { _attr: { - desc: "", + descr: "", id: 0, name: "", }, @@ -474,14 +474,6 @@ describe("ImageRun", () => { rot: 2700000, }, }, - { - "a:ext": { - _attr: { - cx: 1905000, - cy: 1905000, - }, - }, - }, { "a:off": { _attr: { @@ -490,6 +482,14 @@ describe("ImageRun", () => { }, }, }, + { + "a:ext": { + _attr: { + cx: 1905000, + cy: 1905000, + }, + }, + }, ], }, { @@ -671,7 +671,7 @@ describe("ImageRun", () => { { "pic:cNvPr": { _attr: { - desc: "", + descr: "", id: 0, name: "", }, @@ -727,14 +727,6 @@ describe("ImageRun", () => { rot: 2700000, }, }, - { - "a:ext": { - _attr: { - cx: 1905000, - cy: 1905000, - }, - }, - }, { "a:off": { _attr: { @@ -743,6 +735,14 @@ describe("ImageRun", () => { }, }, }, + { + "a:ext": { + _attr: { + cx: 1905000, + cy: 1905000, + }, + }, + }, ], }, { @@ -927,7 +927,7 @@ describe("ImageRun", () => { { "pic:cNvPr": { _attr: { - desc: "", + descr: "", id: 0, name: "", }, @@ -983,14 +983,6 @@ describe("ImageRun", () => { rot: 2700000, }, }, - { - "a:ext": { - _attr: { - cx: 1905000, - cy: 1905000, - }, - }, - }, { "a:off": { _attr: { @@ -999,6 +991,14 @@ describe("ImageRun", () => { }, }, }, + { + "a:ext": { + _attr: { + cx: 1905000, + cy: 1905000, + }, + }, + }, ], }, {