cp "-t" option does not exists under FreeBSD cp

Makefile

@@ -41,7 +41,7 @@ all: $(WEBAPPS)
 
 $(WEBAPPS): $(WEBAPPS_FILES)
 	mkdir -p $(OUTPUT)/$(WEBAPPS_DIR) && \
-		cp -r -t $(OUTPUT)/$(WEBAPPS_DIR) ../$(WEBAPPS_DIR)/deploy/** 
+		cp -r ../$(WEBAPPS_DIR)/deploy/** $(OUTPUT)/$(WEBAPPS_DIR)
 
 $(WEBAPPS_FILES): $(NODE_MODULES) $(SDKJS_FILES)
 	cd ../$(WEBAPPS_DIR)/build  && \

build/Gruntfile.js

@@ -420,9 +420,11 @@ module.exports = function(grunt) {
 								'Images/placeholders/*',
 								'Images/content_controls/*',
 								'Images/cursors/*',
+								'Images/reporter/*',
 								'Native/*.js',
 								'libfont/js/fonts.*',
-								'libfont/wasm/fonts.*'
+								'libfont/wasm/fonts.*',
+								'spell/spell/*'
 							],
 							dest: path.join(deploy, 'common')
 						},

cell/.unit-tests/FormulaTests.js

@@ -598,6 +598,20 @@ $( function () {
 		}
 	}
 
+	function _getValue(from, row, col) {
+		var res;
+		if (from.type === AscCommonExcel.cElementType.array) {
+			res = from.getElementRowCol(row !== undefined ? row : 0, col !== undefined ? col : 0).getValue();
+		} else if (from.type === AscCommonExcel.cElementType.cellsRange || from.type === AscCommonExcel.cElementType.cellsRange3D) {
+			res = from.getValueByRowCol(row !== undefined ? row : 0, col !== undefined ? col : 0).getValue();
+		} else if (from.type === AscCommonExcel.cElementType.cell || from.type === AscCommonExcel.cElementType.cell3D) {
+			res = from.getValue().getValue();
+		} else {
+			res = from.getValue();
+		}
+		return res;
+	}
+
 	function consoleLog(val) {
 		//console.log(val);
 	}
@@ -10052,99 +10066,99 @@ $( function () {
 
 		oParser = new parserFormula( "XLOOKUP(14,A551:A561,C551:C561)", "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "u2" );
+		strictEqual( _getValue(oParser.calculate()), "u2" );
 
 		oParser = new parserFormula( "XLOOKUP(C565,A551:A561,B551:C561)", "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "n" );
-		strictEqual( oParser.calculate().getElementRowCol(0,1).getValue(), "m1" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "n" );
+		strictEqual( _getValue(oParser.calculate(), 0, 1), "m1" );
 
 		oParser = new parserFormula( 'XLOOKUP(1,A551:A561,B551:C561,"not found")', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "not found" );
+		strictEqual( _getValue(oParser.calculate()), "not found" );
 
 		oParser = new parserFormula( 'XLOOKUP(10,A551:A561,B551:C561,0,1,1)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "f" );
-		strictEqual( oParser.calculate().getElementRowCol(0,1).getValue(), "h3" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "f" );
+		strictEqual( _getValue(oParser.calculate(), 0, 1), "h3" );
 
 		oParser = new parserFormula( 'XLOOKUP(10,A551:A561,B551:C561,0,-1,1)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "a" );
-		strictEqual( oParser.calculate().getElementRowCol(0,1).getValue(), "a1" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "a" );
+		strictEqual( _getValue(oParser.calculate(), 0, 1), "a1" );
 
 		oParser = new parserFormula( 'XLOOKUP(10,A551:A561,B551:C561,0,0)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), 0 );
+		strictEqual( _getValue(oParser.calculate()), 0 );
 
 		oParser = new parserFormula( 'XLOOKUP(10,A551:A561,B551:C561)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "#N/A" );
+		strictEqual( _getValue(oParser.calculate()), "#N/A" );
 
 		oParser = new parserFormula( 'XLOOKUP(10,A551:A561,B551:C561,,,2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "#N/A" );
+		strictEqual( _getValue(oParser.calculate()), "#N/A" );
 
 		oParser = new parserFormula( 'XLOOKUP(10,A551:A561,B551:C561,,,-2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "#N/A" );
+		strictEqual( _getValue(oParser.calculate()), "#N/A" );
 
 		oParser = new parserFormula( 'XLOOKUP(10,A551:A561,B551:C561,,-1,-2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "#N/A" );
+		strictEqual( _getValue(oParser.calculate()), "#N/A" );
 
 		oParser = new parserFormula( 'XLOOKUP("test",A551:A561,B551:C561,,-1,2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "n" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "n" );
 
 		oParser = new parserFormula( 'XLOOKUP("tt",A551:A561,B551:C561,,-1,2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "u" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "u" );
 
 		oParser = new parserFormula( 'XLOOKUP("t???",A551:A561,B551:C561,,2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "c" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "c" );
 
 		oParser = new parserFormula( 'XLOOKUP("t???",A551:A561,B551:C561,,2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "c" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "c" );
 
 		oParser = new parserFormula( 'XLOOKUP("t?",A551:A561,B551:C561,,2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "u" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "u" );
 
 		oParser = new parserFormula( 'XLOOKUP("t?",A551:A561,B551:C561,,0)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "#N/A" );
+		strictEqual( _getValue(oParser.calculate()), "#N/A" );
 
 		oParser = new parserFormula( 'XLOOKUP("t*",A551:A561,B551:C561,,0)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "#N/A" );
+		strictEqual( _getValue(oParser.calculate()), "#N/A" );
 
 		oParser = new parserFormula( 'XLOOKUP("t*",A551:A561,B551:C561,,2)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), "c" );
-		strictEqual( oParser.calculate().getElementRowCol(0,1).getValue(), "test2" );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), "c" );
+		strictEqual( _getValue(oParser.calculate(), 0, 1), "test2" );
 
 		oParser = new parserFormula( 'XLOOKUP(1,{1,2,3},{2,2,3})', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), 2 );
+		strictEqual( _getValue(oParser.calculate(), 0, 0), 2 );
 
 		oParser = new parserFormula( 'XLOOKUP(1,{1,2,3,4},{2,2,3})', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "#VALUE!" );
+		strictEqual( _getValue(oParser.calculate()), "#VALUE!" );
 
 		oParser = new parserFormula( 'XLOOKUP(4,{1,2,6},{2,2,3},,1)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), 3 );
+		strictEqual( _getValue(oParser.calculate()), 3 );
 
 		oParser = new parserFormula( 'XLOOKUP(4,{1,2,6},{2,2,3},,-1)', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getElementRowCol(0,0).getValue(), 2 );
+		strictEqual( _getValue(oParser.calculate()), 2 );
 
 		oParser = new parserFormula( 'XLOOKUP(4,{1,2,6},{2,2,3})', "A2", ws );
 		ok( oParser.parse() );
-		strictEqual( oParser.calculate().getValue(), "#N/A" );
+		strictEqual( _getValue(oParser.calculate()), "#N/A" );
 	} );
 
 

cell/Local/api.js

@@ -142,7 +142,7 @@ var c_oAscError = Asc.c_oAscError;
 			this.LastUserSavedIndex = AscCommon.History.UserSavedIndex;
 		}
 
-		if (true === this.canSave && !this.isLongAction())
+		if (true === this.canSave && this._saveCheck())
 		{
 			var _isNaturalSave = this.IsUserSave;
 			this.canSave = false;