поправлен Bug #29165

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

Excel/model/autofilters.js

@@ -1943,13 +1943,32 @@ var maxIndividualValues = 10000;
 				
 				for(var i = 0; i < tableParts.length; i++ )
 				{
-					if((tableParts[i].Ref.r1 >= ref.r1 && tableParts[i].Ref.r1 <= ref.r2) || (tableParts[i].Ref.r2 >= ref.r1 && tableParts[i].Ref.r2 <= ref.r2))
+					if(this._intersectionRowRanges(tableParts[i].Ref, ref) === true)
 					{
 						this._setColorStyleTable(tableParts[i].Ref, tableParts[i]);
 					}
 				}
 			},
 			
+			_intersectionRowRanges: function(range1, range2)
+			{	
+				var res = false;
+				
+				if(!range1 || !range2)
+					return false;
+				
+				if((range1.r1 >= range2.r1 && range1.r1 <= range2.r2) || (range1.r2 >= range2.r1 && range1.r2 <= range2.r2))
+				{
+					res = true;
+				}
+				else if((range2.r1 >= range1.r1 && range2.r1 <= range1.r2) || (range2.r2 >= range1.r1 && range2.r2 <= range1.r2))
+				{
+					res = true;
+				}
+				
+				return res;
+			},
+			
 			_moveAutoFilters: function(arnTo, arnFrom, data, copyRange, offLock)
 			{
 				//проверяем покрывает ли диапазон хотя бы один автофильтр