http://bugzserver/show_bug.cgi?id=27796 - [AutoSave] Дублирование кнопок...

http://bugzserver/show_bug.cgi?id=27796 - [AutoSave] Дублирование кнопок автофильтра фильтрованного диапазона с объединенными ячейками после drag&drop

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

Excel/model/WorkbookElems.js

@@ -4536,6 +4536,16 @@ AutoFilter.prototype.getType = function(F)
 	return g_nFiltersType.autoFilter;
 };
 
+AutoFilter.prototype.cleanFilters = function() {
+	if(!this.FilterColumns)
+		return;
+	
+	for(var i = 0; i < this.FilterColumns.length; i++)
+	{
+		this.FilterColumns[i].clean();
+	}
+};
+
 function FilterColumns() {
 	this.ColId = null;
 	this.CustomFiltersObj = null;
@@ -4644,7 +4654,7 @@ FilterColumn.prototype.isHideValue = function(val, isDateTimeFormat, top10Length
 		res = this.Top10.isHideValue(val, top10Length);
 	return res;
 };
-FilterColumn.prototype.clean = function(val) {
+FilterColumn.prototype.clean = function() {
 	this.Filters = null;
 	this.CustomFiltersObj = null;
 	this.DynamicFilter = null;

Excel/model/autofilters.js

@@ -1704,9 +1704,9 @@ var maxIndividualValues = 10000;
 							}
 
 							if(!data && findFilters[i].AutoFilter && findFilters[i].AutoFilter.FilterColumns)
-								findFilters[i].AutoFilter.FilterColumns = null;
+								findFilters[i].AutoFilter.cleanFilters();
 							else if(!data && findFilters[i] && findFilters[i].FilterColumns)
-								findFilters[i].FilterColumns = null;
+								findFilters[i].cleanFilters();
 							else if(data && data[i] && data[i].AutoFilter && data[i].AutoFilter.FilterColumns)
 								findFilters[i].AutoFilter.FilterColumns = data[i].AutoFilter.FilterColumns;
 							else if(data && data[i] && data[i].FilterColumns)