fix: Bug 30490 - [NamedRanges] Имя диапазона, включающего в себя ячейку A1, не...

fix: Bug 30490 - [NamedRanges] Имя диапазона, включающего в себя ячейку A1, не отображается при переоткрытии документа или подключения второго пользователя (http://bugzserver/show_bug.cgi?id=30490)

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

Excel/model/UndoRedo.js

@@ -2875,7 +2875,7 @@ UndoRedoWorkbook.prototype = {
                     lsID === null || lsID === undefined ? null : lsID = this.wb.getWorksheet(Data.newName.LocalSheetId).getId();
                     if( this.wb.isDefinedNamesExists(name,lsID) ){
                         var oConflictDefName = this.wb.getDefinesNames(name,lsID);
-                        if(null != oConflictDefName)
+                        if(oConflictDefName)
                             oConflictDefName.renameDefNameToCollaborate(this.wb.getUniqueDefinedNameFrom(oConflictDefName, true));
                     }
                     this.wb.handlers.trigger("asc_onLockDefNameManager",c_oAscDefinedNameReason.OK);
@@ -2901,7 +2901,7 @@ UndoRedoWorkbook.prototype = {
                     lsID === null || lsID === undefined ? null : lsID = this.wb.getWorksheet(Data.newName.LocalSheetId).getId();
                     if( this.wb.isDefinedNamesExists(name,lsID) ){
                         var oConflictDefName = this.wb.getDefinesNames(name,lsID);
-                        if(null != oConflictDefName)
+                        if(oConflictDefName)
                             oConflictDefName.renameDefNameToCollaborate(this.wb.getUniqueDefinedNameFrom(oConflictDefName, true));
                     }
                     this.wb.handlers.trigger("asc_onLockDefNameManager",c_oAscDefinedNameReason.OK);

Excel/view/WorkbookView.js

@@ -1977,41 +1977,24 @@
             var ws = this.getWorksheet(),
                 t = this,
                 selectNameChange = function(){
-                    var ws = t.getWorksheet();
-                    ws.changeSelectionDone();
                     t._onSelectionNameChanged(ws.getSelectionName(/*bRangeText*/false));
                 };
 
-//            if( oldName ){
-
             var editDefinedNamesCallback = function (res) {
                 if (res) {
                     t.model.editDefinesNames(oldName, newName);
                     t.handlers.trigger("asc_onEditDefName", oldName, newName);
                     t.handlers.trigger("asc_onRefreshDefNameList");
-//                        t.handlers.trigger("asc_onLockDefNameManager",c_oAscDefinedNameReason.LockDefNameManager);
                     selectNameChange();
                 }
             };
-            var defNameId
+            var defNameId;
             if( oldName ){
                 defNameId = t.model.getDefinedName(oldName).nodeId;
             }
-//            else{
-//                defNameId = t.model.getDefinedName(newName).nodeId;
-//            }
 
             ws._isLockedDefNames(editDefinedNamesCallback, defNameId);
 
-//            }
-//            else{
-//                this.model.editDefinesNames(oldName, newName);
-//                this.handlers.trigger("asc_onDefName");
-//                this.handlers.trigger("asc_onRefreshDefNameList");
-////                this.handlers.trigger("asc_onLockDefNameManager",c_oAscDefinedNameReason.LockDefNameManager);
-//                selectNameChange();
-//            }
-
         };
 
         WorkbookView.prototype.delDefinedNames = function (oldName) {
@@ -2028,6 +2011,7 @@
                     if (res) {
                         t.handlers.trigger("asc_onDelDefName", t.model.delDefinesNames(oldName));
                         t.handlers.trigger("asc_onRefreshDefNameList");
+                        t._onSelectionNameChanged(ws.getSelectionName(/*bRangeText*/false));
                     }
                 };
                 var defNameId = t.model.getDefinedName(oldName).nodeId;