Поправила баг на размер степени

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

Word/Editor/Math.js

@@ -786,13 +786,13 @@ ParaMath.prototype =
         if(argSize == -1)
         {
             //FSize = 0.0009*FSize*FSize + 0.68*FSize + 0.26;
-            FSize = 0.65*FSize;
+            FSize = 0.77*FSize;
 
         }
         else if(argSize == -2)
         {
             //FSize = -0.0004*FSize*FSize + 0.66*FSize + 0.87;
-            FSize = 0.65*0.65*FSize;
+            FSize = 0.77*0.77*FSize;
         }
 
         tPrp.FontSize = FSize;

Word/Math/mathContent.js

@@ -5103,16 +5103,17 @@ CMathContent.prototype =
             {
                 if(!this.bRoot)
                 {
-                    /*var oWPrp = this.Parent.getCtrPrp();
+                    var oWPrp = this.Parent.Get_CtrPrp();
 
                     //this.applyArgSize(oWPrp);
-                    this.ParaMath.ApplyArgSize(oWPrp);*/
+                    this.ParaMath.ApplyArgSize(oWPrp, this.argSize);
+                    oWPrp.Italic = false;
 
 
-                    var ctrPrp = this.Parent.Get_CompiledCtrPrp();
-                    ctrPrp.Italic = false;
+                    /*var ctrPrp = this.Parent.Get_CompiledCtrPrp();
+                    ctrPrp.Italic = false;*/
 
-                    oMeasure.SetFont(ctrPrp);
+                    oMeasure.SetFont(oWPrp);
 
                     this.content[pos].Resize(this, oMeasure);
                 }
@@ -5232,6 +5233,7 @@ CMathContent.prototype =
                     oWPrp.Merge(mgWPrp);
 
                     //this.applyArgSize(oWPrp);
+
                     this.ParaMath.ApplyArgSize(oWPrp, this.argSize);
 
                     pGraphics.SetFont(oWPrp);
@@ -5240,18 +5242,18 @@ CMathContent.prototype =
                 {
                     pGraphics.b_color1(0,0,0,255);
 
-                    /*var oWPrp = this.Parent.getCtrPrp();
+                    var oWPrp = this.Parent.Get_CtrPrp();
 
                     //this.applyArgSize(oWPrp);
-                    this.ParaMath.ApplyArgSize(oWPrp);
+                    this.ParaMath.ApplyArgSize(oWPrp, this.argSize);
 
                     oWPrp.Italic = false;
-                    pGraphics.SetFont(oWPrp);*/
+                    pGraphics.SetFont(oWPrp);
 
-                    var ctrPrp = this.Parent.Get_CompiledCtrPrp();
-                    ctrPrp.Italic = false;
+                    //var ctrPrp = this.Parent.Get_CompiledCtrPrp();
+                    //ctrPrp.Italic = false;
 
-                    pGraphics.SetFont(ctrPrp);
+                    pGraphics.SetFont(oWPrp);
 
                     this.content[i].draw(x, y, pGraphics);
                 }