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

http://bugzserver/show_bug.cgi?id=24788

поправлена ошибка с сохранением свойства mcs для матрицы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59441 954022d7-b5bf-4e40-9824-e11837661b57
parent 6db52fdc
...@@ -2403,22 +2403,28 @@ function Binary_oMathWriter(memory, oMathPara) ...@@ -2403,22 +2403,28 @@ function Binary_oMathWriter(memory, oMathPara)
{ {
this.memory.WriteByte(c_oSer_OMathBottomNodesValType.Val); this.memory.WriteByte(c_oSer_OMathBottomNodesValType.Val);
this.memory.WriteByte(c_oSerPropLenType.Byte); this.memory.WriteByte(c_oSerPropLenType.Byte);
var val = c_oAscLimLoc.SubSup; var val = c_oAscXAlign.Center;
switch (LimLoc) switch (McJc)
{ {
case NARY_SubSup: val = c_oAscLimLoc.SubSup; break; case MCJC_CENTER: val = c_oAscXAlign.Center; break;
case NARY_UndOvr: val = c_oAscLimLoc.UndOvr; case MCJC_INSIDE: val = c_oAscXAlign.Inside; break;
case MCJC_LEFT: val = c_oAscXAlign.Left; break;
case MCJC_OUTSIDE: val = c_oAscXAlign.Outside; break;
case MCJC_RIGHT: val = c_oAscXAlign.Right; break;
} }
this.memory.WriteByte(val);
} }
this.WriteMcs = function(props) this.WriteMcs = function(props)
{ {
var oThis = this; var oThis = this;
for(var i = nStart; i < props.mc.length; i++) for(var i = 0; i < props.mcs.length; i++)
this.bs.WriteItem(c_oSer_OMathContentType.Mc, function(){oThis.WriteMc(props.mc[i]);}); this.bs.WriteItem(c_oSer_OMathContentType.Mc, function(){oThis.WriteMc(props.mcs[i]);});
} }
this.WriteMPr = function(props,oMatrix) this.WriteMPr = function(props,oMatrix)
{ {
var oThis = this; var oThis = this;
if (null != props.row)
this.bs.WriteItem(c_oSer_OMathBottomNodesType.Row, function(){oThis.WriteCount(props.row);});
if (null != props.baseJc) if (null != props.baseJc)
this.bs.WriteItem(c_oSer_OMathBottomNodesType.BaseJc, function(){oThis.WriteBaseJc(props.baseJc);}); this.bs.WriteItem(c_oSer_OMathBottomNodesType.BaseJc, function(){oThis.WriteBaseJc(props.baseJc);});
if (null != props.cGp) if (null != props.cGp)
...@@ -2427,7 +2433,7 @@ function Binary_oMathWriter(memory, oMathPara) ...@@ -2427,7 +2433,7 @@ function Binary_oMathWriter(memory, oMathPara)
this.bs.WriteItem(c_oSer_OMathBottomNodesType.CGpRule, function(){oThis.WriteCGpRule(props.cGpRule);}); this.bs.WriteItem(c_oSer_OMathBottomNodesType.CGpRule, function(){oThis.WriteCGpRule(props.cGpRule);});
if (null != props.cSp) if (null != props.cSp)
this.bs.WriteItem(c_oSer_OMathBottomNodesType.CSp, function(){oThis.WriteCSp(props.cSp);}); this.bs.WriteItem(c_oSer_OMathBottomNodesType.CSp, function(){oThis.WriteCSp(props.cSp);});
if (null != props.column || null != props.mcJc) if (null != props.mcs)
this.bs.WriteItem(c_oSer_OMathBottomNodesType.Mcs, function(){oThis.WriteMcs(props);}); this.bs.WriteItem(c_oSer_OMathBottomNodesType.Mcs, function(){oThis.WriteMcs(props);});
if (null != props.plcHide) if (null != props.plcHide)
this.bs.WriteItem(c_oSer_OMathBottomNodesType.PlcHide, function(){oThis.WritePlcHide(props.plcHide);}); this.bs.WriteItem(c_oSer_OMathBottomNodesType.PlcHide, function(){oThis.WritePlcHide(props.plcHide);});
......
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