Fix/external reference (#3110)

* [se] Fix by external links (Bug 38646)
ONLYOFFICE · Nov 18, 2022 · c79e2f4 · c79e2f4
1 parent 9b54abb
commit c79e2f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/cell/model/Workbook.js b/cell/model/Workbook.js
@@ -4259,6 +4259,7 @@
 	Workbook.prototype.removeExternalReference = function (index, addToHistory) {
 		if (index != null) {
 			var from = this.externalReferences[index - 1];
+			//this.reIndexExternalReferencesLinks(index - 1);
 			this.externalReferences.splice(index - 1, 1);
 			if (addToHistory) {
 				History.Add(AscCommonExcel.g_oUndoRedoWorkbook, AscCH.historyitem_Workbook_ChangeExternalReference,

diff --git a/cell/model/WorkbookElems.js b/cell/model/WorkbookElems.js
@@ -14642,7 +14642,7 @@ QueryTableField.prototype.clone = function() {
 		if (needGenerateRow) {
 			cell = new ExternalCell();
 			AscCommonExcel.executeInR1C1Mode(false, function () {
-				cell.Ref = new Asc.Range(t.R - 1, index, t.R - 1, index).getName();
+				cell.Ref = new Asc.Range(index, t.R - 1, index, t.R - 1).getName();
 			});
 			this.Cell.push(cell);
 		}
@@ -15215,6 +15215,7 @@ QueryTableField.prototype.clone = function() {
 	prot["asc_getData"] = prot.asc_getData;
 	prot["asc_getSource"] = prot.asc_getSource;
 	prot["asc_getId"] = prot.asc_getId;
+	prot["asc_isExternalLink"] = prot.isExternalLink;
 
 
 	window["AscCommonExcel"].CPrintPreviewState = CPrintPreviewState;

diff --git a/cell/view/WorkbookView.js b/cell/view/WorkbookView.js
@@ -5083,7 +5083,7 @@
 			var _oData = data && data[i];
 			var _eR = externalReferences[i];
 
-			if (_oData && _eR && !_oData.error) {
+			if (_oData && _eR && (_eR.isExternalLink() || !_oData.error)) {
 				requests.push(getPromise(_oData, _eR, resolveFunc));
 			}
 		}