http://bugzserver/show_bug.cgi?id=30566 - [CoEdit]Ошибка в консоли при...

http://bugzserver/show_bug.cgi?id=30566 -  [CoEdit]Ошибка в консоли при построении форматированной таблицы поверх только что переданной

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

Common/editorscommon.js

@@ -1277,7 +1277,7 @@ parserHelper.prototype.checkDataRange = function (model, wb, dialogType, dataRan
 				return c_oAscError.ID.MaxDataSeriesError;
 		} else if (c_oAscSelectionDialogType.FormatTable === dialogType) {
 			// ToDo убрать эту проверку, заменить на более грамотную после правки функции _searchFilters
-			if ('error' === wb.getWorksheet().autoFilters._searchFilters(dataRange, false))
+			if (true === wb.getWorksheet().autoFilters.isRangeIntersectionTableOrFilter(dataRange))
 				return c_oAscError.ID.AutoFilterDataRangeError;
 		}
 	}

Excel/api.js

@@ -712,9 +712,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
     ws.sortColFilter(type, cellId, displayName);
   };
 
-  spreadsheet_api.prototype.asc_getAddFormatTableOptions = function() {
+  spreadsheet_api.prototype.asc_getAddFormatTableOptions = function(range) {
     var ws = this.wb.getWorksheet();
-    return ws.getAddFormatTableOptions();
+    return ws.getAddFormatTableOptions(range);
   };
 
   spreadsheet_api.prototype.asc_clearFilter = function() {

Excel/apiDefines.js

@@ -55,6 +55,7 @@ var c_oAscError = {
     AutoFilterChangeFormatTableError: -51,
     AutoFilterChangeError: -52,
 	AutoFilterMoveToHiddenRangeError: -53,
+	LockedAllError: -54,
 	
 	PasteMaxRangeError: - 65,
 	

Excel/model/autofilters.js

@@ -626,7 +626,7 @@ var maxIndividualValues = 10000;
 					aWs.workbook.handlers.trigger("asc_onError", c_oAscError.ID.AutoFilterDataRangeError, c_oAscError.Level.NoCritical);
 					result = false;
 				}
-				else if(styleName && addFormatTableOptionsObj.isTitle === false && this._isEmptyCellsUnderRange(activeRange) == false && this._isPartTablePartsUnderRange(activeRange))//add format table without title if down another format table
+				else if(styleName && addFormatTableOptionsObj && addFormatTableOptionsObj.isTitle === false && this._isEmptyCellsUnderRange(activeRange) == false && this._isPartTablePartsUnderRange(activeRange))//add format table without title if down another format table
 				{
 					aWs.workbook.handlers.trigger("asc_onError", c_oAscError.ID.AutoFilterChangeFormatTableError, c_oAscError.Level.NoCritical);
 					result = false;
@@ -963,11 +963,14 @@ var maxIndividualValues = 10000;
 				return result;
 			},
 			
-			getAddFormatTableOptions: function(activeCells)
+			getAddFormatTableOptions: function(activeCells, userRange)
 			{
 				var aWs = this._getCurrentWS();
 				var objOptions = new AddFormatTableOptions();
 				
+				if(userRange)
+					activeCells = Asc.g_oRangeCache.getAscRange(userRange);
+				
 				var alreadyAddFilter = this._searchFilters(activeCells, false);
 				//в случае если меняем стиль фильтра
 				if((alreadyAddFilter && alreadyAddFilter.changeStyle) ||(alreadyAddFilter && !alreadyAddFilter.containsFilter && !alreadyAddFilter.all))
@@ -1893,6 +1896,25 @@ var maxIndividualValues = 10000;
 				return false;
 			},
 			
+			isRangeIntersectionTableOrFilter: function(range)
+			{
+				var aWs = this._getCurrentWS();
+				var tableParts = aWs.TableParts;
+				
+				for(var i = 0; i < tableParts.length; i++ )
+				{
+					if(range.intersection(tableParts[i].Ref))
+					{
+						return true;
+					}
+				}
+				
+				if(aWs.AutoFilter && aWs.AutoFilter.Ref && range.intersection(aWs.AutoFilter.Ref))
+					return true;
+				
+				return false;
+			},
+			
 			_setStyleTablePartsAfterOpenRows: function(ref)
 			{
 				var aWs = this._getCurrentWS();

Excel/view/WorksheetView.js

@@ -10746,6 +10746,7 @@
 			var onChangeAutoFilterCallback = function (isSuccess) {
 				if (false === isSuccess)
 				{
+					t.model.workbook.handlers.trigger("asc_onError", c_oAscError.ID.LockedAllError, c_oAscError.Level.NoCritical);
 					t.handlers.trigger("selectionChanged", t.getSelectionInfo());
 					return;
 				}
@@ -10822,9 +10823,9 @@
 			this._isLockedAll(onChangeAutoFilterCallback);
 		};
 
-		WorksheetView.prototype.getAddFormatTableOptions = function () {
+		WorksheetView.prototype.getAddFormatTableOptions = function (range) {
 			var ar = this.activeRange.clone(true);
-			return this.autoFilters.getAddFormatTableOptions(ar);
+			return this.autoFilters.getAddFormatTableOptions(ar, range);
 		};
 		
 		WorksheetView.prototype.clearFilter = function () {