Commit 1a138c50 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

отвалилось undo при перемещении ячеек с формулами в новой сфеме перемещения.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50169 954022d7-b5bf-4e40-9824-e11837661b57
parent 974fcb99
...@@ -3577,6 +3577,7 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo){ ...@@ -3577,6 +3577,7 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo){
delete row.c[nCol0]; delete row.c[nCol0];
}); });
//lockDraw(this.workbook); //lockDraw(this.workbook);
var rec = this._moveRecalcGraph(oBBoxFrom, offset);
for(var i in aTempObj.cells) for(var i in aTempObj.cells)
{ {
var oTempRow = aTempObj.cells[i]; var oTempRow = aTempObj.cells[i];
...@@ -3592,10 +3593,16 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo){ ...@@ -3592,10 +3593,16 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo){
// var sFormula = oTempCell.getFormula(); // var sFormula = oTempCell.getFormula();
// if("" != sFormula) // if("" != sFormula)
// oTempCell.setValue("=" + sFormula); // oTempCell.setValue("=" + sFormula);
if( oTempCell.sFormula ){
this.workbook.cwf[this.Id].cells[oTempCell.getName()] = oTempCell.getName();
rec[ oTempCell.getName() ] = [ this.Id, oTempCell.getName() ];
rec.length++;
}
} }
} }
} }
var rec = this._moveRecalcGraph(oBBoxFrom, offset);
this.workbook.buildDependency(); this.workbook.buildDependency();
this.workbook.needRecalc = rec; this.workbook.needRecalc = rec;
recalc(this.workbook); recalc(this.workbook);
...@@ -3919,7 +3926,7 @@ Woorksheet.prototype._ReBuildFormulas=function(cellRange){ ...@@ -3919,7 +3926,7 @@ Woorksheet.prototype._ReBuildFormulas=function(cellRange){
} }
} }
} }
Woorksheet.prototype.renameDependencyNodes = function(offset,oBBox,rec, noDelete){ Woorksheet.prototype.renameDependencyNodes = function(offset, oBBox, rec, noDelete){
var objForRebuldFormula = this.workbook.dependencyFormulas.checkOffset(oBBox, offset, this.Id, noDelete); var objForRebuldFormula = this.workbook.dependencyFormulas.checkOffset(oBBox, offset, this.Id, noDelete);
var c = {}; var c = {};
for ( var id in objForRebuldFormula.move ){ for ( var id in objForRebuldFormula.move ){
......
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