Merge branch hotfix/v7.2.2 into master

.github/workflows/check.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12
+      - name: Use Node.js 14
         uses: actions/setup-node@v1
         with:
-            node-version: 12
+            node-version: 14
       - name: Run unit tests
         run: |
           npm install -g grunt-cli node-qunit-puppeteer
@@ -30,6 +30,7 @@ jobs:
           node-qunit-puppeteer tests/word/unit-tests/paragraphContentPos.html
           node-qunit-puppeteer tests/word/document-calculation/paragraph.html
           node-qunit-puppeteer tests/word/document-calculation/table/flowTablePosition.html
+          node-qunit-puppeteer tests/word/document-calculation/textShaper/textShaper.html
           node-qunit-puppeteer tests/word/forms/forms.html
           node-qunit-puppeteer tests/word/forms/complexForm.html
           node-qunit-puppeteer tests/word/api/api.html

cell/api.js

@@ -434,7 +434,12 @@ var editor;
 
   spreadsheet_api.prototype._printDesktop = function (options) {
     window.AscDesktopEditor_PrintOptions = options;
-    window["AscDesktopEditor"]["Print"]();
+
+    let desktopOptions = {};
+    if (options && options.advancedOptions)
+      desktopOptions["nativeOptions"] = options.advancedOptions.asc_getNativeOptions();
+
+    window["AscDesktopEditor"]["Print"](JSON.stringify(desktopOptions));
     return true;
   };
 

cell/utils/utils.js

@@ -2807,6 +2807,7 @@
 			this.ignorePrintArea = null;
 
 			this.isOnlyFirstPage = null;
+			this.nativeOptions = undefined;
 
 			// ToDo сюда же start и end page index
 
@@ -2818,6 +2819,8 @@
 		asc_CAdjustPrint.prototype.asc_setPageOptionsMap = function (val) { this.pageOptionsMap = val; };
 		asc_CAdjustPrint.prototype.asc_getIgnorePrintArea = function () { return this.ignorePrintArea; };
 		asc_CAdjustPrint.prototype.asc_setIgnorePrintArea = function (val) { this.ignorePrintArea = val; };
+		asc_CAdjustPrint.prototype.asc_getNativeOptions = function () { return this.nativeOptions; };
+		asc_CAdjustPrint.prototype.asc_setNativeOptions = function (val) { this.nativeOptions = val; };
 
 		/** @constructor */
 		function asc_CLockInfo () {
@@ -3632,6 +3635,8 @@
 		prot["asc_setPageOptionsMap"] = prot.asc_setPageOptionsMap;
 		prot["asc_getIgnorePrintArea"] = prot.asc_getIgnorePrintArea;
 		prot["asc_setIgnorePrintArea"] = prot.asc_setIgnorePrintArea;
+		prot["asc_getNativeOptions"] = prot.asc_getNativeOptions;
+		prot["asc_setNativeOptions"] = prot.asc_setNativeOptions;
 
 		window["AscCommonExcel"].asc_CLockInfo = asc_CLockInfo;
 

common/Charts/ChartsDrawer.js

@@ -13958,7 +13958,7 @@ valAxisChart.prototype = {
 					return;
 				}
 
-				var stepX = points[1] ? Math.abs(points[1].pos - points[0].pos) : Math.abs(points[1].pos - this.chartProp.chartGutter._bottom / this.chartProp.pxToMM);
+				var stepX = points[1] ? Math.abs(points[1].pos - points[0].pos) : Math.abs(points[0].pos - this.chartProp.chartGutter._bottom / this.chartProp.pxToMM);
 				minorStep = stepX / minorLinesCount;
 				posY = this.valAx.posY;
 
@@ -14464,7 +14464,7 @@ axisChart.prototype = {
 				return;
 			}
 
-			var stepX = points[1] ? Math.abs(points[1].pos - points[0].pos) : Math.abs(points[1].pos - this.chartProp.chartGutter._bottom / this.chartProp.pxToMM);
+			var stepX = points[1] ? Math.abs(points[1].pos - points[0].pos) : Math.abs(points[0].pos - this.chartProp.chartGutter._bottom / this.chartProp.pxToMM);
 			minorStep = stepX / minorLinesCount;
 			posY = this.axis.posY;
 

common/Drawings/Format/GraphicFrame.js

@@ -1399,7 +1399,9 @@ CGraphicFrame.prototype.IsThisElementCurrent = function()
         newGraphicObject.graphicObject = Graphic;
         return newGraphicObject;
     };
-
+    CGraphicFrame.prototype.Get_ShapeStyleForPara = function() {
+        return null;
+    };
     function ConvertToWordTableBorder(oBorder) {
         if(!oBorder) {
             return undefined;
@@ -1502,7 +1504,7 @@ CGraphicFrame.prototype.IsThisElementCurrent = function()
         AscCommon.g_oIdCounter.m_bLoad = bLoadVal;
         AscCommon.g_oIdCounter.m_bRead = bRead;
         oRow.Set_Height(Math.max(1, fRowHeight - fMaxTopMargin - fMaxBottomMargin - fMaxTopBorder/2 - fMaxBottomBorder/2), Asc.linerule_AtLeast);
-    };
+    }
     //--------------------------------------------------------export----------------------------------------------------
     window['AscFormat'] = window['AscFormat'] || {};
     window['AscFormat'].CGraphicFrame = CGraphicFrame;

