Bug #31565 - [Copy&Paste] Не отрисовываются название осей диаграммы после...

Bug #31565 - [Copy&Paste] Не отрисовываются название осей диаграммы после вставки текста в заголовке 

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

Common/Drawings/Format/ChartSpace.js

@@ -5392,8 +5392,8 @@ CChartSpace.prototype =
 						 for(i = 0; i < oAxisLabels.arrLabels.length; ++i)
 						{
 							oLabel = oAxisLabels.arrLabels[i];
-							deltaX = oLabel.transformText.tx - oCatAx.xPoints[i].pos;
-							deltaY = oLabel.transformText.ty - oAxisLabels.y;
+							deltaX = oLabel.localTransformText.tx - oCatAx.xPoints[i].pos;
+							deltaY = oLabel.localTransformText.ty - oAxisLabels.y;
 							oNewPos = oCatAx.transformXPoints[i];
 							oLabel.setPosition(oNewPos.x + deltaX, oNewPos.y + deltaY);
 						}
@@ -5406,8 +5406,8 @@ CChartSpace.prototype =
 						for(i = 0; i < oAxisLabels.arrLabels.length; ++i)
 						{
 							oLabel = oAxisLabels.arrLabels[i];
-							deltaX = oLabel.transformText.tx - oAxisLabels.x;
-							deltaY = oLabel.transformText.ty - oValAx.yPoints[i].pos;
+							deltaX = oLabel.localTransformText.tx - oAxisLabels.x;
+							deltaY = oLabel.localTransformText.ty - oValAx.yPoints[i].pos;
 							oNewPos = oValAx.transformYPoints[i];
 							oLabel.setPosition(oNewPos.x + deltaX, oNewPos.y + deltaY);
 						}
@@ -5424,8 +5424,8 @@ CChartSpace.prototype =
                         for(i = 0; i < oAxisLabels.arrLabels.length; ++i)
                         {
                             oLabel = oAxisLabels.arrLabels[i];
-                            deltaX = oLabel.transformText.tx - oValAx.xPoints[i].pos;
-                            deltaY = oLabel.transformText.ty - oAxisLabels.y;
+                            deltaX = oLabel.localTransformText.tx - oValAx.xPoints[i].pos;
+                            deltaY = oLabel.localTransformText.ty - oAxisLabels.y;
                             oNewPos = oValAx.transformXPoints[i];
                             oLabel.setPosition(oNewPos.x + deltaX, oNewPos.y + deltaY);
                         }
@@ -5439,8 +5439,8 @@ CChartSpace.prototype =
                         for(i = 0; i < oAxisLabels.arrLabels.length; ++i)
                         {
                             oLabel = oAxisLabels.arrLabels[i];
-                            deltaX = oLabel.transformText.tx - oAxisLabels.x;
-                            deltaY = oLabel.transformText.ty - oCatAx.yPoints[i].pos;
+                            deltaX = oLabel.localTransformText.tx - oAxisLabels.x;
+                            deltaY = oLabel.localTransformText.ty - oCatAx.yPoints[i].pos;
                             oNewPos = oCatAx.transformYPoints[i];
                             oLabel.setPosition(oNewPos.x + deltaX, oNewPos.y + deltaY);
                         }

Excel/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -255,6 +255,7 @@ CChartSpace.prototype.recalculate = function()
             this.recalcInfo.bRecalculatedTitle = true;
         }
         var b_transform = false;
+        var bCheckLabels = false;
         if(this.recalcInfo.recalculateTransform)
         {
             this.recalculateTransform();
@@ -359,6 +360,7 @@ CChartSpace.prototype.recalculate = function()
         {
             this.recalculateAxis();
             this.recalcInfo.recalculateAxisVal = false;
+            bCheckLabels = true;
         }
 
 
@@ -373,7 +375,10 @@ CChartSpace.prototype.recalculate = function()
         {
             this.recalculateChart();
             this.recalcInfo.recalculateChart = false;
-            this.checkAxisLabelsTransform();
+            if(bCheckLabels)
+            {
+                this.checkAxisLabelsTransform();
+            }
         }
 
 

Excel/model/History.js

@@ -467,7 +467,7 @@ CHistory.prototype.Get_RecalcData = function(Point2)
 
 					if ( /*true === Item.NeedRecalc*/ Item.Class && Item.Class.Refresh_RecalcData )
 						Item.Class.Refresh_RecalcData( Item.Data );
-					if(Item.Type === historyitem_Workbook_ChangeColorScheme)
+					if(Item.Type === historyitem_Workbook_ChangeColorScheme && Item.Class === g_oUndoRedoWorkbook)
 					{
 						var wsViews = Asc["editor"].wb.wsViews;
 						for(var i = 0; i < wsViews.length; ++i)

PowerPoint/Editor/Format/ChartSpacePrototype.js

@@ -347,6 +347,7 @@ CChartSpace.prototype.recalculate = function()
             this.recalcInfo.bRecalculatedTitle = true;
         }
         var b_transform = false;
+        var bCheckLabels = false;
         if(this.recalcInfo.recalculateTransform)
         {
             this.recalculateTransform();
@@ -449,6 +450,8 @@ CChartSpace.prototype.recalculate = function()
 
         if(this.recalcInfo.recalculateAxisVal)
         {
+            bCheckLabels = true;
+
             this.recalculateAxis();
             this.recalcInfo.recalculateAxisVal = false;
         }
@@ -465,7 +468,10 @@ CChartSpace.prototype.recalculate = function()
         {
             this.recalculateChart();
             this.recalcInfo.recalculateChart = false;
-            this.checkAxisLabelsTransform();
+            if(bCheckLabels)
+            {
+                this.checkAxisLabelsTransform();
+            }
         }
 
 

Word/Editor/GraphicObjects/Format/ChartSpacePrototype.js

@@ -263,6 +263,8 @@ CChartSpace.prototype.recalculate = function()
         }
         this.updateLinks();
 
+
+        var bCheckLabels = false;
         if(this.recalcInfo.recalcTitle)
         {
             this.recalculateChartTitleEditMode(true);
@@ -366,6 +368,7 @@ CChartSpace.prototype.recalculate = function()
         {
             this.recalculateAxis();
             this.recalcInfo.recalculateAxisVal = false;
+            bCheckLabels = true;
         }
 
         if(this.recalcInfo.recalculatePenBrush)
@@ -378,7 +381,10 @@ CChartSpace.prototype.recalculate = function()
         {
             this.recalculateChart();
             this.recalcInfo.recalculateChart = false;
-            this.checkAxisLabelsTransform();
+            if(bCheckLabels)
+            {
+                this.checkAxisLabelsTransform();
+            }
         }
 
         for(var i = 0; i < this.recalcInfo.dataLbls.length; ++i)