Bug #31841 - Ошибка в консоли при смене типа диаграммы на 3D диаграмму в xlsx файле;

Bug #31845 - Размер текста в слайде неправильный

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

Common/Drawings/Format/ChartSpace.js

@@ -5400,10 +5400,13 @@ CChartSpace.prototype =
 						 for(i = 0; i < oAxisLabels.arrLabels.length; ++i)
 						{
 							oLabel = oAxisLabels.arrLabels[i];
-							deltaX = oLabel.localTransformText.tx - oCatAx.xPoints[i].pos;
-							deltaY = oLabel.localTransformText.ty - oAxisLabels.y;
-							oNewPos = oCatAx.transformXPoints[i];
-							oLabel.setPosition2(oNewPos.x + deltaX, oNewPos.y + deltaY);
+                            if(oLabel)
+                            {
+                                deltaX = oLabel.localTransformText.tx - oCatAx.xPoints[i].pos;
+                                deltaY = oLabel.localTransformText.ty - oAxisLabels.y;
+                                oNewPos = oCatAx.transformXPoints[i];
+                                oLabel.setPosition2(oNewPos.x + deltaX, oNewPos.y + deltaY);
+                            }
 						}
 					}
                    
@@ -5414,10 +5417,13 @@ CChartSpace.prototype =
 						for(i = 0; i < oAxisLabels.arrLabels.length; ++i)
 						{
 							oLabel = oAxisLabels.arrLabels[i];
-							deltaX = oLabel.localTransformText.tx - oAxisLabels.x;
-							deltaY = oLabel.localTransformText.ty - oValAx.yPoints[i].pos;
-							oNewPos = oValAx.transformYPoints[i];
-							oLabel.setPosition2(oNewPos.x + deltaX, oNewPos.y + deltaY);
+                            if(oLabel)
+                            {
+                                deltaX = oLabel.localTransformText.tx - oAxisLabels.x;
+                                deltaY = oLabel.localTransformText.ty - oValAx.yPoints[i].pos;
+                                oNewPos = oValAx.transformYPoints[i];
+                                oLabel.setPosition2(oNewPos.x + deltaX, oNewPos.y + deltaY);
+                            }
 						}
 					}
                     
@@ -5432,10 +5438,13 @@ CChartSpace.prototype =
                         for(i = 0; i < oAxisLabels.arrLabels.length; ++i)
                         {
                             oLabel = oAxisLabels.arrLabels[i];
-                            deltaX = oLabel.localTransformText.tx - oValAx.xPoints[i].pos;
-                            deltaY = oLabel.localTransformText.ty - oAxisLabels.y;
-                            oNewPos = oValAx.transformXPoints[i];
-                            oLabel.setPosition2(oNewPos.x + deltaX, oNewPos.y + deltaY);
+                            if(oLabel)
+                            {
+                                deltaX = oLabel.localTransformText.tx - oValAx.xPoints[i].pos;
+                                deltaY = oLabel.localTransformText.ty - oAxisLabels.y;
+                                oNewPos = oValAx.transformXPoints[i];
+                                oLabel.setPosition2(oNewPos.x + deltaX, oNewPos.y + deltaY);
+                            }
                         }
                     }
 
@@ -5447,10 +5456,13 @@ CChartSpace.prototype =
                         for(i = 0; i < oAxisLabels.arrLabels.length; ++i)
                         {
                             oLabel = oAxisLabels.arrLabels[i];
-                            deltaX = oLabel.localTransformText.tx - oAxisLabels.x;
-                            deltaY = oLabel.localTransformText.ty - oCatAx.yPoints[i].pos;
-                            oNewPos = oCatAx.transformYPoints[i];
-                            oLabel.setPosition2(oNewPos.x + deltaX, oNewPos.y + deltaY);
+                            if(oLabel)
+                            {
+                                deltaX = oLabel.localTransformText.tx - oAxisLabels.x;
+                                deltaY = oLabel.localTransformText.ty - oCatAx.yPoints[i].pos;
+                                oNewPos = oCatAx.transformYPoints[i];
+                                oLabel.setPosition2(oNewPos.x + deltaX, oNewPos.y + deltaY);
+                            }
                         }
                     }
                 }

Common/Drawings/Format/TextBody.js

@@ -473,7 +473,17 @@ CTextBody.prototype =
                             }
                             if(isRealNumber(font_scale))
                             {
+                                var bReset = false;
+                                if(g_oIdCounter.m_bLoad)
+                                {
+                                    bReset = true;
+                                    g_oIdCounter.m_bLoad = false;
+                                }
                                  var redFontSize = Math.round(parg.Get_CompiledPr(false).TextPr.FontSize*font_scale);
+                                if(bReset)
+                                {
+                                    g_oIdCounter.m_bLoad = true;
+                                }
                                 this.checkParagraphContent(parg, font_scale, true, redFontSize);
                             }
                         }