Bug 24751 - Пропадают данные после Undo/Redo применения Merge к ячейкам

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56641 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/Workbook.js

@@ -4286,9 +4286,18 @@ Cell.prototype.setValueData = function(Val){
 		this.setValue("=" + Val.formula);
 	else if(null != Val.value)
 	{
+	    var DataOld = null;
+	    var DataNew = null;
+	    if (History.Is_On())
+	        DataOld = this.getValueData();
 	    this.setValueCleanFormula();
 	    this.oValue = Val.value.clone(this);
 	    sortDependency(this.ws.workbook);
+	    if (History.Is_On()) {
+	        DataNew = this.getValueData();
+	        if (false == DataOld.isEqual(DataNew))
+	            History.Add(g_oUndoRedoCell, historyitem_Cell_ChangeValue, this.ws.getId(), new Asc.Range(this.oId.getCol0(), this.oId.getRow0(), this.oId.getCol0(), this.oId.getRow0()), new UndoRedoData_CellSimpleData(this.oId.getRow0(), this.oId.getCol0(), DataOld, DataNew));
+	    }
     }
 	else
 		this.setValue("");