Bug 25066 - Меню диаграммы не становится активным с первого раза, при клике по диаграмме в группе

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

Common/Charts/DrawingObjects.js

@@ -3701,11 +3701,11 @@ function DrawingObjects() {
             if(selected_objects[0].getObjectType() === historyitem_type_ChartSpace)
                 return c_oAscSelectionType.RangeChart;
 
-            if(selected_objects[0].getObjectType() === historyitem_type_Shape)
-                return c_oAscSelectionType.RangeShape;
-
             if(selected_objects[0].getObjectType() === historyitem_type_ImageShape)
                 return c_oAscSelectionType.RangeImage;
+
+            return c_oAscSelectionType.RangeShape;
+
         }
         return undefined;
     };

Common/Drawings/DrawingObjectsHandlers.js

@@ -475,6 +475,8 @@ function handleMouseUpPreMoveState(drawingObjects, e, x, y, pageIndex, bWord)
                 state.drawingObjects.selection.groupSelection = state.majorObject;
                 state.drawingObjects.OnMouseDown(e,x, y,pageIndex);
                 state.drawingObjects.OnMouseUp(e, x, y, pageIndex);
+                state.drawingObjects.drawingObjects && state.drawingObjects.drawingObjects.sendGraphicObjectProps();
+                state.drawingObjects.document && state.drawingObjects.document.Document_UpdateInterfaceState();
                 break;
             }
             case historyitem_type_ChartSpace:

Excel/view/WorksheetView.js

@@ -6527,7 +6527,6 @@
             }
 
 			var paraPr = this.objectRender.controller.getParagraphParaPr();
-            var shape_props = this.objectRender.controller.getDrawingProps().shapeProps;
 			if (textPr && paraPr) {
 				objectInfo.text = this.objectRender.controller.Get_SelectedText();
 
@@ -6539,6 +6538,7 @@
 					case align_Justify	: horAlign = "justify";	break;
 				}
 				var vertAlign = "center";
+                var shape_props = this.objectRender.controller.getDrawingProps().shapeProps;
                 if(shape_props)
                 {
                     switch (shape_props.verticalTextAlign) {