[ve] Make error reading not document.xml

ONLYOFFICE · Aug 11, 2023 · e2cccc1 · e2cccc1
1 parent c07e895
commit e2cccc1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/common/openxml.js b/common/openxml.js
@@ -790,7 +790,9 @@
 		oformFieldMaster: {dir: "oform/fieldMasters", filename: "fieldMaster[N].xml", contentType: "application/vnd.openxmlformats-package.onlyf-fieldMaster+xml", relationType: "https://schemas.onlyoffice.com/relationships/oform-fieldMaster"},
 
 		//visio
-		visioDocument: {dir: "visio", filename: "document.xml", contentType: "application/vnd.ms-visio.drawing.main+xml", relationType: "http://schemas.microsoft.com/visio/2010/relationships/document"}
+		visioDocument: {dir: "visio", filename: "document.xml", contentType: "application/vnd.ms-visio.drawing.main+xml", relationType: "http://schemas.microsoft.com/visio/2010/relationships/document"},
+		visioDocumentWindows: {dir: "visio", filename: "windows.xml", contentType: "application/vnd.ms-visio.windows+xml", relationType: "http://schemas.microsoft.com/visio/2010/relationships/windows"},
+		pages: {dir: "visio/pages", filename: "pages.xml", contentType: "application/vnd.ms-visio.pages+xml", relationType: "http://schemas.microsoft.com/visio/2010/relationships/pages"}
 	};
 	openXml.TargetMode = {
 		internal: "Internal",

diff --git a/draw/model/VisioDocument.js b/draw/model/VisioDocument.js
@@ -50,16 +50,37 @@
 	}
 
 	CVisioDocument.prototype.fromZip = function(zip, context, oReadResult) {
+		// Maybe it should be moved to 	sdkjs-ooxml/visio/Editor/SerializeXml.js like in 'word' case?
+		// 'word' case: 								sdkjs-ooxml/word/Editor/SerializeXml.js
 		context.zip = zip;
 
 		let reader;
 		let doc = new AscCommon.openXml.OpenXmlPackage(zip, null);
+
+		// handle appPart and CorePart like in 'word' case
+
 		let documentPart = doc.getPartByRelationshipType(AscCommon.openXml.Types.visioDocument.relationType);
 		if (documentPart) {
 			let contentDocument = documentPart.getDocumentContent();
 			reader = new StaxParser(contentDocument, documentPart, context);
 			this.fromXml(reader);
 		}
+
+		let windowsPart = doc.getPartByRelationshipType(AscCommon.openXml.Types.visioDocumentWindows.relationType);
+		if (windowsPart) {
+			let contentWindows = windowsPart.getDocumentContent();
+			reader = new StaxParser(contentWindows, windowsPart, context);
+			this.Windows = new AscCommonDraw.CWindows();
+			this.Windows.fromXml(reader);
+		}
+
+		let pagesPart = doc.getPartByRelationshipType(AscCommon.openXml.Types.pages.relationType);
+		if (pagesPart) {
+			let contentPages = pagesPart.getDocumentContent();
+			reader = new StaxParser(contentPages, pagesPart, context);
+			this.Windows = new AscCommonDraw.CWindows();
+			this.Windows.fromXml(reader);
+		}
 	};
 	CVisioDocument.prototype.toZip = function(zip, context) {
 		let memory = new AscCommon.CMemory();

diff --git a/tests/draw/serialize/sax-serialize.js b/tests/draw/serialize/sax-serialize.js
@@ -37,7 +37,7 @@ $(function() {
 		'id-view': 'editor_sdk'
 	});
 	//todo events
-	setTimeout(startTests, 1000);
+	setTimeout(startTests, 3000);
 
 	function startTests() {
 		QUnit.start();