smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: multiple def of header/footer attributes

Browse Source
This commit is contained in:
moritz-tr
2019-07-22 17:36:13 +02:00
parent 9e8d67c4a9
commit ec5a678f05
2 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/file/footer/footer.ts
View File

@ -10,26 +10,28 @@ export class Footer extends InitializableXmlComponent {
constructor(referenceNumber: number, initContent?: XmlComponent) { constructor(referenceNumber: number, initContent?: XmlComponent) {
super("w:ftr", initContent); super("w:ftr", initContent);
this.refId = referenceNumber; this.refId = referenceNumber;
this.root.push( if (!initContent) {
new FooterAttributes({ this.root.push(
wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas", new FooterAttributes({
mc: "http://schemas.openxmlformats.org/markup-compatibility/2006", wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
o: "urn:schemas-microsoft-com:office:office", mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships", o: "urn:schemas-microsoft-com:office:office",
m: "http://schemas.openxmlformats.org/officeDocument/2006/math", r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
v: "urn:schemas-microsoft-com:vml", m: "http://schemas.openxmlformats.org/officeDocument/2006/math",
wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing", v: "urn:schemas-microsoft-com:vml",
wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing", wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing",
w10: "urn:schemas-microsoft-com:office:word", wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main", w10: "urn:schemas-microsoft-com:office:word",
w14: "http://schemas.microsoft.com/office/word/2010/wordml", w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
w15: "http://schemas.microsoft.com/office/word/2012/wordml", w14: "http://schemas.microsoft.com/office/word/2010/wordml",
wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup", w15: "http://schemas.microsoft.com/office/word/2012/wordml",
wpi: "http://schemas.microsoft.com/office/word/2010/wordprocessingInk", wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup",
wne: "http://schemas.microsoft.com/office/word/2006/wordml", wpi: "http://schemas.microsoft.com/office/word/2010/wordprocessingInk",
wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape", wne: "http://schemas.microsoft.com/office/word/2006/wordml",
}), wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape",
); }),
);
}
} }
public get ReferenceId(): number { public get ReferenceId(): number {

65
src/file/header/header.ts
View File

@ -11,38 +11,39 @@ export class Header extends InitializableXmlComponent {
super("w:hdr", initContent); super("w:hdr", initContent);
this.refId = referenceNumber; this.refId = referenceNumber;
if (!initContent) {
this.root.push( this.root.push(
new HeaderAttributes({ new HeaderAttributes({
wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas", wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
mc: "http://schemas.openxmlformats.org/markup-compatibility/2006", mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
o: "urn:schemas-microsoft-com:office:office", o: "urn:schemas-microsoft-com:office:office",
r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships", r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
m: "http://schemas.openxmlformats.org/officeDocument/2006/math", m: "http://schemas.openxmlformats.org/officeDocument/2006/math",
v: "urn:schemas-microsoft-com:vml", v: "urn:schemas-microsoft-com:vml",
wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing", wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing",
wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing", wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
w10: "urn:schemas-microsoft-com:office:word", w10: "urn:schemas-microsoft-com:office:word",
w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main", w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
w14: "http://schemas.microsoft.com/office/word/2010/wordml", w14: "http://schemas.microsoft.com/office/word/2010/wordml",
w15: "http://schemas.microsoft.com/office/word/2012/wordml", w15: "http://schemas.microsoft.com/office/word/2012/wordml",
wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup", wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup",
wpi: "http://schemas.microsoft.com/office/word/2010/wordprocessingInk", wpi: "http://schemas.microsoft.com/office/word/2010/wordprocessingInk",
wne: "http://schemas.microsoft.com/office/word/2006/wordml", wne: "http://schemas.microsoft.com/office/word/2006/wordml",
wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape", wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape",
cx: "http://schemas.microsoft.com/office/drawing/2014/chartex", cx: "http://schemas.microsoft.com/office/drawing/2014/chartex",
cx1: "http://schemas.microsoft.com/office/drawing/2015/9/8/chartex", cx1: "http://schemas.microsoft.com/office/drawing/2015/9/8/chartex",
cx2: "http://schemas.microsoft.com/office/drawing/2015/10/21/chartex", cx2: "http://schemas.microsoft.com/office/drawing/2015/10/21/chartex",
cx3: "http://schemas.microsoft.com/office/drawing/2016/5/9/chartex", cx3: "http://schemas.microsoft.com/office/drawing/2016/5/9/chartex",
cx4: "http://schemas.microsoft.com/office/drawing/2016/5/10/chartex", cx4: "http://schemas.microsoft.com/office/drawing/2016/5/10/chartex",
cx5: "http://schemas.microsoft.com/office/drawing/2016/5/11/chartex", cx5: "http://schemas.microsoft.com/office/drawing/2016/5/11/chartex",
cx6: "http://schemas.microsoft.com/office/drawing/2016/5/12/chartex", cx6: "http://schemas.microsoft.com/office/drawing/2016/5/12/chartex",
cx7: "http://schemas.microsoft.com/office/drawing/2016/5/13/chartex", cx7: "http://schemas.microsoft.com/office/drawing/2016/5/13/chartex",
cx8: "http://schemas.microsoft.com/office/drawing/2016/5/14/chartex", cx8: "http://schemas.microsoft.com/office/drawing/2016/5/14/chartex",
w16cid: "http://schemas.microsoft.com/office/word/2016/wordml/cid", w16cid: "http://schemas.microsoft.com/office/word/2016/wordml/cid",
w16se: "http://schemas.microsoft.com/office/word/2015/wordml/symex", w16se: "http://schemas.microsoft.com/office/word/2015/wordml/symex",
}), }),
); );
}
} }
public get ReferenceId(): number { public get ReferenceId(): number {