Commit 6681536b authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=26611 - поправлена ошибка при данному сценарии

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59058 954022d7-b5bf-4e40-9824-e11837661b57
parent 1d3175cd
...@@ -277,7 +277,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -277,7 +277,7 @@ var gUndoInsDelCellsFlag = true;
addAutoFilter: function (lTable, ar, openFilter, isTurnOffHistory, addFormatTableOptionsObj) { addAutoFilter: function (lTable, ar, openFilter, isTurnOffHistory, addFormatTableOptionsObj) {
var ws = this.worksheet; var ws = this.worksheet;
var bIsActiveSheet = this._isActiveSheet(); var bIsActiveSheet = this._isActiveSheet();
var bIsOpenFilter = undefined !== openFilter; var bIsOpenFilter = undefined !== openFilter && null !== openFilter;
var activeCells = null === ar ? null : ar.clone(); // ToDo Слишком много клонирования, это долгая операция var activeCells = null === ar ? null : ar.clone(); // ToDo Слишком много клонирования, это долгая операция
var aWs = this._getCurrentWS(); var aWs = this._getCurrentWS();
if(openFilter != undefined) if(openFilter != undefined)
...@@ -1627,7 +1627,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -1627,7 +1627,7 @@ var gUndoInsDelCellsFlag = true;
aWs.setRowHidden(false, bbox.r1, bbox.r2); aWs.setRowHidden(false, bbox.r1, bbox.r2);
//заносим в историю //заносим в историю
this._addHistoryObj(oldFilter, historyitem_AutoFilter_Empty, {activeCells: activeCells}, null, aWs.AutoFilter.Ref); this._addHistoryObj(oldFilter, historyitem_AutoFilter_Empty, {activeCells: activeCells}, null, activeCells);
} }
if(activeCells) if(activeCells)
......
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