сброс селекта при принятии изменений

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

Excel/model/History.js

@@ -354,6 +354,11 @@ CHistory.prototype =
 	                wsViews[i].objectRender.controller.recalculate(true, null);
 	            }
 	        }
+            var wsView = window["Asc"]["editor"].wb.getWorksheet();
+            if(wsView && wsView.objectRender && wsView.objectRender.controller)
+            {
+                wsView.objectRender.controller.updateOverlay();
+            }
 	    }
 
 	    if (null != Point) {
@@ -364,6 +369,11 @@ CHistory.prototype =
 	                    wsViews[i].objectRender.controller.recalculate(undefined, Point);
 	                }
 	            }
+                var wsView = window["Asc"]["editor"].wb.getWorksheet();
+                if(wsView && wsView.objectRender && wsView.objectRender.controller)
+                {
+                    wsView.objectRender.controller.updateOverlay();
+                }
 	            gUndoInsDelCellsFlag = true;
 	        }
             //синхронизация index и id worksheet

Excel/model/Workbook.js

@@ -1872,8 +1872,18 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){
 		    }
 		}
 		window["Asc"]["editor"]._loadFonts(oFontMap, function(){
-				History.Clear();
+
+                var wsViews = window["Asc"]["editor"].wb.wsViews;
+                for(var i in wsViews)
+                {
+                    if(isRealObject(wsViews[i]) && isRealObject(wsViews[i].objectRender) && isRealObject(wsViews[i].objectRender.controller))
+                    {
+                        wsViews[i].objectRender.controller.resetSelection();
+                    }
+                }
+                History.Clear();
 				History.Create_NewPoint();
+
 				History.SetSelection(null);
 				History.SetSelectionRedo(null);
 				var oHistoryPositions = null;//нужен самый последний historyitem_Workbook_SheetPositions
@@ -1896,6 +1906,7 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){
 					History.RedoAdd(oRedoObjectParam, oHistoryPositions.oClass, oHistoryPositions.nActionType, oHistoryPositions.nSheetId, oHistoryPositions.oRange, oHistoryPositions.oData);
 			
 				History.UndoRedoEnd(null, oRedoObjectParam, false);
+
 				oThis.bCollaborativeChanges = false;
 				History.Clear();
 				if(null != fCallback)