Исправлено зависание при разгруппировке автофигур

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

Common/Charts/DrawingObjects.js

@@ -4409,7 +4409,8 @@ function DrawingObjects() {
 	_this.unGroupGraphicObjects = function() {
 	
 		if ( _this.controller.canUnGroup() ) {
-			_this.controller.unGroup();	
+			_this.controller.unGroup();
+			api.isStartAddShape = false;
 		}
 	}
 	
@@ -4424,6 +4425,7 @@ function DrawingObjects() {
 				obj.graphicObject = aGraphics[i];
                 aGraphics[i].setDrawingBase(obj);
 				obj.graphicObject.select(_this.controller);
+				obj.setGraphicObjectCoords();
 				aSingleObjects.push(obj);
 			}
 			
@@ -5081,7 +5083,7 @@ function DrawingObjects() {
 			if (obj.graphicObject.isImage())
 				return c_oAscSelectionType.RangeImage;
 				
-			if (obj.graphicObject.isShape())
+			if (obj.graphicObject.isShape() || obj.graphicObject.isGroup())
 				return c_oAscSelectionType.RangeShape;
 		}
 		return undefined;

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -193,6 +193,15 @@ DrawingObjectsController.prototype =
 
     unGroup: function()
     {
+		if(isRealObject(this.curState.group) )
+		{
+			this.curState.group.resetSelection();
+		}
+		
+		if(isRealObject(this.curState.chart) )
+		{
+			this.curState.chart.resetSelection();
+		}
         var selected_objects = this.selectedObjects;
         var ungrouped_objects = [];
         for(var i = 0; i < selected_objects.length; ++i)
@@ -212,6 +221,8 @@ DrawingObjectsController.prototype =
             }
             this.drawingObjects.insertUngroupedObjects(ungrouped_objects[i].drawingBase.id, ungrouped_sp_tree);
         }
+		this.changeCurrentState(new NullState(this, this.drawingObjects));
+		
     },
 
     canGroup: function()