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

Word/Math/mathContent.js

@@ -67,7 +67,8 @@ CMathRunPrp.prototype =
         return this.runPrp;
     },
     draw: function() {},
-    setPosition: function() {}
+    setPosition: function() {},
+	relate: function() {}
 }
 
 
@@ -441,7 +442,7 @@ CMathContent.prototype =
             //l_gap = r_gap = Math.floor( this.font.FontSize / 5 )*g_dKoef_pix_to_mm;
 
             mathElem.relate(this);
-            mathElem.setComposition(this.Composition);
+            //mathElem.setComposition(this.Composition);
 
             var ctrPrp = new CTextPr();
 
@@ -487,6 +488,9 @@ CMathContent.prototype =
     {
         var element = new mathElem(obj);
         obj.relate(this);
+		
+		if(obj.typeObj === MATH_COMP)
+			obj.setComposition(this.Composition);
 
         this.content.push(element);
         this.CurPos++;

Word/Math/matrix.js

@@ -4,6 +4,8 @@ function CMathMatrix()
     this.lineGapRow = 1;
     this.gaps = null;
     this.plcHide = false;
+	this.row = 0;
+	this.column = 0;
 
     this.spaceRow =
     {
@@ -464,6 +466,7 @@ CMathMatrix.prototype.baseJustification = function(type)
 ////
 function CEqArray()
 {
+	this.row = 0;
     CMathMatrix.call(this);
 }
 extend(CEqArray, CMathMatrix);

Word/Math/operators.js

@@ -4615,8 +4615,8 @@ CCharacter.prototype.setOperator = function(operator)
 {
     this.operator = operator;
     //var tPrp = this.getTxtPrp();
-    var tPrp = this.getPrpToControlLetter();
-    this.operator.setTxtPrp(tPrp);
+    //var tPrp = this.getPrpToControlLetter();
+    //this.operator.setTxtPrp(tPrp);
 
     this.setDimension(1, 1);
     this.setContent();