убрал gUndoInsDelCellsFlag

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

Excel/model/History.js

@@ -291,8 +291,6 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
                     }
                 }
             }
-
-			gUndoInsDelCellsFlag = true;
 		}
 		//синхронизация index и id worksheet
 		if (oRedoObjectParam.bUpdateWorksheetByModel)

Excel/model/UndoRedo.js

@@ -3530,8 +3530,6 @@ UndoRedoAutoFilters.prototype = {
 		if (bUndo == true)
 		{
 			autoFilters.Undo(Type, Data);
-			if(Data && Data.undo && !Data.undo.insCells && gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
-				autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
 		}
 		else
 			autoFilters.Redo(Type, Data);

Excel/model/autofilters.js

 "use strict";
 
-var gUndoInsDelCellsFlag = true;
 (	/**
 	 * @param {jQuery} $
 	 * @param {Window} window
@@ -1838,7 +1837,7 @@ var gUndoInsDelCellsFlag = true;
 					return;
 				if(cloneData.insCells)
 					delete cloneData.insCells;
-				gUndoInsDelCellsFlag = false;
+
 				if(cloneData.refTable)
 				{
 					if(aWs.TableParts)

Excel/view/WorksheetView.js

@@ -9546,11 +9546,7 @@
 									fullRecalc = true;
 									if(isCheckChangeAutoFilter === true)
 									{
-										if(gUndoInsDelCellsFlag == true)
-											t.autoFilters.insertColumn(prop, _updateRangeIns, arn);
-										else if(gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
-											t.autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
-										gUndoInsDelCellsFlag = true;
+										t.autoFilters.insertColumn(prop, _updateRangeIns, arn);
 									}
 									t.cellCommentator.updateCommentsDependencies(true, val, _updateRangeIns);
 									t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
@@ -9575,11 +9571,7 @@
 									fullRecalc = true;
 									if(isCheckChangeAutoFilter === true)
 									{
-										if(gUndoInsDelCellsFlag == true)
-											t.autoFilters.insertRows(prop,_updateRangeIns, _updateRangeIns);
-										else if(gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
-											t.autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
-										gUndoInsDelCellsFlag = true;
+										t.autoFilters.insertRows(prop,_updateRangeIns, _updateRangeIns);
 									}
 									t.cellCommentator.updateCommentsDependencies(true, val, _updateRangeIns);
 									t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
@@ -9598,11 +9590,11 @@
 							functionModelAction = function () {
 								fullRecalc = true;
 								t.model.insertColsBefore(_updateRangeIns.c1, _updateRangeIns.c2 - _updateRangeIns.c1 + 1);
-								if(gUndoInsDelCellsFlag == true)
-									t.autoFilters.insertColumn(prop, _updateRangeIns, arn, c_oAscInsertOptions.InsertColumns);
-								else if(gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
-									t.autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
-								gUndoInsDelCellsFlag = true;
+
+
+								t.autoFilters.insertColumn(prop, _updateRangeIns, arn, c_oAscInsertOptions.InsertColumns);
+
+
 								t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
 								t.cellCommentator.updateCommentsDependencies(true, val, _updateRangeIns);
 							};
@@ -9619,11 +9611,9 @@
 							functionModelAction = function () {
 								fullRecalc = true;
 								t.model.insertRowsBefore(_updateRangeIns.r1, _updateRangeIns.r2 - _updateRangeIns.r1 + 1);
-								if(gUndoInsDelCellsFlag == true)
-									t.autoFilters.insertRows(prop,_updateRangeIns, arn, c_oAscInsertOptions.InsertRows);
-								else if(gUndoInsDelCellsFlag && typeof gUndoInsDelCellsFlag == "object" && gUndoInsDelCellsFlag.arg1 && gUndoInsDelCellsFlag.arg2 && gUndoInsDelCellsFlag.data)
-									t.autoFilters._setColorStyleTable(gUndoInsDelCellsFlag.arg1, gUndoInsDelCellsFlag.arg2, gUndoInsDelCellsFlag.data, null, true);
-								gUndoInsDelCellsFlag = true;
+
+								t.autoFilters.insertRows(prop,_updateRangeIns, arn, c_oAscInsertOptions.InsertRows);
+
 								t.objectRender.updateDrawingObject(true, val, _updateRangeIns);
 								t.cellCommentator.updateCommentsDependencies(true, val, _updateRangeIns);
 							};