Merge branch 'release/v8.2.0' into develop

ONLYOFFICE · Jul 29, 2024 · bcac031 · bcac031
2 parents 900ff40 + d285be5
commit bcac031
Show file tree

Hide file tree

Showing 50 changed files with 25,333 additions and 19,914 deletions.
diff --git a/.github/workflows/common_check.yml b/.github/workflows/common_check.yml
@@ -47,8 +47,9 @@ jobs:
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/SheetMemoryTest.html
           node-qunit-puppeteer tests/word/unit-tests/paragraphContentPos.html
           node-qunit-puppeteer tests/word/content-control/block-level/cursorAndSelection.html
-          node-qunit-puppeteer tests/word/content-control/inline-level/cursorAndSelection.html
           node-qunit-puppeteer tests/word/content-control/inline-level/checkbox.html
+          node-qunit-puppeteer tests/word/content-control/inline-level/cursorAndSelection.html
+          node-qunit-puppeteer tests/word/content-control/inline-level/date-time.html
           node-qunit-puppeteer tests/word/document-calculation/floating-position/drawing.html
           node-qunit-puppeteer tests/word/document-calculation/paragraph.html
           node-qunit-puppeteer tests/word/document-calculation/table/correctBadTable.html
@@ -63,6 +64,7 @@ jobs:
           node-qunit-puppeteer tests/word/numbering/numberingCalculation.html
           node-qunit-puppeteer tests/word/numbering/numberingAutocorrect.html
           node-qunit-puppeteer tests/word/api/api.html
+          node-qunit-puppeteer tests/word/api/cross-ref.html
           node-qunit-puppeteer tests/word/api/textInput.html
           node-qunit-puppeteer tests/word/styles/displayStyle.html
           node-qunit-puppeteer tests/word/styles/paraPr.html

diff --git a/.github/workflows/dev_check.yml b/.github/workflows/dev_check.yml
@@ -45,9 +45,12 @@ jobs:
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/NumFormatParse.html
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/DataValidationTests.html
           node-qunit-puppeteer tests/cell/spreadsheet-calculation/conditionalFormattingTests.html
+          node-qunit-puppeteer tests/cell/spreadsheet-calculation/ExternalReference.html
           node-qunit-puppeteer tests/word/unit-tests/paragraphContentPos.html
           node-qunit-puppeteer tests/word/content-control/block-level/cursorAndSelection.html
+          node-qunit-puppeteer tests/word/content-control/inline-level/checkbox.html
           node-qunit-puppeteer tests/word/content-control/inline-level/cursorAndSelection.html
+          node-qunit-puppeteer tests/word/content-control/inline-level/date-time.html
           node-qunit-puppeteer tests/word/document-calculation/floating-position/drawing.html
           node-qunit-puppeteer tests/word/document-calculation/paragraph.html
           node-qunit-puppeteer tests/word/document-calculation/table/correctBadTable.html
@@ -61,6 +64,7 @@ jobs:
           node-qunit-puppeteer tests/word/numbering/numberingCalculation.html
           node-qunit-puppeteer tests/word/numbering/numberingAutocorrect.html
           node-qunit-puppeteer tests/word/api/api.html
+          node-qunit-puppeteer tests/word/api/cross-ref.html
           node-qunit-puppeteer tests/word/api/textInput.html
           node-qunit-puppeteer tests/word/styles/displayStyle.html
           node-qunit-puppeteer tests/word/styles/paraPr.html

diff --git a/cell/api.js b/cell/api.js
@@ -1795,38 +1795,41 @@ var editor;
 			var doc = new openXml.OpenXmlPackage(jsZlib, null);
 			var reader, i, j;
 
-			//core
-			var coreXmlPart = doc.getPartByRelationshipType(openXml.Types.coreFileProperties.relationType);
-			if (coreXmlPart) {
-				var contentCore = coreXmlPart.getDocumentContent();
-				if (contentCore) {
-					wb.Core = new AscCommon.CCore();
-					reader = new StaxParser(contentCore, coreXmlPart, xmlParserContext);
-					wb.Core.fromXml(reader, true);
-				}
-			}
-
-			//app
-			var appXmlPart = doc.getPartByRelationshipType(openXml.Types.extendedFileProperties.relationType);
-			if (appXmlPart) {
-				var contentApp = appXmlPart.getDocumentContent();
-				if (contentApp) {
-					wb.App = new AscCommon.CApp();
-					reader = new StaxParser(contentApp, appXmlPart, xmlParserContext);
-					wb.App.fromXml(reader, true);
-				}
-			}
-
 			//workbook
 			wbPart = doc.getPartByRelationshipType(openXml.Types.workbook.relationType);
 			if (wbPart) {
 				var contentWorkbook = wbPart.getDocumentContent();
 				wbXml = new AscCommonExcel.CT_Workbook(wb);
 				reader = new StaxParser(contentWorkbook, wbPart, xmlParserContext);
-				wbXml.fromXml(reader);
+				if (t.isOpenOOXInBrowser) {
+					wbXml.fromXml(reader);
+				} else {
+					wbXml.fromXmlSimple(reader);
+				}
 			}
 
 			if (t.isOpenOOXInBrowser) {
+				//core
+				var coreXmlPart = doc.getPartByRelationshipType(openXml.Types.coreFileProperties.relationType);
+				if (coreXmlPart) {
+					var contentCore = coreXmlPart.getDocumentContent();
+					if (contentCore) {
+						wb.Core = new AscCommon.CCore();
+						reader = new StaxParser(contentCore, coreXmlPart, xmlParserContext);
+						wb.Core.fromXml(reader, true);
+					}
+				}
+
+				//app
+				var appXmlPart = doc.getPartByRelationshipType(openXml.Types.extendedFileProperties.relationType);
+				if (appXmlPart) {
+					var contentApp = appXmlPart.getDocumentContent();
+					if (contentApp) {
+						wb.App = new AscCommon.CApp();
+						reader = new StaxParser(contentApp, appXmlPart, xmlParserContext);
+						wb.App.fromXml(reader, true);
+					}
+				}
 				//metadata
 				if (AscCommonExcel.bIsSupportDynamicArrays) {
 					let metaData = wbPart.getPartByRelationshipType(openXml.Types.metadata.relationType);