При выборе диапазона с другого листа не рисуем activeRange листа.

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

Excel/view/CellEditorView.js

@@ -1751,12 +1751,12 @@
     CellEditor.prototype._changeSelection = function ( coord ) {
         var t = this;
 
-        function doChangeSelection( coord ) {
+        function doChangeSelection( coordTmp ) {
             // ToDo реализовать для слова.
             if ( c_oAscCellEditorSelectState.word === t.isSelectMode ) {
                 return;
             }
-            var pos = t._findCursorPosition( coord );
+            var pos = t._findCursorPosition( coordTmp );
             if ( pos !== undefined ) {
                 pos >= 0 ? t._selectChars( kPosition, pos ) : t._selectChars( pos );
             }

Excel/view/WorkbookView.js

@@ -540,7 +540,9 @@
       }, "onScroll": function(d) {
         self.controller.scroll(d);
       }, "getLockDefNameManagerStatus": function() {
-        return self.defNameAllowCreate
+        return self.defNameAllowCreate;
+      }, 'isActive': function() {
+        return (-1 === self.copyActiveSheet || self.wsActive === self.copyActiveSheet);
       },
 		"getCellEditMode": function() {
 			return self.isCellEditMode;
@@ -1431,7 +1433,7 @@
 
                 this.copyActiveSheet = this.wsActive;
                 if( !this.cellFormulaEnterWSOpen ){
-                    this.cellFormulaEnterWSOpen = tmpWorksheet = ws;
+                    this.cellFormulaEnterWSOpen = ws;
                 } else {
                     ws.setFormulaEditMode(false);
                 }

Excel/view/WorksheetView.js

@@ -3607,10 +3607,15 @@
 
         if ( !this.isSelectionDialogMode ) {
             this._drawCollaborativeElements( /*bIsDrawObjects*/true );
-            this._drawSelectionRange( range );
         }
-        else {
-            this._drawSelectionRange( range );
+        if ((this.isSelectionDialogMode || this.isFormulaEditMode) && !this.handlers.trigger('isActive')) {
+            if (this.isSelectionDialogMode) {
+                this._drawSelectRange(this.activeRange.clone(true));
+            } else if (this.isFormulaEditMode) {
+                this._drawFormulaRanges(this.arrActiveFormulaRanges);
+            }
+        } else {
+            this._drawSelectionRange(range);
         }
     };