правка бага 21567 - [Charts] Не вставляется диаграмма после изменения ее заголовка во фрейме

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

Excel/model/DrawingObjects/Format/Styles.js

@@ -4888,6 +4888,11 @@ CTextPr.prototype =
             this.Lang.Write_ToBinary( Writer );
             Flags |= 2097152;
         }
+        Writer.WriteBool(isRealObject(this.unifill));
+        if(isRealObject(this.unifill))
+        {
+            this.unifill.Write_ToBinary2(Writer);
+        }
 
         var EndPos = Writer.GetCurPosition();
         Writer.Seek( StartPos );
@@ -4998,6 +5003,12 @@ CTextPr.prototype =
         // Lang
         if ( Flags & 2097152 )
             this.Lang.Read_FromBinary( Reader );
+
+        if(Reader.GetBool())
+        {
+            this.unifill = new CUniFill();
+            this.unifill.Read_FromBinary2(Reader);
+        }
     },
 
     Check_NeedRecalc : function()

PowerPoint/Editor/GraphicObjects.js

@@ -1602,11 +1602,14 @@ CGraphicObjects.prototype = {
         options.theme = this.slide.Layout.Master.Theme;
         editor.chartStyleManager.init(options);
 
+        var presentation = editor.WordControl.m_oLogicDocument;
+        var chart_width = 0.264583*c_oAscChartDefines.defaultChartWidth;
+        var chart_height = 0.264583*c_oAscChartDefines.defaultChartHeight;
         ret.chart.initDefault();
-        ret.spPr.xfrm.offX = 0;
-        ret.spPr.xfrm.offY = 0;
-        ret.spPr.xfrm.extX = editor.WordControl.m_oDrawingDocument.GetMMPerDot(c_oAscChartDefines.defaultChartWidth);//this.slide.Width*2/3;//ditor.WordControl.m_oDrawingDocument.GetMMPerDot(c_oAscChartDefines.defaultChartWidth);
-        ret.spPr.xfrm.extY = editor.WordControl.m_oDrawingDocument.GetMMPerDot(c_oAscChartDefines.defaultChartHeight);//0.593*this.slide.Height;//ditor.WordControl.m_oDrawingDocument.GetMMPerDot(c_oAscChartDefines.defaultChartHeight);
+        ret.spPr.xfrm.offX = (presentation.Width - chart_width)/2;
+        ret.spPr.xfrm.offY = (presentation.Height - chart_height)/2;
+        ret.spPr.xfrm.extX = chart_width;//this.slide.Width*2/3;//ditor.WordControl.m_oDrawingDocument.GetMMPerDot(c_oAscChartDefines.defaultChartWidth);
+        ret.spPr.xfrm.extY = chart_height;//0.593*this.slide.Height;//ditor.WordControl.m_oDrawingDocument.GetMMPerDot(c_oAscChartDefines.defaultChartHeight);
         return ret;
     },