fix: Bug 30401 - [Undo&Redo][NamedRanges]Не отображается имя диапазона в...

fix: Bug 30401 - [Undo&Redo][NamedRanges]Не отображается имя диапазона в диспетчере имен после отмены Delete Cells (http://bugzserver/show_bug.cgi?id=30401)
Bug 30403 - [NamedRanges][Undo&Redo][CoEdit]Ошибка в консоли после после Delete Cells и использования диапазона в формуле (http://bugzserver/show_bug.cgi?id=30403)

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

Excel/model/FormulaObjects/parserFormula.js

@@ -1328,38 +1328,22 @@ cName.prototype.reParse = function () {
     }
 };
 cName.prototype.addDefinedNameNode = function ( nameReParse ) {
-    if ( nameReParse ) {
-        this.reParse();
-    }
-
     if ( !this.defName || !this.defName.Ref ) {
         return this.wb.dependencyFormulas.addDefinedNameNode( this.value, null );
     }
+    return this.wb.getDefinesNames( this.defName.Name, this.ws.getId() );
+};
+cName.prototype.Calculate = function(){
+    if ( !this.defName || !this.defName.Ref ) {
+        return new cError( cErrorType.wrong_name );
+    }
 
-    var node = this.wb.getDefinesNames( this.defName.Name, this.ws.getId() ), wsR, ref, nTo;
     if(!this.defName.parsedRef){
-        this.defName.parsedRef = new parserFormula( this.defName.Ref, "", this.ws );
-        this.defName.parsedRef.parse();
+        return new cError( cErrorType.wrong_name );
     }
-    for ( var i = 0; i < this.defName.parsedRef.outStack.length; i++ ) {
-        ref = this.defName.parsedRef.outStack[i];
 
-        if ( (ref instanceof cRef || ref instanceof cRef3D || ref instanceof cArea) && ref.isValid() ) {
-            nTo = this.wb.dependencyFormulas.addNode( ref.getWsId(), ref._cells.replace( this.regSpace, "" ) );
-            this.wb.dependencyFormulas.addEdge2( node, nTo );
-        }
-        else if ( ref instanceof cArea3D && ref.isValid() ) {
-            wsR = ref.wsRange();
-            for ( var j = 0; j < wsR.length; j++ ) {
-                nTo = this.wb.dependencyFormulas.addNode( wsR[j].Id, ref._cells.replace( this.regSpace, "" ) );
-                this.wb.dependencyFormulas.addEdge2( node, nTo );
-            }
-        }
-        else if ( ref instanceof cName ){
-            this.wb.dependencyFormulas.addEdge2( node, this.defName );
-        }
-    }
-    return node;
+    return this.defName.parsedRef.calculate();
+
 };
 
 /** @constructor */
@@ -3750,17 +3734,9 @@ parserFormula.prototype = {
         if ( this.outStack.length < 1 ) {
             return this.value = new cError( cErrorType.wrong_name );
         }
-        var elemArr = [], stack = [], _tmp, numFormat = -1;
+        var elemArr = [], _tmp, numFormat = -1, currentElement = null;
         for ( var i = 0; i < this.outStack.length; i++ ) {
-            _tmp = this.outStack[i];
-            if ( _tmp instanceof cName ) {
-                _tmp = _tmp.toRef( this.ws.getId() );
-            }
-            stack[i] = _tmp;
-        }
-        var currentElement = null;
-        while ( stack.length != 0 ) {
-            currentElement = stack.shift();
+            currentElement = this.outStack[i];
             if ( currentElement.name == "(" ) {
                 continue;
             }
@@ -3784,6 +3760,9 @@ parserFormula.prototype = {
                     elemArr.push( _tmp );
                 }
             }
+            else if( currentElement.type == cElementType.name ){
+                elemArr.push( currentElement.Calculate() );
+            }
             else {
                 elemArr.push( currentElement );
             }
@@ -4243,14 +4222,6 @@ parserFormula.prototype = {
         for ( var i = 0; i < this.outStack.length; i++ ) {
             ref = this.outStack[i];
 
-            if ( ref instanceof cName ) {
-                nTo = ref.addDefinedNameNode( nameReParse );
-                this.wb.dependencyFormulas.addEdge2( node, nTo );
-//                ref = ref.toRef( this.ws.getId() );
-//                if ( ref instanceof cError )
-//                    continue;
-            }
-
             if ( (ref instanceof cRef || ref instanceof cRef3D || ref instanceof cArea || ref instanceof cArea3D) &&
                 ref.isValid() && this.outStack[i + 1] && this.outStack[i + 1] instanceof cBaseFunction &&
                 this.reRowCol.test( this.outStack[i + 1].name ) ) {
@@ -4258,12 +4229,12 @@ parserFormula.prototype = {
                 continue;
             }
 
-
-            if ( (ref instanceof cRef || ref instanceof cRef3D || ref instanceof cArea) && ref.isValid() ) {
+            if ( ref instanceof cName ) {
+                nTo = ref.addDefinedNameNode( /*nameReParse*/ );
+                this.wb.dependencyFormulas.addEdge2( node, nTo );
+            }
+            else if ( (ref instanceof cRef || ref instanceof cRef3D || ref instanceof cArea) && ref.isValid() ) {
                 nTo = this.wb.dependencyFormulas.addNode( ref.getWsId(), ref._cells.replace( this.regSpace, "" ) );
-
-//                ref.setNode( nTo );
-
                 this.wb.dependencyFormulas.addEdge2( node, nTo );
             }
             else if ( ref instanceof cArea3D && ref.isValid() ) {

Excel/model/UndoRedo.js

@@ -2866,7 +2866,7 @@ UndoRedoWorkbook.prototype = {
 		}
         else if(historyitem_Workbook_DefinedNamesAdd === Type ){
             if(bUndo){
-                this.wb.delDefinesNames( Data.newName );
+                this.wb.delDefinesNames( Data.newName, true );
                 this.wb.handlers.trigger("asc_onDelDefName")
             }
             else{
@@ -2879,7 +2879,7 @@ UndoRedoWorkbook.prototype = {
                             oConflictDefName.renameDefNameToCollaborate(this.wb.getUniqueDefinedNameFrom(oConflictDefName, true));
                     }
                 }
-                this.wb.editDefinesNames( null, Data.newName, !bUndo );
+                this.wb.editDefinesNames( null, Data.newName, true );
                 this.wb.handlers.trigger("asc_onEditDefName", null, Data.newName);
             }
             /*TODO
@@ -2898,12 +2898,12 @@ UndoRedoWorkbook.prototype = {
                 oldName = Data.oldName;
                 newName = Data.newName;
             }
-            res = this.wb.editDefinesNames( oldName, newName, bUndo );
+            res = this.wb.editDefinesNames( oldName, newName, true );
             this.wb.handlers.trigger("asc_onEditDefName", oldName, newName);
         }
         else if(historyitem_Workbook_DefinedNamesDelete === Type ){
             if(bUndo){
-                this.wb.editDefinesNames( null, Data, bUndo );
+                this.wb.editDefinesNames( null, Data, true );
                 if( Data.slaveEdge ){
                     var n;
                     for(var i = 0; i < Data.slaveEdge.length; i++){
@@ -2913,19 +2913,16 @@ UndoRedoWorkbook.prototype = {
                             this.wb.needRecalc.length++;
 
                             n = n.returnCell();
-                            n ? function(){
+                            if(n){
                                 n.formulaParsed = new parserFormula( n.formulaParsed.Formula, n.formulaParsed.cellId, n.formulaParsed.ws )
-                                n.formulaParsed.parse();
-                                n.formulaParsed.buildDependencies();
-                            }() : null;
+                            }
                         }
                     }
-                    sortDependency(this.wb);
                 }
                 this.wb.handlers.trigger("asc_onEditDefName", null, Data);
             }
             else{
-                this.wb.delDefinesNames( Data );
+                this.wb.delDefinesNames( Data, true );
             }
         }
 	}