git-svn-id:...

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

Word/Math/docfiles/Document.js

@@ -659,6 +659,10 @@ CDocument.prototype =
     {
         //var StartTime = new Date().getTime();
 
+        //**
+        MathComposition.RecalculateComposition();
+        //**
+
         if ( true === this.TurnOffRecalc )
             return;
 
@@ -1451,8 +1455,6 @@ CDocument.prototype =
     Draw : function(nPageIndex, pGraphics)
     {
 		
-		MathComposition.RecalculateComposition();
-		
         if ( "undefined" == typeof(pGraphics) )
             pGraphics = Canvas;
 

Word/Math/mathContent.js

@@ -6615,7 +6615,7 @@ CMathComposition.prototype =
         this.Root.g_mContext = gps;
         //this.Root.setComposition(this);
         this.SetDefaultPrp();
-        this.Root.setTxtPrp(this.TxtPrp, true);
+        this.Root.setTxtPrp(this.TxtPrp);
 
         this.CurrentContent = this.Root;
         this.SelectContent  = this.Root;
@@ -7207,6 +7207,7 @@ CMathComposition.prototype =
     },
     RecalculateComposition: function()
     {
+        this.Root.setTxtPrp(this.TxtPrp);
         this.Root.Resize();
         this.Root.setPosition(this.pos);
         this.UpdateCursor();

Word/Math/mathText.js

@@ -193,8 +193,8 @@ CMathText.prototype =
 
         g_oTextMeasurer.SetFont( txtPrp );
 
-        //var letter = this.getCode();
-		var letter = this.value;
+        var letter = this.getCode();
+		//var letter = this.value;
         var metricsTxt = g_oTextMeasurer.Measure2Code(letter);
         var _width = metricsTxt.Width;
 
@@ -310,8 +310,8 @@ CMathText.prototype =
 
 
         pGraphics.transform(sx, shy, shx, sy, 0, 0);
-        //pGraphics.FillTextCode(xx, yy , this.getCode());
-		pGraphics.FillTextCode(xx, yy , this.value);
+        pGraphics.FillTextCode(xx, yy , this.getCode());
+		//pGraphics.FillTextCode(xx, yy , this.value);
 
     },
     setPosition: function( pos )