Поправлены проблемы с селектом

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

Common/Charts/DrawingObjects.js

@@ -3498,6 +3498,7 @@ function DrawingObjects() {
 				_this.raiseLayerDrawingObjects(true);
 			}
 		}
+		_this.selectGraphicObject();
 		_this.drawWorksheetHeaders();
 	}
 
@@ -3578,6 +3579,11 @@ function DrawingObjects() {
 	_this.drawWorksheetHeaders = function() {
 		worksheet._drawColumnHeaders();
 		worksheet._drawRowHeaders();
+				
+		// cols header on overlay
+		overlayCtx.clearRect( 0, 0, overlayCtx.getWidth(), worksheet.getCellTop(0, 1) );
+		// rows header on overlay
+		overlayCtx.clearRect( 0, 0, worksheet.getCellLeft(0, 1), overlayCtx.getHeight() );
 	}
 	
 	//-----------------------------------------------------------------------------------
@@ -4563,7 +4569,7 @@ function DrawingObjects() {
 	}
 	
 	_this.selectGraphicObject = function() {
-		if ( _this.drawingDocument ) {
+		if ( _this.drawingDocument && _this.controller.selectedObjects.length ) {
 			_this.controller.drawSelection(_this.drawingDocument);
 			_this.drawWorksheetHeaders();
 		}

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -768,7 +768,6 @@ DrawingObjectsController.prototype =
 			}
 		}
 		this.drawingObjects.showDrawingObjects(true);
-		this.drawingObjects.selectGraphicObject();
 		this.drawingObjects.sendGraphicObjectProps();
 	}
 };

Excel/view/WorksheetView.js

@@ -6016,11 +6016,6 @@
 					// Не попали в выделение (меняем первую точку)
 					this.cleanSelection();
 					this._moveActiveCellToXY(x, y);
-					// Нет селекта при клике по drawing-объекту
-					if ( (ar.type !== c_oAscSelectionType.RangeImage) && (ar.type !== c_oAscSelectionType.RangeChart) ) {
-						this.objectRender.unselectDrawingObjects();
-						this._drawSelection();
-					}
 
 					this._trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false));
 					this._trigger("selectionChanged", this.getSelectionInfo());