Merge branch 'hotfix/v4.2.3'

cell/api.js

@@ -3269,6 +3269,8 @@ var editor;
     var _adjustPrint = window.AscDesktopEditor_PrintData || new Asc.asc_CAdjustPrint();
     window.AscDesktopEditor_PrintData = undefined;
 
+    var isOnePage = ((_param & 0x0100) == 0x0100);
+    _param &= 0xFF;
     if (1 == _param) {
       _adjustPrint.asc_setPrintType(Asc.c_oAscPrintType.EntireWorkbook);
       var pageSetup;

cell/model/FormulaObjects/parserFormula.js

@@ -1295,7 +1295,13 @@ cArea3D.prototype.getWS = function () {
 		return range ? range.getBBox0() : range;
 	};
 	cArea3D.prototype.isValid = function () {
-		return !!this.getRange();
+		var r = this.getRanges();
+		for (var i = 0; i < r.length; ++i) {
+			if (!r) {
+				return false;
+			}
+		}
+		return true;
 	};
 	cArea3D.prototype.countCells = function () {
 		var _wsA = this.wsRange();

cell/model/Workbook.js

@@ -5519,8 +5519,6 @@ Woorksheet.prototype._RecalculatedFunctions=function(cell,bad,setCellFormat){
                 elem = c.formulaParsed.outStack[i];
                 if ( elem instanceof AscCommonExcel.cRef || elem instanceof cRef3D || elem instanceof AscCommonExcel.cArea || elem instanceof cArea3D ) {
                     var r = elem.getRange();
-                    if ( elem instanceof cArea3D && r.length > 0 )
-                        r = r[0];
                     if ( r && r.getNumFormatStr ) {
                         var sCurFormat = c.getNumFormatStr();
                         if ( g_oDefaultFormat.Num.getFormat() == sCurFormat ) {

common/apiCommon.js

@@ -108,7 +108,8 @@
 		Success     : 3,
 		UnknownUser : 4,
 		Connections : 5,
-		ExpiredTrial: 6
+		ExpiredTrial: 6,
+		SuccessLimit: 7
 	};
 
 	var c_oRights = {
@@ -2751,6 +2752,7 @@
 	prot['UnknownUser'] = prot.UnknownUser;
 	prot['Connections'] = prot.Connections;
 	prot['ExpiredTrial'] = prot.ExpiredTrial;
+	prot['SuccessLimit'] = prot.SuccessLimit;
 
 	window['Asc']['c_oRights'] = window['Asc'].c_oRights = c_oRights;
 	prot = c_oRights;

slide/Drawing/HtmlPage.js

@@ -3290,6 +3290,9 @@ function CEditorPage(api)
 
 	this.CheckLayouts = function(bIsAttack)
 	{
+        if(window["NATIVE_EDITOR_ENJINE"] === true){
+            return;
+        }
 		var master = null;
 		if (-1 == this.m_oDrawingDocument.SlideCurrent && 0 == this.m_oLogicDocument.slideMasters.length)
 			return;