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

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

Excel/model/CollaborativeEditing.js

@@ -292,9 +292,9 @@
 				if (bCheckRedraw || bRedrawGraphicObjects)
 					this.handlers.trigger("showDrawingObjects");
 
-                if(bUnlockDefName){
+//                if(bUnlockDefName){
                     this.handlers.trigger("unlockDefName");
-                }
+//                }
 
 				if (0 === this.m_nUseType)
 					this.m_nUseType = 1;

Excel/view/WorkbookView.js

@@ -428,7 +428,8 @@
 				"onStopFormatPainter"		: function () {self.handlers.trigger("asc_onStopFormatPainter");},
 				"onDocumentPlaceChanged"	: function () {self._onDocumentPlaceChanged();},
 				"updateSheetViewSettings"	: function () {self.handlers.trigger("asc_onUpdateSheetViewSettings");},
-				"onScroll"					: function (d) {self.controller.scroll(d);}
+				"onScroll"					: function (d) {self.controller.scroll(d);},
+                "getLockDefNameManagerStatus":function(){return self.defNameAllowCreate}
 			});
 
 			this.model.handlers.add("cleanCellCache", function (wsId, oRanges, canChangeColWidth, bLockDraw, updateHeight) {
@@ -534,6 +535,8 @@
 				self.handlers.trigger("asc_onSheetsChanged");
 			});
 
+            this.handlers.add("asc_onLockDefNameManager",function(reason){self.defNameAllowCreate = !(reason == c_oAscDefinedNameReason.LockDefNameManager);})
+
 			this.cellCommentator = new CCellCommentator({
 				model: new WorkbookCommentsModel(this.handlers),
 				collaborativeEditing: this.collaborativeEditing,
@@ -1523,14 +1526,21 @@
 			if (this.skipHelpSelector)
 				return;
 			// ToDo для ускорения можно завести объект, куда класть результаты поиска по формулам и второй раз не искать.
-			var arrResult = [];
-			if (isFormula && formulaName) {
-				formulaName = formulaName.toUpperCase();
-				for (var i = 0; i < this.formulasList.length; ++i) {
-					if (0 === this.formulasList[i].indexOf(formulaName))
-						arrResult.push(this.formulasList[i]);
-				}
-			}
+            var arrResult = [], defNamesList, defName;
+            if (isFormula && formulaName) {
+                formulaName = formulaName.toUpperCase();
+                for (var i = 0; i < this.formulasList.length; ++i) {
+                    if (0 === this.formulasList[i].indexOf(formulaName))
+                        arrResult.push(this.formulasList[i]);
+                }
+                /*defNamesList = this.getDefinedNames(c_oAscGetDefinedNamesList.WorksheetWorkbook)
+                for(var id in defNamesList){
+                    defName = defNamesList[id];
+                    console.log(defName.Name)
+                    if (0 === defName.Name.toLowerCase().indexOf(formulaName.toLowerCase()))
+                        arrResult.push(defName.Name);
+                }*/
+            }
 			if (0 < arrResult.length) {
 				this.popUpSelector.show(true, arrResult, this.getWorksheet().getActiveCellCoord());
 				this.lastFormulaPos = formulaPos;

Excel/view/WorksheetView.js

@@ -10047,17 +10047,17 @@
                 _C2H50H_ = this.model.workbook.getDefinesNames( reference, this.model.workbook.getActiveWs().getId() );
 
                 if( !_C2H50H_ ){
-                    if (this.collaborativeEditing.getGlobalLock()){
-                        this.handlers.trigger("asc_onError",c_oAscError.ID.LockCreateDefName,c_oAscError.Level.NoCritical);
-                        var ar_norm = ascRange.normalize(),
-                            mc = this.model.getMergedByCell(ar_norm.r1, ar_norm.c1);
 
-                        return {range:mc?mc:range, sheet:this.model.getName()};
+                    if ( this.collaborativeEditing.getGlobalLock() || !this.handlers.trigger("getLockDefNameManagerStatus") ){
+                        this.handlers.trigger("onErrorEvent",c_oAscError.ID.LockCreateDefName,c_oAscError.Level.NoCritical);
+                        this._updateSelectionNameAndInfo();
+                        return true;
                     }
                     _C2H50H_  = this.model.workbook.editDefinesNames( null, defName );
                 }
 
                 if(_C2H50H_){
+                    this._isLockedDefNames(null, _C2H50H_.nodeId);
                     sheetName = _C2H50H_.Ref.split("!");
                     ref = sheetName[1];
                     sheetName = sheetName[0];
@@ -10718,8 +10718,10 @@
 					t.autoFilters.addAutoFilter(styleName, ar, addFormatTableOptionsObj);
 			};
 			
-			if(t.autoFilters.checkAddAutoFilter(ar, styleName, addFormatTableOptionsObj) === true)
+			if(t.autoFilters.checkAddAutoFilter(ar, styleName, addFormatTableOptionsObj) === true){
 				this._isLockedAll (onChangeAutoFilterCallback);
+                this._isLockedDefNames(null,null);
+            }
 			else//для того, чтобы в случае ошибки кнопка отжималась!
 				t.handlers.trigger("selectionChanged", t.getSelectionInfo());
 		};