отвалился сброс выделенных ячеек в формуле при закрытии редактора ячеек,...

отвалился сброс выделенных ячеек в формуле при закрытии редактора ячеек, поправлено выставление активного листа

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

Excel/view/WorkbookView.js

@@ -1252,29 +1252,32 @@
     this.setCellEditMode(false);
     this.controller.setStrictClose(false);
     this.controller.setFormulaEditMode(false);
-      var ws = this.getWorksheet(), isCellEditMode;
+      var ws = this.getWorksheet(), isCellEditMode, index;
 	  isCellEditMode = ws.getCellEditMode();
       ws.setCellEditMode(false);
 
       if( this.cellFormulaEnterWSOpen ){
+		  index = this.cellFormulaEnterWSOpen.model.getIndex();
+		  isCellEditMode = isCellEditMode ? isCellEditMode : this.cellFormulaEnterWSOpen.getCellEditMode();
+		  this.cellFormulaEnterWSOpen.setCellEditMode(false);
+		  if( index != ws.model.getIndex() ){
+			  this.showWorksheet(index);
+			  this.handlers.trigger("asc_onActiveSheetChanged", index);
+		  }
 		  ws = this.cellFormulaEnterWSOpen;
-		  isCellEditMode = isCellEditMode ? isCellEditMode : ws.getCellEditMode();
-		  ws.setCellEditMode(false);
-      }
+		  this.cellFormulaEnterWSOpen = null;
+     }
+
+	  for (var i in this.wsViews) {
+		  this.wsViews[i].setFormulaEditMode(false);
+	  }
 
-    if (this.cellFormulaEnterWSOpen) {
-      this.cellFormulaEnterWSOpen = null;
-      var index = ws.model.getIndex();
-      this.showWorksheet(index);
-      this.handlers.trigger("asc_onActiveSheetChanged", index);
-    }
-    if (this.getWorksheet().model.getId() == ws.model.getId()) {
       ws.updateSelection();
-    }
-    for (var i in this.wsViews) {
-      this.wsViews[i].cleanFormulaRanges()
-      this.wsViews[i].setFormulaEditMode(false);
-    }
+
+	  for (var i in this.wsViews) {
+		  this.wsViews[i].cleanFormulaRanges();
+	  }
+
     if (isCellEditMode) {
       this.handlers.trigger("asc_onEditCell", c_oAscCellEditorState.editEnd);
     }