Commit fb74edfb authored by Sergey.Konovalov's avatar Sergey.Konovalov

не пересчитывалась формула при cleanAll ячеек от которых зависела формула.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57689 954022d7-b5bf-4e40-9824-e11837661b57
parent 98f8a099
...@@ -3057,22 +3057,19 @@ Woorksheet.prototype._removeCell=function(nRow, nCol, cell){ ...@@ -3057,22 +3057,19 @@ Woorksheet.prototype._removeCell=function(nRow, nCol, cell){
var cell = row.c[nCol]; var cell = row.c[nCol];
if(null != cell) if(null != cell)
{ {
var sheetId = this.getId();
var cellId = cell.getName();
if(false == cell.isEmpty()) if(false == cell.isEmpty())
{ {
var oUndoRedoData_CellData = new UndoRedoData_CellData(cell.getValueData(), null); var oUndoRedoData_CellData = new UndoRedoData_CellData(cell.getValueData(), null);
if(null != cell.xfs) if(null != cell.xfs)
oUndoRedoData_CellData.style = cell.xfs.clone(); oUndoRedoData_CellData.style = cell.xfs.clone();
History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_RemoveCell, this.getId(), new Asc.Range(nCol, nRow, nCol, nRow), new UndoRedoData_CellSimpleData(nRow, nCol, oUndoRedoData_CellData, null)); History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_RemoveCell, sheetId, new Asc.Range(nCol, nRow, nCol, nRow), new UndoRedoData_CellSimpleData(nRow, nCol, oUndoRedoData_CellData, null));
} }
if(cell.formulaParsed) if(cell.formulaParsed)
this.workbook.dependencyFormulas.deleteMasterNodes2( this.getId(), cell.getName() ); this.workbook.dependencyFormulas.deleteMasterNodes2(sheetId, cellId);
this.workbook.needRecalc.nodes[getVertexId(sheetId, cellId)] = [sheetId, cellId];
// addToArrRecalc(this.workbook, this.getId(), cell.getName()); this.workbook.needRecalc.length++;
// if( this.workbook.dependencyFormulas.getNode(this.getId(),this.getName()) && !this.workbook.needRecalc[ getVertexId(this.getId(),cell.getName()) ] ){
// this.workbook.needRecalc[ getVertexId(this.getId(),cell.getName()) ] = [ this.getId(),cell.getName() ];
// if( this.workbook.needRecalc.length < 0) this.workbook.needRecalc.length = 0;
// this.workbook.needRecalc.length++;
// }
delete row.c[nCol]; delete row.c[nCol];
if(row.isEmpty()) if(row.isEmpty())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment