http://bugzserver/show_bug.cgi?id=26602 - Активируется кнопка Clear Filter...

http://bugzserver/show_bug.cgi?id=26602 -  Активируется кнопка Clear Filter после применения фильтра к объединенному диапазону

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58407 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/autofilters.js

@@ -2136,7 +2136,7 @@ var gUndoInsDelCellsFlag = true;
 				}
 				else
 				{
-					if(aWs.AutoFilter && ((aWs.AutoFilter.FilterColumns && aWs.AutoFilter.FilterColumns.length) || (aWs.AutoFilter.SortState && aWs.AutoFilter.SortState.SortConditions && aWs.AutoFilter.SortState.SortConditions[0])))
+					if(aWs.AutoFilter && ((aWs.AutoFilter.FilterColumns && aWs.AutoFilter.FilterColumns.length && this._isFilterColumnsContainFilter(aWs.AutoFilter.FilterColumns)) || (aWs.AutoFilter.SortState && aWs.AutoFilter.SortState.SortConditions && aWs.AutoFilter.SortState.SortConditions[0])))
 					{
 						result = {isFilterColumns: true, isAutoFilter: true};
 					}
@@ -7416,6 +7416,20 @@ var gUndoInsDelCellsFlag = true;
 				}
 				
 				return false;
+			},
+			
+			_isFilterColumnsContainFilter: function(filterColumns)
+			{
+				if(!filterColumns || !filterColumns.length)
+					return false;
+				
+				var filterColumn;
+				for(var k = 0; k < filterColumns.length; k++)
+				{
+					filterColumn = filterColumns[k];
+					if(filterColumn && (filterColumn.ColorFilter || filterColumn.ColorFilter || filterColumn.CustomFiltersObj || filterColumn.DynamicFilter || filterColumn.Filters || filterColumn.Top10))
+						return true;
+				}
 			}
 			
 		};