Bug 25251 - [CoEdit] Ошибка в консоли при повторном изменении размера шрифта в заголовке диаграммы

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

Common/Drawings/Format/TextBody.js

@@ -396,6 +396,9 @@ CTextBody.prototype =
         {
             this.parent.recalcInfo.recalcContent = true;
             this.parent.recalcInfo.recalcTransformText = true;
+
+            this.parent.recalcInfo.recalculateContent = true;
+            this.parent.recalcInfo.recalculateTransformText = true;
             if(this.parent.addToRecalculate)
             {
                 this.parent.addToRecalculate();

Excel/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -11,6 +11,13 @@ CChartSpace.prototype.recalculateTransform = function()
     CShape.prototype.recalculateTransform.call(this);
     this.localTransform.Reset();
 };
+CChartSpace.prototype.recalcText = function()
+{
+    this.recalcInfo.recalculateAxisLabels = true;
+    this.recalcTitles2();
+    this.handleUpdateInternalChart();
+};
+
 CChartSpace.prototype.recalculateBounds = CShape.prototype.recalculateBounds;
 CChartSpace.prototype.deselect = CShape.prototype.deselect;
 CChartSpace.prototype.hitToHandles = CShape.prototype.hitToHandles;

Excel/model/DrawingObjects/Format/GroupPrototype.js

@@ -25,6 +25,20 @@ CGroupShape.prototype.handleUpdateLn = function()
     this.addToRecalculate();
 };
 
+CGroupShape.prototype.recalcText = function()
+{
+    if(this.spTree)
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(this.spTree[i].recalcText)
+            {
+                this.spTree[i].recalcText();
+            }
+        }
+    }
+};
+
 
 CGroupShape.prototype.setRecalculateInfo = function()
 {

Excel/model/DrawingObjects/Format/ShapePrototype.js

@@ -149,7 +149,7 @@ CShape.prototype.setRecalculateInfo = function()
 };
 CShape.prototype.recalcContent = function()
 {
-    this.recalcInfo.recalcContent = true;
+    this.recalcInfo.recalculateContent = true;
 };
 
 CShape.prototype.getDrawingDocument = function()
@@ -226,6 +226,7 @@ CShape.prototype.handleUpdateExtents = function()
     this.recalcGeometry();
     this.recalcBounds();
     this.recalcTransform();
+    this.recalcContent();
     this.addToRecalculate();
 };
 CShape.prototype.handleUpdateRot = function()
@@ -287,6 +288,12 @@ CShape.prototype.getParentObjects = function ()
     return { slide: null, layout: null, master: null, theme: window["Asc"]["editor"].wbModel.theme};
 };
 
+CShape.prototype.recalcText = function()
+{
+    this.recalcInfo.recalculateContent = true;
+    this.recalcInfo.recalculateTransformText = true;
+};
+
 CShape.prototype.recalculate = function ()
 {
     ExecuteNoHistory(function(){
@@ -315,6 +322,7 @@ CShape.prototype.recalculate = function ()
             if (this.txBody)
                 this.txBody.recalcInfo.recalculateContent2 = true;
             this.recalculateContent();
+            this.recalcInfo.recalculateContent = false;
         }
 
         if (this.recalcInfo.recalculateTransformText) {

Excel/view/DrawingObjectsController.js

@@ -97,6 +97,8 @@ function CContentChanges()
 {
     this.m_aChanges = [];
 
+
+
     this.Add = function(Changes)
     {
         this.m_aChanges.push( Changes );
@@ -205,6 +207,10 @@ DrawingObjectsController.prototype.recalculate = function(bAll, Point)
         var drawings = this.getDrawingObjects();
         for(var i = 0; i < drawings.length; ++i)
         {
+            if(drawings[i].recalcText)
+            {
+                drawings[i].recalcText();
+            }
             drawings[i].recalculate();
         }
     }
@@ -443,7 +449,6 @@ DrawingObjectsController.prototype.onKeyPress = function(e)
         this.checkSelectedObjectsAndCallback(function()
         {
             this.paragraphAdd( new ParaText( String.fromCharCode( Code ) ) );
-            this.startRecalculate();
         }, []);
         bRetValue = true;
     }

Word/Editor/GraphicObjects/Format/ShapePrototype.js

@@ -36,7 +36,15 @@ CShape.prototype.setRecalculateInfo = function()
 
 CShape.prototype.recalcContent = function()
 {
-    this.recalcInfo.recalcContent = true;
+    if(this.bWordShape)
+    {
+        this.recalcInfo.recalculateTxBoxContent = true;
+    }
+    else
+    {
+        this.recalcInfo.recalculateContent = true;
+    }
+
 };
 
 CShape.prototype.getDrawingDocument = function()