Fix Bug 21908 - [CoEdit] Не пропадает lock у автофигуры при ее получении пользователем

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

Common/Charts/DrawingObjects.js

@@ -4525,17 +4525,20 @@ function DrawingObjects() {
 			if ( id == aObjects[i].graphicObject.Id ) {
 				aObjects[i].graphicObject.lockType = state;
 				
-				// Clip
-				_this.clipGraphicsCanvas(shapeCtx);
-				
-				shapeCtx.SetIntegerGrid(false);
-				shapeCtx.transform3(aObjects[i].graphicObject.transform, false);		
-				shapeCtx.DrawLockObjectRect(aObjects[i].graphicObject.lockType, 0, 0, aObjects[i].graphicObject.extX, aObjects[i].graphicObject.extY );
-				shapeCtx.reset();
-				shapeCtx.SetIntegerGrid(true);
-				
-				// Restore
-				_this.restoreGraphicsCanvas(shapeCtx);
+				if ( !shapeCtx.m_oContext.isOverlay ) {
+					
+					// Clip
+					_this.clipGraphicsCanvas(shapeCtx);
+					
+					shapeCtx.SetIntegerGrid(false);
+					shapeCtx.transform3(aObjects[i].graphicObject.transform, false);
+					shapeCtx.DrawLockObjectRect(aObjects[i].graphicObject.lockType, 0, 0, aObjects[i].graphicObject.extX, aObjects[i].graphicObject.extY );
+					shapeCtx.reset();
+					shapeCtx.SetIntegerGrid(true);
+					
+					// Restore
+					_this.restoreGraphicsCanvas(shapeCtx);
+				}
 				break;
 			}
 		}

Excel/view/WorksheetView.js

@@ -1800,7 +1800,7 @@
 				this._fixSelectionOfMergedCells();
 				this._fixSelectionOfHiddenCells();
 				this._drawGraphic();
-				this.objectRender.showDrawingObjects(false);
+				this.objectRender.showDrawingObjects(true);
 				if (this.overlayCtx) {
 					this._drawSelection();
 				}
@@ -2733,7 +2733,7 @@
 
 			_drawSelectionRange: function (range) {
 				
-				if (asc["editor"].isStartAddShape || this.objectRender.selectedGraphicObjectsExists()) {
+				if (asc["editor"].isStartAddShape && this.objectRender.selectedGraphicObjectsExists()) {
 					if (this.isChartAreaEditMode) {
 						this._drawFormulaRange(this.arrActiveChartsRanges)
 					}
@@ -4971,6 +4971,11 @@
 				var lockInfo = undefined;
 				var isLocked = false;
 				
+				var drawingInfo = this.objectRender.checkCursorDrawingObject(x, y);
+				
+				if (drawingInfo)
+					return {cursor: drawingInfo.cursor, target: "shape", col: -1, row: -1};
+				
 				if (asc["editor"].isStartAddShape)
 					return {cursor: kCurFillHandle, target: "shape", col: -1, row: -1};