Commit 114bcf2b authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

this -> oThis (баг с undo для добавленного столбца после принятия изменений)....

this -> oThis (баг с undo для добавленного столбца после принятия изменений). Баг http://bugzserver/show_bug.cgi?id=19612
Убрал лишнее копирование activeRange

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48832 954022d7-b5bf-4e40-9824-e11837661b57
parent 1e023da2
...@@ -2073,13 +2073,13 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){ ...@@ -2073,13 +2073,13 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){
History.RedoAdd(oRedoObjectParam, oHistoryPositions.oClass, oHistoryPositions.nActionType, oHistoryPositions.nSheetId, oHistoryPositions.oRange, oHistoryPositions.oData); History.RedoAdd(oRedoObjectParam, oHistoryPositions.oClass, oHistoryPositions.nActionType, oHistoryPositions.nSheetId, oHistoryPositions.oRange, oHistoryPositions.oData);
History.RedoEnd(null, oRedoObjectParam); History.RedoEnd(null, oRedoObjectParam);
this.bCollaborativeChanges = false; oThis.bCollaborativeChanges = false;
History.Clear(); History.Clear();
if(null != fCallback) if(null != fCallback)
fCallback(); fCallback();
}); });
} }
} };
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
/** /**
* @constructor * @constructor
......
...@@ -7993,16 +7993,14 @@ ...@@ -7993,16 +7993,14 @@
case "insColBefore": case "insColBefore":
functionModelAction = function () { functionModelAction = function () {
fullRecalc = true; fullRecalc = true;
var ar = t.activeRange.clone(true); t.autoFilters.insertColumn(t, prop, val, arn);
t.autoFilters.insertColumn(t, prop, val, ar);
t.model.insertColsBefore(arn.c1, val); t.model.insertColsBefore(arn.c1, val);
}; };
return this._isLockedCells (new asc_Range(arn.c1, 0, arn.c1 + val - 1, gc_nMaxRow0), c_oAscLockTypeElemSubType.InsertColumns, onChangeWorksheetCallback); return this._isLockedCells (new asc_Range(arn.c1, 0, arn.c1 + val - 1, gc_nMaxRow0), c_oAscLockTypeElemSubType.InsertColumns, onChangeWorksheetCallback);
case "insColAfter": case "insColAfter":
functionModelAction = function () { functionModelAction = function () {
fullRecalc = true; fullRecalc = true;
var ar = t.activeRange.clone(true); t.autoFilters.insertColumn(t, prop, val, arn);
t.autoFilters.insertColumn(t, prop, val, ar);
t.model.insertColsAfter(arn.c2, val); t.model.insertColsAfter(arn.c2, val);
}; };
return this._isLockedCells (new asc_Range(arn.c2, 0, arn.c2 + val - 1, gc_nMaxRow0), c_oAscLockTypeElemSubType.InsertColumns, onChangeWorksheetCallback); return this._isLockedCells (new asc_Range(arn.c2, 0, arn.c2 + val - 1, gc_nMaxRow0), c_oAscLockTypeElemSubType.InsertColumns, onChangeWorksheetCallback);
...@@ -8111,8 +8109,7 @@ ...@@ -8111,8 +8109,7 @@
t.model.onStartTriggerAction(); t.model.onStartTriggerAction();
t.model.insertColsBefore(_updateRangeIns.c1, _updateRangeIns.c2 - _updateRangeIns.c1 + 1); t.model.insertColsBefore(_updateRangeIns.c1, _updateRangeIns.c2 - _updateRangeIns.c1 + 1);
t.model.onEndTriggerAction(); t.model.onEndTriggerAction();
var ar = t.activeRange.clone(true); t.autoFilters.insertColumn(t, prop, _updateRangeIns, arn);
t.autoFilters.insertColumn(t, prop, _updateRangeIns, ar);
if ( !bUndoRedo ) { if ( !bUndoRedo ) {
t.objectRender.updateDrawingObject(true, val, _updateRangeIns); t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
...@@ -8132,8 +8129,7 @@ ...@@ -8132,8 +8129,7 @@
t.model.onStartTriggerAction(); t.model.onStartTriggerAction();
t.model.insertRowsBefore(_updateRangeIns.r1, _updateRangeIns.r2 - _updateRangeIns.r1 + 1); t.model.insertRowsBefore(_updateRangeIns.r1, _updateRangeIns.r2 - _updateRangeIns.r1 + 1);
t.model.onEndTriggerAction(); t.model.onEndTriggerAction();
var ar = t.activeRange.clone(true); t.autoFilters.insertRows(t, prop,_updateRangeIns, arn);
t.autoFilters.insertRows(t, prop,_updateRangeIns, ar);
if ( !bUndoRedo ) { if ( !bUndoRedo ) {
t.objectRender.updateDrawingObject(true, val, _updateRangeIns); t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
...@@ -8193,8 +8189,7 @@ ...@@ -8193,8 +8189,7 @@
functionModelAction = function () { functionModelAction = function () {
fullRecalc = true; fullRecalc = true;
t.model.removeCols(_updateRangeDel.c1, _updateRangeDel.c2); t.model.removeCols(_updateRangeDel.c1, _updateRangeDel.c2);
var ar = t.activeRange.clone(true); t.autoFilters.insertColumn(t, prop,_updateRangeDel, arn);
t.autoFilters.insertColumn(t, prop,_updateRangeDel, ar);
if (!bUndoRedo) { if (!bUndoRedo) {
t.objectRender.updateDrawingObject(false, val, _updateRangeDel); t.objectRender.updateDrawingObject(false, val, _updateRangeDel);
} }
...@@ -8211,8 +8206,7 @@ ...@@ -8211,8 +8206,7 @@
functionModelAction = function () { functionModelAction = function () {
fullRecalc = true; fullRecalc = true;
t.model.removeRows(_updateRangeDel.r1, _updateRangeDel.r2); t.model.removeRows(_updateRangeDel.r1, _updateRangeDel.r2);
var ar = t.activeRange.clone(true); t.autoFilters.insertRows(t, prop,_updateRangeDel, arn);
t.autoFilters.insertRows(t, prop,_updateRangeDel, ar);
if (!bUndoRedo) { if (!bUndoRedo) {
t.objectRender.updateDrawingObject(false, val, _updateRangeDel); t.objectRender.updateDrawingObject(false, val, _updateRangeDel);
} }
......
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