Commit 67630a88 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=30039 - [CoEdit] Ошибка в консоли при...

http://bugzserver/show_bug.cgi?id=30039 -  [CoEdit] Ошибка в консоли при принятии изменений после применения Custom Filter и Delete Cells

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64093 954022d7-b5bf-4e40-9824-e11837661b57
parent 78b05fe1
......@@ -1013,7 +1013,20 @@ var maxIndividualValues = 10000;
{
this._moveAutoFilters(null, null, data);
}
else if(type === historyitem_AutoFilter_Change/* && cloneData.oldFilter && cloneData.newFilterRef*/)//добавление/удаление строк/столбцов
else if(type === historyitem_AutoFilter_Empty)//было удаление, на undo добавляем
{
if(cloneData.TableStyleInfo)
{
if(!aWs.TableParts)
aWs.TableParts = [];
aWs.TableParts[aWs.TableParts.length] = cloneData;
aWs.workbook.dependencyFormulas.addTableName(cloneData.DisplayName, aWs, cloneData.Ref);
this._setColorStyleTable(cloneData.Ref, cloneData, null, true);
}
else
aWs.AutoFilter = cloneData;
}
else if(type === historyitem_AutoFilter_Change)//добавление/удаление строк/столбцов
{
if(aWs.AutoFilter && cloneData.newFilterRef.isEqual(aWs.AutoFilter.Ref))
aWs.AutoFilter = cloneData.oldFilter.clone(null);
......@@ -1021,7 +1034,7 @@ var maxIndividualValues = 10000;
{
for(var l = 0; l < aWs.TableParts.length; l++)
{
if(cloneData.newFilterRef && cloneData.newFilterRef.isEqual(aWs.TableParts[l].Ref))
if(cloneData.newFilterRef && cloneData.oldFilter && cloneData.oldFilter.DisplayName === aWs.TableParts[l].DisplayName)
{
aWs.TableParts[l] = cloneData.oldFilter.clone(null);
......
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