Commit 9730dc86 authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander.Trofimov

прокинуто количество колонок в матрице для случая, когда настройки отсутствуют

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58723 954022d7-b5bf-4e40-9824-e11837661b57
parent 787d608c
...@@ -2695,7 +2695,7 @@ function Binary_oMathWriter(memory, oMathPara) ...@@ -2695,7 +2695,7 @@ function Binary_oMathWriter(memory, oMathPara)
var oElem = oSSubSup.getBase(); var oElem = oSSubSup.getBase();
var props = oSSubSup.getPropsForWrite(); var props = oSSubSup.getPropsForWrite();
this.bs.WriteItem(c_oSer_OMathContentType.SSubPr, function(){oThis.WriteSSubSupPr(props, oSSubSup);}); this.bs.WriteItem(c_oSer_OMathContentType.SSubSupPr, function(){oThis.WriteSSubSupPr(props, oSSubSup);});
this.bs.WriteItem(c_oSer_OMathContentType.Sub, function(){oThis.WriteArgNodes(oSub);}); this.bs.WriteItem(c_oSer_OMathContentType.Sub, function(){oThis.WriteArgNodes(oSub);});
this.bs.WriteItem(c_oSer_OMathContentType.Sup, function(){oThis.WriteArgNodes(oSup);}); this.bs.WriteItem(c_oSer_OMathContentType.Sup, function(){oThis.WriteArgNodes(oSup);});
this.bs.WriteItem(c_oSer_OMathContentType.Element, function(){oThis.WriteArgNodes(oElem);}); this.bs.WriteItem(c_oSer_OMathContentType.Element, function(){oThis.WriteArgNodes(oElem);});
...@@ -9508,15 +9508,11 @@ function Binary_oMathReader(stream) ...@@ -9508,15 +9508,11 @@ function Binary_oMathReader(stream)
oMatr.content.row = 0; oMatr.content.row = 0;
oMatr.content.column = 0; oMatr.content.column = 0;
var column = 0;
for (var i=0; i<props.mcs.length; i++)
column += props.mcs[i].count;
for(var i=0; i<props.row; i++) for(var i=0; i<props.row; i++)
{ {
arrContent[i] = []; arrContent[i] = [];
for(var j=0; j<column; j++) for(var j=0; j<props.column; j++)
arrContent[i][j] = oMatrix.getElement(i,j); arrContent[i][j] = oMatrix.getElement(i,j);
} }
} }
...@@ -9631,6 +9627,12 @@ function Binary_oMathReader(stream) ...@@ -9631,6 +9627,12 @@ function Binary_oMathReader(stream)
res = this.bcr.Read2(length, function(t, l){ res = this.bcr.Read2(length, function(t, l){
return oThis.ReadMathRow(t,l,props); return oThis.ReadMathRow(t,l,props);
}); });
}
else if (c_oSer_OMathBottomNodesType.Column === type)
{
res = this.bcr.Read2(length, function(t, l){
return oThis.ReadMathColumn(t,l,props);
});
} }
else if (c_oSer_OMathBottomNodesType.BaseJc === type) else if (c_oSer_OMathBottomNodesType.BaseJc === type)
{ {
......
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