- Lock объектов

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

Common/Charts/DrawingArea.js

@@ -416,12 +416,6 @@ function FrozenPlace(ws, type) {
 			_this.worksheet.overlayGraphicCtx.clearRect( x, y, w, h );
 		else {
 			_this.worksheet.drawingGraphicCtx.clearRect( x, y, w, h );
-			//_this.worksheet.drawingGraphicCtx.setFillStyle(_this.worksheet.settings.cells.defaultState.background).fillRect( x, y, w, h );
-			//_this.worksheet._drawGrid(undefined, _this.getVisibleRange());
-			//_this.worksheet._drawCells(undefined, _this.getVisibleRange());
-			//_this.worksheet._drawCellsBorders(undefined, _this.getVisibleRange());
-			//_this.worksheet._drawFrozenPaneLines();
-			//_this.worksheet.objectRender.drawWorksheetLayer(_this.getVisibleRange());
 		}
 	}
 	
@@ -431,6 +425,14 @@ function FrozenPlace(ws, type) {
 		
 		_this.clip(canvas.shapeCtx);
 		object.graphicObject.draw(canvas.shapeCtx);
+		
+		// Lock		
+		canvas.shapeCtx.SetIntegerGrid(false);
+		canvas.shapeCtx.transform3(object.graphicObject.transform, false);
+		canvas.shapeCtx.DrawLockObjectRect(object.graphicObject.lockType, 0, 0, object.graphicObject.extX, object.graphicObject.extY );
+		canvas.shapeCtx.reset();
+		canvas.shapeCtx.SetIntegerGrid(true);
+					
 		_this.restore(canvas.shapeCtx);
 	}
 	
@@ -541,7 +543,6 @@ function DrawingArea(ws) {
 		
 		_this.worksheet.overlayCtx.clear();
 		_this.worksheet.overlayGraphicCtx.clear();
-		//shapeOverlayCtx.m_oContext.clearRect(0, 0, shapeOverlayCtx.m_lWidthPix, shapeOverlayCtx.m_lHeightPix);
 		_this.worksheet._drawCollaborativeElements(false);
 		
 		/*for ( var i = 0; i < _this.worksheet.objectRender.controller.selectedObjects.length; i++ ) {

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -850,7 +850,7 @@ DrawingObjectsController.prototype =
         this.curState = newState;
         if(newState.id === STATES_ID_TEXT_ADD ||  newState.id === STATES_ID_TEXT_ADD_IN_GROUP)
         {
-            this.drawingObjects.OnUpdateOverlay(true);
+            this.drawingObjects.OnUpdateOverlay();
         }
 
 		this.updateSelectionState();

Excel/view/WorkbookView.js

@@ -158,7 +158,6 @@
 
 			this.buffers.main = asc_DC({canvas: this.canvas, units: 1/*pt*/, fmgrGraphics: this.fmgrGraphics, font: this.m_oFont});
 			this.buffers.overlay = asc_DC({canvas: this.canvasOverlay, units: 1/*pt*/, fmgrGraphics: this.fmgrGraphics, font: this.m_oFont});
-			this.buffers.overlay.ctx.isOverlay = true;		// Для разруливания _activateOverlayCtx / _deactivateOverlayCtx
 			
 			this.buffers.mainGraphic = asc_DC({canvas: this.canvasGraphic, units: 1/*pt*/, fmgrGraphics: this.fmgrGraphics, font: this.m_oFont});
 			this.buffers.overlayGraphic = asc_DC({canvas: this.canvasGraphicOverlay, units: 1/*pt*/, fmgrGraphics: this.fmgrGraphics, font: this.m_oFont});			

Excel/view/WorksheetView.js

@@ -3011,8 +3011,6 @@
 			if (!this.isSelectionDialogMode) {
 				this._drawCollaborativeElements(/*bIsDrawObjects*/true);
 				this._drawSelectionRange(range);
-				if (this.objectRender.selectedGraphicObjectsExists())
-					this.objectRender.raiseLayerDrawingObjects();
 			} else {
 				this._drawSelectionRange(range);
 			}
@@ -3327,9 +3325,6 @@
 			// restore canvas' original clipping range
 			ctx.restore();
 
-			if ( !this.isChartAreaEditMode )
-			this.objectRender.raiseLayerDrawingObjects();
-
 			if (!isFrozen) {
 				this._drawActiveHeaders();
 			}
@@ -7182,9 +7177,6 @@
 			}
 			this._drawSelection();
 
-			// слой c объектами должен быть выше селекта
-			this.objectRender.raiseLayerDrawingObjects();
-
 			return { ar: ret, d:d };
 		};