common/Drawings/Format/Shape.js

@@ -1179,7 +1179,7 @@ CShape.prototype.convertToWord = function (document) {
 };
 
 CShape.prototype.convertToPPTX = function (drawingDocument, worksheet, bIsAddMath) {
-    var c = new CShape();
+    let c = new CShape();
     c.setWordShape(false);
     c.setBDeleted(false);
     c.setWorksheet(worksheet);
@@ -1194,21 +1194,26 @@ CShape.prototype.convertToPPTX = function (drawingDocument, worksheet, bIsAddMat
         c.setStyle(this.style.createDuplicate());
     }
     if (this.textBoxContent) {
-        var tx_body = new AscFormat.CTextBody();
+        let tx_body = new AscFormat.CTextBody();
         tx_body.setParent(c);
         if (this.bodyPr) {
             tx_body.setBodyPr(this.bodyPr.createDuplicate());
         }
-        var new_content = new AscFormat.CDrawingDocContent(tx_body, drawingDocument, 0, 0, 0, 0, false, false, true);
-        new_content.Internal_Content_RemoveAll();
-        var paragraphs = this.textBoxContent.Content;
-
-        var index = 0;
-        for (var i = 0; i < paragraphs.length; ++i) {
-            var cur_par = paragraphs[i];
-            if (cur_par instanceof Paragraph) {
-                var new_paragraph = ConvertParagraphToPPTX(cur_par, drawingDocument, new_content, bIsAddMath);
-                new_content.Internal_Content_Add(index++, new_paragraph, false);
+        let new_content = new AscFormat.CDrawingDocContent(tx_body, drawingDocument, 0, 0, 0, 0, false, false, true);
+        let aContent = this.textBoxContent.Content;
+        let aNewParagraphs = [];
+        for (let nIdx = 0; nIdx < aContent.length; ++nIdx) {
+            let oCurElement = aContent[nIdx];
+            if (oCurElement instanceof AscCommonWord.Paragraph) {
+                let oParagraph = ConvertParagraphToPPTX(oCurElement, drawingDocument, new_content, bIsAddMath);
+                aNewParagraphs.push(oParagraph);
+            }
+        }
+        if(aNewParagraphs.length > 0) {
+            new_content.Internal_Content_RemoveAll();
+            for (let nIdx = 0; nIdx < aNewParagraphs.length; ++nIdx) {
+                let oParagraph = aNewParagraphs[nIdx];
+                new_content.Internal_Content_Add(nIdx, oParagraph, false);
             }
         }
         tx_body.setContent(new_content);

common/Local/common.js

@@ -62,25 +62,29 @@
 		}
 	};
 
-	AscCommon.baseEditorsApi.prototype["asc_setIsReadOnly"] = function(value, is_from_app)
+	AscCommon.baseEditorsApi.prototype["local_sendEvent"] = function()
+	{
+		return this.sendEvent.apply(this, arguments);
+	};
+
+	AscCommon.baseEditorsApi.prototype["asc_setLocalRestrictions"] = function(value, is_from_app)
 	{
-		if (value)
+		this.localRestrintions = value;
+		if (value !== Asc.c_oAscLocalRestrictionType.None)
 			this.asc_addRestriction(Asc.c_oAscRestrictionType.View);
 		else
 			this.asc_removeRestriction(Asc.c_oAscRestrictionType.View);
 
 		if (is_from_app)
 			return;
 
-		window["AscDesktopEditor"] && window["AscDesktopEditor"]["SetIsReadOnly"] && window["AscDesktopEditor"]["SetIsReadOnly"](value);
-	};
-	AscCommon.baseEditorsApi.prototype["asc_isReadOnly"] = function()
-	{
-		return this.isRestrictionView();
+		window["AscDesktopEditor"] && window["AscDesktopEditor"]["SetLocalRestrictions"] && window["AscDesktopEditor"]["SetLocalRestrictions"](value);
 	};
-	AscCommon.baseEditorsApi.prototype["local_sendEvent"] = function()
+	AscCommon.baseEditorsApi.prototype["asc_getLocalRestrictions"] = function()
 	{
-		return this.sendEvent.apply(this, arguments);
+		if (undefined === this.localRestrintions)
+			return Asc.c_oAscLocalRestrictionType.None;
+		return this.localRestrintions;
 	};
 })(window);
 
