Bug 25145 - [CoEdit] Пользователь не получает изменный заголовок диаграммы

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

Common/Drawings/Format/ChartFormat.js

@@ -162,8 +162,8 @@ function CDLbl()
         recalculateContent: true
     };
 
-    this.chart = null;//������������ ��� ���������
-    this.series = null;//������������ ��� ���������
+    this.chart = null;
+    this.series = null;
 
     this.x = 0;
     this.y = 0;
@@ -277,7 +277,9 @@ CDLbl.prototype =
     recalculate: function()
     {
         if(this.bDelete)
+        {
             return;
+        }
         ExecuteNoHistory(function()
         {
             if(this.recalcInfo.recalculateBrush)
@@ -453,12 +455,12 @@ CDLbl.prototype =
                 global_MatrixTransformer.TranslateAppend(_text_transform, 0, _vertical_shift);
                 if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) {
                     var alpha = Math.atan2(_dy_t, _dx_t);
-                    global_MatrixTransformer.RotateRadAppend(_text_transform, -alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
+                    global_MatrixTransformer.RotateRadAppend(_text_transform, -alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0));
                     global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lt, _t_y_lt);
                 }
                 else {
                     alpha = Math.atan2(_dy_t, _dx_t);
-                    global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI - alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
+                    global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI - alpha - (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0));
                     global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rt, _t_y_rt);
                 }
             }
@@ -508,21 +510,21 @@ CDLbl.prototype =
                 _alpha = Math.atan2(_dy_t, _dx_t);
                 if (_body_pr.vert === nVertTTvert) {
                     if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) {
-                        global_MatrixTransformer.RotateRadAppend(_text_transform, -_alpha - Math.PI * 0.5 + (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
+                        global_MatrixTransformer.RotateRadAppend(_text_transform, -_alpha - Math.PI * 0.5 + (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0));
                         global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rt, _t_y_rt);
                     }
                     else {
-                        global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI * 0.5 - _alpha + (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
+                        global_MatrixTransformer.RotateRadAppend(_text_transform, Math.PI * 0.5 - _alpha + (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0));
                         global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lt, _t_y_lt);
                     }
                 }
                 else {
                     if (_dx_lt_rb * _dy_t - _dy_lt_rb * _dx_t <= 0) {
-                        global_MatrixTransformer.RotateRadAppend(_text_transform, -_alpha - Math.PI * 1.5 + (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
+                        global_MatrixTransformer.RotateRadAppend(_text_transform, -_alpha - Math.PI * 1.5 + (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0));
                         global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_lb, _t_y_lb);
                     }
                     else {
-                        global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 0.5 - _alpha + (isRealNumber(_body_pr.rot) ? _body_pr.rot : 0));
+                        global_MatrixTransformer.RotateRadAppend(_text_transform, -Math.PI * 0.5 - _alpha + (isRealNumber(_body_pr.rot) ? _body_pr.rot*cToRad2 : 0));
                         global_MatrixTransformer.TranslateAppend(_text_transform, _t_x_rb, _t_y_rb);
                     }
                 }
@@ -966,7 +968,7 @@ CDLbl.prototype =
                 }
                 default:
                 {
-                    var _rot = isRealNumber(bodyPr.rot) ? bodyPr.rot : 0;
+                    var _rot = isRealNumber(bodyPr.rot) ? bodyPr.rot*cToRad2 : 0;
                     var t = new CMatrix();
                     global_MatrixTransformer.RotateRadAppend(t, -_rot);
                     var w, h, x0, y0, x1, y1, x2, y2, x3, y3;
@@ -22040,6 +22042,7 @@ CTitle.prototype =
             case historyitem_Title_SetTx:
             {
                 this.tx = data.oldPr;
+                this.Refresh_RecalcData2();
                 break;
             }
             case historyitem_Title_SetTxPr:
@@ -22077,6 +22080,7 @@ CTitle.prototype =
             case historyitem_Title_SetTx:
             {
                 this.tx = data.newPr;
+                this.Refresh_RecalcData2();
                 break;
             }
             case historyitem_Title_SetTxPr:
@@ -22141,6 +22145,7 @@ CTitle.prototype =
             case historyitem_Title_SetTx:
             {
                 this.tx = readObject(r);
+                this.Refresh_RecalcData2();
                 break;
             }
             case historyitem_Title_SetTxPr:

Common/Drawings/Format/Path.js

@@ -12,6 +12,7 @@ var PATH_COMMAND_END = 0x102;
 
 var cToRad = Math.PI / 10800000.0;
 var cToDeg = 1/cToRad;
+var cToRad2 = (Math.PI/60000)/180;
 
 function Path()
 {

Excel/model/DrawingObjects/Format/ShapePrototype.js

@@ -20,6 +20,13 @@ CShape.prototype.setWorksheet = function(worksheet)
 CShape.prototype.setDrawingBase = function(drawingBase)
 {
     this.drawingBase = drawingBase;
+    if(Array.isArray(this.spTree))
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            this.spTree[i].setDrawingBase(drawingBase);
+        }
+    }
 };
 
 CShape.prototype.getDrawingObjectsController = function()