pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-02-10 18:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ve] Arrange pages by rId; Fix bug 72741

Browse Source
This commit is contained in:
Fedor Kobyakov
2025-01-27 15:18:09 +03:00
parent c32b3543d3
commit f78959dbbe
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
visio/model/VisioDocument.js
View File

@ -1171,35 +1171,33 @@
function parsePages(documentPart, reader, context) {
let pagesPart = documentPart.getPartByRelationshipType(AscCommon.openXml.Types.pages.relationType);
if (pagesPart) {
let contentPages = pagesPart.getDocumentContent();
reader = new StaxParser(contentPages, pagesPart, context);
let pagesXml = pagesPart.getDocumentContent();
reader = new StaxParser(pagesXml, pagesPart, context);
this.pages = new CPages();
this.pages.fromXml(reader);
// page content parts
let pages = pagesPart.getPartsByRelationshipType(AscCommon.openXml.Types.page.relationType);
if (pages.length > 0) {
// order is important so sort masters using uri
let pagesSort = [];
for (let i = 0; i < pages.length; i++) {
let pageNumber = pages[i].uri.match(/\d+/); // for page3.xml we get 3
if (!isNaN(parseFloat(pageNumber)) && !isNaN(pageNumber - 0)) {
// if masterNumber is number
pagesSort[pageNumber - 1] = pages[i];
// this.pageContents order is important it must correspond to this.pages but pages is messed up by default
// so now let's get page contents by page relationship to get pageContents in correct order
// 1) find page rId number
// 2) find pageContent by rId
for (let i = 0; i < this.pages.page.length; i++) {
let pageContentRid = this.pages.page[i] && this.pages.page[i].rel && this.pages.page[i].rel.id;
if (pageContentRid) {
// let pageContentRel = pagesPart.getRelationship(pageContentRid);
let pageContentPart = pagesPart.getPartById(pageContentRid);
let contentPage = pageContentPart.getDocumentContent();
reader = new StaxParser(contentPage, pageContentPart, context);
let PageContent = new CPageContents();
PageContent.fromXml(reader);
this.pageContents.push(PageContent);
} else {
AscCommon.consoleLog('check sdkjs/draw/model/VisioDocument.js : parsePages');
pagesSort = pages;
break;
AscCommon.consoleLog("Page content rId not found");
}
}
pages = pagesSort;
for (let i = 0; i < pages.length; i++) {
let pagePart = pages[i];
let contentPage = pagePart.getDocumentContent();
reader = new StaxParser(contentPage, pagePart, context);
let PageContent = new CPageContents();
PageContent.fromXml(reader);
this.pageContents.push(PageContent);
}
}
}
}