добавил в класс TablePart(autoFiletr) проверку на примененный а/ф и примененную сортировку

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

Excel/model/WorkbookElems.js

@@ -4370,6 +4370,22 @@ TablePart.prototype.changeRef = function(col, row, bIsFirst) {
 	if(this.AutoFilter)
 		this.AutoFilter.changeRef(col, row, bIsFirst);
 };
+TablePart.prototype.isApplyAutoFilter = function() {
+	var res = false;
+	
+	if(this.AutoFilter)
+		res = this.AutoFilter.isApplyAutoFilter();
+		
+	return res;
+};
+TablePart.prototype.isApplySortConditions = function() {
+	var res = false;
+	
+	if(this.SortState && this.SortState.SortConditions && this.SortState.SortConditions[0])
+		res = true;
+		
+	return res;
+};
 
 
 /** @constructor */
@@ -4426,6 +4442,23 @@ AutoFilter.prototype.changeRef = function(col, row, bIsFirst) {
 	
 	this.Ref = ref;
 };
+AutoFilter.prototype.isApplyAutoFilter = function() {
+	var res = false;
+	
+	if(this.FilterColumns && this.FilterColumns.length)
+		res = true;
+		
+	return res;
+};
+
+AutoFilter.prototype.isApplySortConditions = function() {
+	var res = false;
+	
+	if(this.SortState && this.SortState.SortConditions && this.SortState.SortConditions[0])
+		res = true;
+		
+	return res;
+};
 
 function FilterColumns() {
 	this.ColId = null;

Excel/model/autofilters.js

@@ -1621,7 +1621,7 @@ var maxIndividualValues = 10000;
 						tablePart = aWs.TableParts[i];
 						
 						//если применен фильтр или сортировка
-						if(tablePart.Ref && ((tablePart.AutoFilter && tablePart.AutoFilter.FilterColumns && tablePart.AutoFilter.FilterColumns.length) || (tablePart && tablePart.SortState && tablePart.SortState.SortConditions && tablePart.SortState.SortConditions[0])))
+						if(tablePart.isApplyAutoFilter() || tablePart.isApplySortConditions())
 						{
 							if(tablePart.Ref.containsRange(activeCell))
 							{
@@ -1639,7 +1639,7 @@ var maxIndividualValues = 10000;
 					}
 				}
 				
-				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.isApplyAutoFilter() || aWs.AutoFilter.isApplySortConditions()))
 				{
 					if(clean)
 						this._cleanFilterColumnsAndSortState(aWs.AutoFilter, activeCell);