Commit 1b32f654 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

добавил проверки

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60569 954022d7-b5bf-4e40-9824-e11837661b57
parent 9a71d846
...@@ -2278,6 +2278,9 @@ var gUndoInsDelCellsFlag = true; ...@@ -2278,6 +2278,9 @@ var gUndoInsDelCellsFlag = true;
reDrawFilter: function(range) reDrawFilter: function(range)
{ {
if(!range)
return;
var aWs = this._getCurrentWS(); var aWs = this._getCurrentWS();
var tableParts = aWs.TableParts; var tableParts = aWs.TableParts;
if(tableParts) if(tableParts)
...@@ -7427,9 +7430,8 @@ var gUndoInsDelCellsFlag = true; ...@@ -7427,9 +7430,8 @@ var gUndoInsDelCellsFlag = true;
var buttons = this.allButtonAF; var buttons = this.allButtonAF;
for(var n = 0; n < buttons.length; n++) for(var n = 0; n < buttons.length; n++)
{ {
if(((filter.AutoFilter && buttons[n].inFilter == filter.AutoFilter.Ref) || buttons[n].inFilter == filter.Ref) && buttons[n].hiddenRows.length) if(((filter.AutoFilter && buttons[n].inFilter == filter.AutoFilter.Ref) || buttons[n].inFilter == filter.Ref) && buttons[n].hiddenRows && buttons[n].hiddenRows.length)
{ {
var arrHiddens = buttons[n].hiddenRows; var arrHiddens = buttons[n].hiddenRows;
for(var row = 0; row < arrHiddens.length; row++) for(var row = 0; row < arrHiddens.length; row++)
{ {
...@@ -7452,7 +7454,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -7452,7 +7454,7 @@ var gUndoInsDelCellsFlag = true;
for(var n = 0; n < buttons.length; n++) for(var n = 0; n < buttons.length; n++)
{ {
var rangeButton = this._idToRange(buttons[n].id); var rangeButton = this._idToRange(buttons[n].id);
if((buttons[n].inFilter.isEqual(refFilter)) && rangeButton.c1 === (ColId + refFilter.c1) && buttons[n].hiddenRows.length) if((buttons[n].inFilter.isEqual(refFilter)) && rangeButton.c1 === (ColId + refFilter.c1) && buttons[n].hiddenRows && buttons[n].hiddenRows.length)
{ {
var arrHiddens = buttons[n].hiddenRows; var arrHiddens = buttons[n].hiddenRows;
for(var row = 0; row < arrHiddens.length; row++) for(var row = 0; row < arrHiddens.length; row++)
......
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