правки на инициализации

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

Word/Math/base.js

@@ -1596,7 +1596,7 @@ CMathBase.prototype =
         while(start_x < this.nCol && start_y < this.nRow && (TextPr == null || this.elements[start_x][start_y].IsJustDraw() ))
         {
             if(!this.elements[start_x][start_y].IsJustDraw())
-                TextPr = this.elements[start_x][start_y].Get_CompiledTextPr(Copy);
+                TextPr = this.elements[start_x][start_y].Get_CompiledTextPr(Copy, true);
 
             start_y++;
 
@@ -1613,7 +1613,7 @@ CMathBase.prototype =
             {
                 if(!this.elements[i][j].IsJustDraw())
                 {
-                    var CurTextPr = this.elements[i][j].Get_CompiledPr(false);
+                    var CurTextPr = this.elements[i][j].Get_CompiledTextPr(false, true);
 
                     if ( null !== CurTextPr )
                         TextPr = TextPr.Compare( CurTextPr );

Word/Math/mathContent.js

@@ -6235,7 +6235,7 @@ CMathContent.prototype =
 
         return TextPr;
     },
-    Get_CompiledTextPr : function(Copy)
+    Get_CompiledTextPr : function(Copy, bAll)
     {
         var TextPr = null;
 
@@ -6243,21 +6243,29 @@ CMathContent.prototype =
         {
             TextPr = this.Parent.getCtrPrp();
         }
-        else if ( true === this.bSelectionUse )
+        else if ( true === this.bSelectionUse || bAll == true)
         {
-            var StartPos = this.SelectStartPos;
-            var EndPos   = this.SelectEndPos;
+            var StartPos, EndPos;
+            if(true === this.bSelectionUse)
+            {
+                StartPos = this.SelectStartPos;
+                EndPos   = this.SelectEndPos;
 
-            if ( StartPos > EndPos )
+                if ( StartPos > EndPos )
+                {
+                    StartPos = this.SelectEndPos;
+                    EndPos   = this.SelectStartPos;
+                }
+            }
+            else
             {
-                StartPos = this.SelectEndPos;
-                EndPos   = this.SelectStartPos;
+                StartPos = 0;
+                EndPos = this.content.length - 1;
             }
 
             while ( null === TextPr && StartPos <= EndPos )
             {
                 TextPr = this.content[StartPos].Get_CompiledTextPr(Copy);
-
                 StartPos++;
             }
 

Word/Math/matrix.js

@@ -35,10 +35,11 @@ function CMathMatrix(props)
     this.column = 0;
     ////
 
-
     CMathBase.call(this);
 
-    CMathMatrix.superclass.init.call(this, props);
+    //CMathMatrix.init.call(this, props);
+
+    this.init(props);
     this.setCtrPrp(props.ctrPrp);
 }
 extend(CMathMatrix, CMathBase);
@@ -509,11 +510,11 @@ function CEqArray(props)
     this.maxDist = 0;
     this.objDist = 0;
 
-    this.init(props);
+    this.init_2(props);
     this.setCtrPrp(props.ctrPrp);
 }
 extend(CEqArray, CMathMatrix);
-CEqArray.prototype.init = function(props)
+CEqArray.prototype.init_2 = function(props)
 {
     var Pr =
     {

Word/Math/nary.js

@@ -56,12 +56,12 @@ CNary.prototype.init = function(props)
     {
         var bIntegral = signCode > 0x222A && signCode < 0x2231;
 
-        var MPrp = this.Parent.Composition.GetMathPr();
+        //var MPrp = this.Parent.Composition.GetMathPr();
 
         if(bIntegral)
-            this.limLoc = MPrp.intLim;
+            this.limLoc = g_oMathSettings.intLim;
         else
-            this.limLoc = MPrp.naryLim;
+            this.limLoc = g_oMathSettings.naryLim;
     }