Исправлен баг в предыдущей заливке 58743

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

Word/Math/degree.js

@@ -27,6 +27,7 @@ CDegreeBase.prototype.init = function(props)
 };
 CDegreeBase.prototype.fillContent = function()
 {
+    this.setDimension(1, 2);
     this.elements[0][0] = this.baseContent;
     this.elements[0][1] = this.iterContent;
 };

Word/Math/matrix.js

@@ -86,14 +86,19 @@ CMathMatrixPr.prototype.Set_FromObject = function(Obj)
     if (undefined !== Obj.mcs.length)
     {
         var nMcsCount = Obj.mcs.length;
-        this.mcs.length = nMcsCount;
 
-        for (var nMcsIndex = 0; nMcsIndex < nMcsCount; nMcsIndex++)
+        if (0 !== nMcsCount)
         {
-            this.mcs[nMcsIndex] = new CMathMatrixColumnPr();
-            this.mcs[nMcsIndex].Set_FromObject(Obj.mcs[nMcsIndex]);
-            nColumnsCount += this.mcs[nMcsIndex].count;
+            this.mcs.length = nMcsCount;
+            for (var nMcsIndex = 0; nMcsIndex < nMcsCount; nMcsIndex++)
+            {
+                this.mcs[nMcsIndex] = new CMathMatrixColumnPr();
+                this.mcs[nMcsIndex].Set_FromObject(Obj.mcs[nMcsIndex]);
+                nColumnsCount += this.mcs[nMcsIndex].count;
+            }
         }
+        else if (undefined !== Obj.column)
+            nColumnsCount = Obj.column;
     }
 
     return nColumnsCount;
@@ -588,10 +593,6 @@ CMathMatrix.prototype.setProperties = function(props)
 {
     this.setCtrPrp(props.ctrPrp);
     this.column = this.Pr.Set_FromObject(props);
-
-    if(props.mcs.length == 0)
-        this.column = props.column;
-    //this.column = this.Pr.Get_ColumnsCount();
 };
 CMathMatrix.prototype.fillContent = function()
 {