@@ -441,7 +445,25 @@ AscCommon.InitDragAndDrop = function(oHtmlElement, callback) {
             editor.endInlineDropTarget(e);
 
 			var _files = window["AscDesktopEditor"]["GetDropFiles"]();
-			if (0 == _files.length)
+			let countInserted = 0;
+			if (0 !== _files.length)
+			{
+				let countInserted = 0;
+				for (var i = 0; i < _files.length; i++)
+				{
+					if (window["AscDesktopEditor"]["IsImageFile"](_files[i]))
+					{
+						if (_files[i] === "")
+							continue;
+						var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](_files[i]);
+						editor.AddImageUrlAction(AscCommon.g_oDocumentUrls.getImageUrl(_url));
+						++countInserted;
+						break;
+					}
+				}
+			}
+
+			if (0 === countInserted)
 			{
                 // test html
                 var htmlValue = e.dataTransfer.getData("text/html");
@@ -458,20 +480,6 @@ AscCommon.InitDragAndDrop = function(oHtmlElement, callback) {
                     return;
                 }
 			}
-			else
-			{
-                for (var i = 0; i < _files.length; i++)
-                {
-                    if (window["AscDesktopEditor"]["IsImageFile"](_files[i]))
-                    {
-						if (_files[i] == "")
-							continue;
-						var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](_files[i]);
-						editor.AddImageUrlAction(AscCommon.g_oDocumentUrls.getImageUrl(_url));
-                        break;
-                    }
-                }
-            }
 		};
 	}
 };

common/apiBase.js

@@ -1086,6 +1086,7 @@
 		}
 		this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Open);
 		this.sendEvent('asc_onDocumentContentReady');
+		this.CoAuthoringApi.sendClientLog("debug", "onDocumentContentReady");
 
 		if (window.g_asc_plugins)
             window.g_asc_plugins.onPluginEvent("onDocumentContentReady");
@@ -1478,6 +1479,7 @@
 					t.setViewModeDisconnect(AscCommon.getEnableDownloadByCloseCode(code));
 					t.disconnectOnSave = {code: code, reason: reason};
 				} else {
+					t.CoAuthoringApi.sendClientLog('debug', 'disconnect code:' + code + ';reason:' + reason);
 					t.CoAuthoringApi.disconnect(code, reason);
 				}
 			}
@@ -2447,7 +2449,13 @@
 	};
 	baseEditorsApi.prototype.asc_getUrlType = function(url)
 	{
-		return AscCommon.getUrlType(url);
+		let res = AscCommon.getUrlType(url);
+		if (window["AscDesktopEditor"] && window["AscDesktopEditor"]["IsLocalFile"]() &&
+			(res === AscCommon.c_oAscUrlType.Invalid || !(AscCommon.rx_allowedProtocols.test(url) || /^(www.)|@/i.test(url))))
+		{
+			res = AscCommon.c_oAscUrlType.Unsafe;
+		}
+		return res;
 	};
 	baseEditorsApi.prototype.asc_prepareUrl = function(url)
 	{

common/commonDefines.js

@@ -771,6 +771,13 @@ var lcid_haLatn = 0x7c68; // Hausa, Latin
 		                      // открывается именно просмотрщик.
 	};
 
+	var c_oAscLocalRestrictionType = {
+		None		: 0x00,
+		ReadOnly	: 0x01,
+		Locked		: 0x02,
+		Nosafe		: 0x04
+	};
+
 	// Режимы отрисовки
 	var c_oAscFontRenderingModeType = {
 		noHinting             : 1,
@@ -4232,6 +4239,12 @@ var lcid_haLatn = 0x7c68; // Hausa, Latin
 	prot['OnlySignatures'] = c_oAscRestrictionType.OnlySignatures;
 	prot['View']           = c_oAscRestrictionType.View;
 
+	prot = window['Asc']['c_oAscLocalRestrictionType'] = window['Asc'].c_oAscLocalRestrictionType = c_oAscLocalRestrictionType;
+	prot['None']     = c_oAscLocalRestrictionType.None;
+	prot['ReadOnly'] = c_oAscLocalRestrictionType.ReadOnly;
+	prot['Locked']   = c_oAscLocalRestrictionType.Locked;
+	prot['Nosafe']   = c_oAscLocalRestrictionType.Nosafe;
+
 
 	prot =  window["AscCommon"]["c_oAscCellAnchorType"] = window["AscCommon"].c_oAscCellAnchorType = c_oAscCellAnchorType;
 	prot["cellanchorAbsolute"] = prot.cellanchorAbsolute;

common/docscoapi.js

@@ -252,6 +252,11 @@
     }
   };
 
+  CDocsCoApi.prototype.sendClientLog = function(level, msg) {
+    if (this._CoAuthoringApi && this._onlineWork) {
+      this._CoAuthoringApi.sendClientLog(level, msg);
+    }
+  };
   CDocsCoApi.prototype.sendCursor = function(cursor) {
     if (this._CoAuthoringApi && this._onlineWork) {
       this._CoAuthoringApi.sendCursor(cursor);
@@ -1028,6 +1033,10 @@
     }
   };
 
+  DocsCoApi.prototype.sendClientLog = function(level, msg) {
+    this._send({'type': 'clientLog', 'level': level, 'msg': msg});
+  };
+
   DocsCoApi.prototype.sendCursor = function(cursor) {
     if (typeof cursor === 'string') {
       this._send({"type": "cursor", "cursor": cursor});