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

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

Excel/model/History.js

@@ -396,6 +396,7 @@ CHistory.prototype =
 			if (g_oUndoRedoGraphicObjects === Item.Class)
 				isRedrawAll = false;
         }
+		gUndoInsDelCellsFlag = true;
 		var oSelectRange = null;
 		if(null != Point.SelectRange)
 			oSelectRange = Point.SelectRange;

Excel/model/autofilters.js

-
+var gUndoInsDelCellsFlag = true;
 (	/**
 	 * @param {jQuery} $
 	 * @param {Window} window
@@ -1789,6 +1789,7 @@
 				var cloneData = Asc.clone(data);
 				if(!cloneData)
 					return;
+				gUndoInsDelCellsFlag = false;
 				if(cloneData.refTable)
 				{
 					if(aWs.TableParts)
@@ -4599,8 +4600,10 @@
 					}
 					else
 					{
-						cRange.start.c1 = cRange.start.c1 + val;
-						cRange.end.c1 = cRange.end.c1 + val;
+						if((cRange.start.c1 + val) >= 0)
+							cRange.start.c1 = cRange.start.c1 + val;
+						if((cRange.end.c1 + val) >= 0)
+							cRange.end.c1 = cRange.end.c1 + val;
 						if(cRange.start.c1 < 0)
 							cRange.start.c1 = 0;
 						if(cRange.end.c1 < 0)
@@ -4627,11 +4630,13 @@
 							}
 							else
 							{
-								newFirstCol.c1 = newFirstCol.c1 + val;
-								newNextCol.c1 = newNextCol.c1 + val;
+								if((newFirstCol.c1 + val) >= 0)
+									newFirstCol.c1 = newFirstCol.c1 + val;
+								if((newNextCol.c1 + val) >= 0)
+									newNextCol.c1 = newNextCol.c1 + val;
 								if(newFirstCol.c1 < 0)
 									newFirstCol.c1 = 0;
-								if(newNextCol.c11 < 0)
+								if(newNextCol.c1 < 0)
 									newNextCol.c1 = 0;
 							}
 							

Excel/view/WorksheetView.js

@@ -8167,7 +8167,8 @@
 								functionModelAction = function () {
 									fullRecalc = true;
 									t.model.insertColsBefore(_updateRangeIns.c1, _updateRangeIns.c2 - _updateRangeIns.c1 + 1);
-									t.autoFilters.insertColumn(prop, _updateRangeIns, arn);
+									if(gUndoInsDelCellsFlag)
+										t.autoFilters.insertColumn(prop, _updateRangeIns, arn);
 									t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
 									t.cellCommentator.updateCommentsDependencies(true, val, _updateRangeIns);
 								};
@@ -8182,7 +8183,8 @@
 								functionModelAction = function () {
 									fullRecalc = true;
 									t.model.insertRowsBefore(_updateRangeIns.r1, _updateRangeIns.r2 - _updateRangeIns.r1 + 1);
-									t.autoFilters.insertRows(prop,_updateRangeIns, arn);
+									if(gUndoInsDelCellsFlag)
+										t.autoFilters.insertRows(prop,_updateRangeIns, arn);
 									t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
 									t.cellCommentator.updateCommentsDependencies(true, val, _updateRangeIns);
 								};