git-svn-id:...

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

Common/Charts/DrawingObjects.js

@@ -575,6 +575,8 @@ function CChartData(bWordContext, chart) {
 		g_oTableId.Add( _this, _this.Id );
 }
 
+//{ ASC Classes
+
 //-----------------------------------------------------------------------------------
 // Chart style
 //-----------------------------------------------------------------------------------
@@ -2233,6 +2235,8 @@ prot["asc_getName"] = prot.asc_getName;
 prot["asc_getIndex"] = prot.asc_getIndex;
 //}
 
+//}
+
 //-----------------------------------------------------------------------------------
 // Manager
 //-----------------------------------------------------------------------------------
@@ -2330,6 +2334,10 @@ function DrawingObjects() {
 			return _t.graphicObject != null;
 		}
 		
+		_t.isLocked = function() {
+			return ( (_t.graphicObject.lockType != c_oAscLockTypes.kLockTypeNone) && (_t.graphicObject.lockType != c_oAscLockTypes.kLockTypeMine) )
+		}
+		
 		_t.getWorkbook = function() {
 			return (_t.worksheet ? _t.worksheet.model.workbook : null);
 		}
@@ -3348,10 +3356,8 @@ function DrawingObjects() {
 		for (var i = 0; i < aObjects.length; i++) {
 			
 			var obj = aObjects[i];
-			obj.isLocked(callbackFunc);
+			if ( !obj.isLocked() ) {
 			
-			function callbackFunc(result) {
-				if ( result ) {
 				var bbox = obj.isChart() ? obj.graphicObject.chart.range.intervalObject.getBBox0() : null;
 
 				if ( obj.isChart() || obj.isImage() || obj.isShape() ) {
@@ -3670,7 +3676,6 @@ function DrawingObjects() {
 			}
 		}
 	}
-	}
 	
 	_this.moveRangeDrawingObject = function(oBBoxFrom, oBBoxTo, bResize) {