fix bug 35342

if convert to boolean Area and Area3D return error value

cell/model/FormulaObjects/logicalFunctions.js

@@ -170,17 +170,15 @@
 			arg2 = arg2.getElement(0);
 		}
 
+		arg0 = arg0.tocBool();
 		if (arg0 instanceof cError) {
 			return this.value = arg0;
+		} else if (arg0 instanceof cString) {
+			return this.value = new cError(cErrorType.wrong_value_type);
+		} else if (arg0.value) {
+			return this.value = arg1 ? arg1 instanceof cEmpty ? new cNumber(0) : arg1 : new cBool(true);
 		} else {
-			arg0 = arg0.tocBool();
-			if (arg0 instanceof cString) {
-				return this.value = new cError(cErrorType.wrong_value_type);
-			} else if (arg0.value) {
-				return this.value = arg1 ? arg1 instanceof cEmpty ? new cNumber(0) : arg1 : new cBool(true);
-			} else {
-				return this.value = arg2 ? arg2 instanceof cEmpty ? new cNumber(0) : arg2 : new cBool(false);
-			}
+			return this.value = arg2 ? arg2 instanceof cEmpty ? new cNumber(0) : arg2 : new cBool(false);
 		}
 	};
 

cell/model/FormulaObjects/parserFormula.js

@@ -1012,7 +1012,7 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara
 		return this.getValue()[0].tocString();
 	};
 	cArea.prototype.tocBool = function () {
-		return this.getValue()[0].tocBool();
+		return new cError(cErrorType.wrong_value_type);
 	};
 	cArea.prototype.toString = function () {
 		var _c;
@@ -1256,7 +1256,7 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara
 		return this.getValue()[0].tocString();
 	};
 	cArea3D.prototype.tocBool = function () {
-		return this.getValue()[0].tocBool();
+		return new cError(cErrorType.wrong_value_type);
 	};
 	cArea3D.prototype.tocArea = function () {
 		var wsR = this.wsRange();