правка для бага #20822

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

Excel/model/UndoRedo.js

@@ -3189,14 +3189,20 @@ UndoRedoWoorksheet.prototype = {
 			else{
 				ws._moveRange(from, to);
 			}
-			if(bUndo)
+			var worksheetView = this.wb.oApi.wb.getWorksheetById(nSheetId);
+			if(bUndo)//если на Undo перемещается диапазон из форматированной таблицы - стиль форматированной таблицы не должен цепляться
 			{
-				if(g_oUndoRedoAutoFiltersMoveData)
-				{
-					var worksheetView = this.wb.oApi.wb.getWorksheetById(nSheetId);
-					worksheetView.autoFilters._moveAutoFilters(null, null, g_oUndoRedoAutoFiltersMoveData);
-					g_oUndoRedoAutoFiltersMoveData = null;
-				}
+				worksheetView.autoFilters._clearFormatTableStyle(to);
+			}
+			if(g_oUndoRedoAutoFiltersMoveData)
+			{
+				worksheetView.autoFilters._moveAutoFilters(null, null, g_oUndoRedoAutoFiltersMoveData);
+				g_oUndoRedoAutoFiltersMoveData = null;
+			}
+			else
+			{
+				worksheetView.autoFilters.reDrawFilter(to);
+				worksheetView.autoFilters.reDrawFilter(from);
 			}
 		}
 		else if(historyitem_Worksheet_Merge == Type || historyitem_Worksheet_Unmerge == Type)

Excel/model/autofilters.js

@@ -6615,6 +6615,22 @@
 						return true;
 				}
 				return false;
+			},
+			
+			_clearFormatTableStyle: function(range)
+			{
+				if(range && typeof range == 'object')
+				{
+					var ws = this.worksheet;
+					for(var i = range.r1; i <= range.r2; i++)
+					{
+						for(var n = range.c1; n <= range.c2; n++)
+						{
+							var cell = ws.model._getCell(i, n);
+							cell.setTableStyle(null);
+						}
+					};
+				};
 			}
 		};