Для контекстного меню диаграмм и шейпов(RangeShapeText)

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

Common/Charts/DrawingObjects.js

@@ -4369,15 +4369,21 @@ function DrawingObjects() {
 				
 		for ( var i = 0; i < aObjects.length; i++ ) {
 			var obj = aObjects[i];
-			if (obj.graphicObject.Id == id) {
-				if (obj.isChart())
+			if ( obj.graphicObject.Id == id ) {
+				if ( obj.isChart() ) {
+					if ( _this.controller.curState.id == STATES_ID_CHART_TEXT_ADD )
+						return c_oAscSelectionType.RangeShapeText;
 					return c_oAscSelectionType.RangeChart;
+				}
 					
-				if (obj.graphicObject.isImage())
+				if ( obj.graphicObject.isImage() )
 					return c_oAscSelectionType.RangeImage;
 					
-				if (obj.graphicObject.isShape() || obj.graphicObject.isGroup())
+				if ( obj.graphicObject.isShape() || obj.graphicObject.isGroup() ) {
+					if ( _this.controller.curState.id == STATES_ID_TEXT_ADD )
+						return c_oAscSelectionType.RangeShapeText;
 					return c_oAscSelectionType.RangeShape;
+				}
 			}
 		}
 		return undefined;

Excel/apiDefines.js

@@ -187,7 +187,8 @@ var c_oAscSelectionType = {
 	RangeMax:	4,
 	RangeImage: 5,
 	RangeChart: 6,
-	RangeShape: 7
+	RangeShape: 7,
+	RangeShapeText: 8
 };
 
 var c_oAscLegendMarkerType = {