Исправлен баг с переводом курсора с текста шейпа в ячейку

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

Common/Charts/DrawingObjects.js

@@ -2010,7 +2010,6 @@ function DrawingObjects() {
         this.drawingDocument.Overlay = overlay;
 		
 		var bFullClear = (_this.controller.curState.id != STATES_ID_TEXT_ADD) && (_this.controller.curState.id != STATES_ID_TEXT_ADD_IN_GROUP);
-		//console.log("bFullClear - " + bFullClear);
 
 		if ( bFullClear )
 			shapeOverlayCtx.m_oContext.clearRect(0, 0, shapeOverlayCtx.m_lWidthPix, shapeOverlayCtx.m_lHeightPix);
@@ -3417,8 +3416,7 @@ function DrawingObjects() {
 			worksheet.arrActiveChartsRanges = [];
 		}
 		_this.controller.resetSelectionState();
-		if ( overlayCtx )
-			overlayCtx.clear();
+		_this.OnUpdateOverlay();
 	}
 
 	_this.getDrawingObject = function(id) {

Excel/view/WorksheetView.js

@@ -4989,14 +4989,14 @@
 				var drawingInfo = this.objectRender.checkCursorDrawingObject(x, y);
 				if (drawingInfo && drawingInfo.data) {
 					// Возможно картинка с lock
-					lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Object,/*subType*/null, sheetId, drawingInfo.data);
-					isLocked = this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther,/*bCheckOnlyLockAll*/false);
+					/*lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Object, null, sheetId, drawingInfo.data);
+					isLocked = this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther,false);
 					if (false !== isLocked) {
 						// Кто-то сделал lock
 						userId = isLocked.UserId;
-						lockRangePosLeft =0;// drawingInfo.data.getVisibleLeftOffset(/*withHeader*/true);
-						lockRangePosTop = 0;//drawingInfo.data.getVisibleTopOffset(/*withHeader*/true);
-					}
+						lockRangePosLeft = drawingInfo.data.getVisibleLeftOffset(true);
+						lockRangePosTop = drawingInfo.data.getVisibleTopOffset(true);
+					}*/
 
 					return {cursor: drawingInfo.cursor, target: "shape", drawingId: drawingInfo.data, col: -1, row: -1, userId: userId, lockRangePosLeft: lockRangePosLeft, lockRangePosTop: lockRangePosTop};
 				}
@@ -5856,13 +5856,14 @@
 				if (isCoord) {
 					var drawingInfo = this.objectRender.checkCursorDrawingObject(x, y);
 					if ( drawingInfo ) {
-						//this.overlayCtx.clear();
 						this._drawGraphic();
 						this.objectRender.OnUpdateOverlay();
 					}
 					else {
-						if ( !asc["editor"].isStartAddShape )
+						if ( this.objectRender.controller.curState.id != STATES_ID_BEGIN_TRACK_NEW_SHAPE ) {
 							this.objectRender.unselectDrawingObjects();
+							asc["editor"].isStartAddShape = false;
+						}
 					}
 					
 					// move active range to coordinates x,y