Commit 3ead16e7 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58748 954022d7-b5bf-4e40-9824-e11837661b57
parent 6e20bf4c
...@@ -27,6 +27,7 @@ CDegreeBase.prototype.init = function(props) ...@@ -27,6 +27,7 @@ CDegreeBase.prototype.init = function(props)
}; };
CDegreeBase.prototype.fillContent = function() CDegreeBase.prototype.fillContent = function()
{ {
this.setDimension(1, 2);
this.elements[0][0] = this.baseContent; this.elements[0][0] = this.baseContent;
this.elements[0][1] = this.iterContent; this.elements[0][1] = this.iterContent;
}; };
......
...@@ -86,8 +86,10 @@ CMathMatrixPr.prototype.Set_FromObject = function(Obj) ...@@ -86,8 +86,10 @@ CMathMatrixPr.prototype.Set_FromObject = function(Obj)
if (undefined !== Obj.mcs.length) if (undefined !== Obj.mcs.length)
{ {
var nMcsCount = Obj.mcs.length; var nMcsCount = Obj.mcs.length;
this.mcs.length = nMcsCount;
if (0 !== nMcsCount)
{
this.mcs.length = nMcsCount;
for (var nMcsIndex = 0; nMcsIndex < nMcsCount; nMcsIndex++) for (var nMcsIndex = 0; nMcsIndex < nMcsCount; nMcsIndex++)
{ {
this.mcs[nMcsIndex] = new CMathMatrixColumnPr(); this.mcs[nMcsIndex] = new CMathMatrixColumnPr();
...@@ -95,6 +97,9 @@ CMathMatrixPr.prototype.Set_FromObject = function(Obj) ...@@ -95,6 +97,9 @@ CMathMatrixPr.prototype.Set_FromObject = function(Obj)
nColumnsCount += this.mcs[nMcsIndex].count; nColumnsCount += this.mcs[nMcsIndex].count;
} }
} }
else if (undefined !== Obj.column)
nColumnsCount = Obj.column;
}
return nColumnsCount; return nColumnsCount;
}; };
...@@ -588,10 +593,6 @@ CMathMatrix.prototype.setProperties = function(props) ...@@ -588,10 +593,6 @@ CMathMatrix.prototype.setProperties = function(props)
{ {
this.setCtrPrp(props.ctrPrp); this.setCtrPrp(props.ctrPrp);
this.column = this.Pr.Set_FromObject(props); 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() CMathMatrix.prototype.fillContent = function()
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment