Смена типа автофигуры

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

Excel/api.js

@@ -2101,6 +2101,10 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				ws.objectRender.unGroupGraphicObjects();
 			},
 			
+			asc_changeShapeType: function(value) {
+				this.asc_setGraphicObjectProps(new asc_CImgProperty( {ShapeProperties:{type:value}} ));
+			},
+			
 			asc_getGraphicObjectProps: function() {
 				var ws = this.wb.getWorksheet();
 				return ws.objectRender.controller.getGraphicObjectProps();

Excel/model/DrawingObjects/Format/Shape.js

@@ -1002,6 +1002,56 @@ CShape.prototype =
         }
     },
 
+	calculateTransformMatrix: function()
+    {
+        var _transform = new CMatrix();
+
+        var _horizontal_center = this.absExtX*0.5;
+        var _vertical_center = this.absExtY*0.5;
+        global_MatrixTransformer.TranslateAppend(_transform, -_horizontal_center, -_vertical_center);
+
+        if(this.absFlipH)
+        {
+            global_MatrixTransformer.ScaleAppend(_transform, -1, 1);
+        }
+        if(this.absFlipV)
+        {
+            global_MatrixTransformer.ScaleAppend(_transform, 1, -1);
+        }
+
+        global_MatrixTransformer.RotateRadAppend(_transform, -this.absRot);
+
+        global_MatrixTransformer.TranslateAppend(_transform, this.absOffsetX, this.absOffsetY);
+        global_MatrixTransformer.TranslateAppend(_transform, _horizontal_center, _vertical_center);
+
+        if(this.mainGroup !== null)
+        {
+            global_MatrixTransformer.MultiplyAppend(_transform, this.mainGroup.getTransform());
+        }
+        this.transform = _transform;
+        this.ownTransform = _transform.CreateDublicate();
+    },
+	
+	calculateAfterResize: function()
+    {
+        if(this.spPr.geometry !== null)
+            this.spPr.geometry.Recalculate(this.extX, this.extY);
+        //this.calculateTransformMatrix();
+        this.calculateContent();
+        //this.calculateTransformTextMatrix();
+        this.calculateLeftTopPoint();
+    },
+	
+	calculateLeftTopPoint: function()
+    {
+        var _horizontal_center = this.absExtX*0.5;
+        var _vertical_enter = this.absExtY*0.5;
+        var _sin = Math.sin(this.absRot);
+        var _cos = Math.cos(this.absRot);
+        this.absXLT = -_horizontal_center*_cos + _vertical_enter*_sin +this.absOffsetX + _horizontal_center;
+        this.absYLT = -_horizontal_center*_sin - _vertical_enter*_cos +this.absOffsetY + _vertical_enter;
+    },
+	
     drawAdjustments: function(drawingDocument)
     {
         if(isRealObject(this.spPr.geometry))