Skip to content

S
sdkjs
Commit 701f9262 authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander.Trofimov
Browse files
Options

выставление null для степени дроби 

настройки для мастрицы передаются для каждого столбца

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56799 954022d7-b5bf-4e40-9824-e11837661b57
parent 6752e45b
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 22 deletions
Word/Editor/Serialize2.js
View file @ 701f9262
......@@ -8163,6 +8163,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathAccPr(t,l,props);
});
var oMathAcc = new CAccent(props);
if (oParent)
oParent.addElementToContent(oMathAcc);
oContent.content = oMathAcc.getBase();
}
......@@ -8327,6 +8328,7 @@ function Binary_oMathReader(stream)
{
var oMatrix = {};
var arrContent = [];
props.mc = [];
res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathMatrix(t,l,props,oElem,oMatrix,arrContent);
});
......@@ -8455,6 +8457,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathBarPr(t,l,props,oBar);
});
var oBar = new CBar(props);
if (oParent)
oParent.addElementToContent(oBar);
oContent.content = oBar.getBase();
}
......@@ -8519,6 +8522,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathBorderBoxPr(t,l,props);
});
var oBorderBox = new CBorderBox(props);
if (oParent)
oParent.addElementToContent(oBorderBox);
oContent.content = oBorderBox.getBase();
}
......@@ -8606,6 +8610,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathBoxPr(t,l,props);
});
var oBox = new CBox(props);
if (oParent)
oParent.addElementToContent(oBox);
oContent.content = oBox.getBase();
}
......@@ -8952,6 +8957,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathFPr(t,l,props);
});
var oFraction = new CFraction(props);
if (oParent)
oParent.addElementToContent(oFraction);
oElemDen.content = oFraction.getDenominator();
oElemNum.content = oFraction.getNumerator();
......@@ -9006,6 +9012,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathFuncPr(t,l,props);
});
var oFunc = new CMathFunc(props);
if (oParent)
oParent.addElementToContent(oFunc);
oContent.content = oFunc.getArgument();
oName.content = oFunc.getFName();
......@@ -9066,6 +9073,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathGroupChrPr(t,l,props);
});
var oGroupChr = new CGroupCharacter(props);
if (oParent)
oParent.addElementToContent(oGroupChr);
oContent.content = oGroupChr.getBase();
}
......@@ -9190,6 +9198,7 @@ function Binary_oMathReader(stream)
});
props.type = LIMIT_LOW;
var oLimLow = new CLimit(props);
if (oParent)
oParent.addElementToContent(oLimLow);
oContent.content = oLimLow.getFName();
oLim.content = oLimLow.getIterator();
......@@ -9239,6 +9248,7 @@ function Binary_oMathReader(stream)
});
props.type = LIMIT_UP;
var oLimUpp = new CLimit(props);
if (oParent)
oParent.addElementToContent(oLimUpp);
oContent.content = oLimUpp.getFName();
oLim.content = oLimUpp.getIterator();
......@@ -9301,6 +9311,7 @@ function Binary_oMathReader(stream)
oMatr.row = 0;
oMatr.column = 0;
var oMatrix = new CMathMatrix(props);
if (oParent)
oParent.addElementToContent(oMatrix);
oMatr.content = oMatrix;
......@@ -9384,9 +9395,11 @@ function Binary_oMathReader(stream)
var oThis = this;
if (c_oSer_OMathContentType.Mc === type)
{
var mc = {};
res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathMc(t,l,props);
return oThis.ReadMathMc(t,l,mc);
});
props.mc.push(mc);
}
else
res = c_oSerConstants.ReadUnknown;
......@@ -9540,6 +9553,7 @@ function Binary_oMathReader(stream)
}
oMRun.Set_MathPrp(props);
if (oParent)
oParent.addElementToContent(oMRun);
}
else if (c_oSer_OMathContentType.MRPr === type)
......@@ -9614,6 +9628,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathNaryPr(t,l,props);
});
var oNary = new CNary(props);
if (oParent)
oParent.addElementToContent(oNary);
oSub.content = oNary.getLowerIterator();
oSup.content = oNary.getUpperIterator();
......@@ -9786,6 +9801,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathPhantPr(t,l,props);
});
var oPhant = new CPhantom(props);
if (oParent)
oParent.addElementToContent(oPhant);
oContent.content = oPhant.getBase();
}
......@@ -9885,6 +9901,7 @@ function Binary_oMathReader(stream)
return oThis.ReadMathRadPr(t,l,props,oRad);
});
var oRad = new CRadical(props);
if (oParent)
oParent.addElementToContent(oRad);
oDeg.content = oRad.getDegree();
oContent.content = oRad.getBase();
......@@ -9893,6 +9910,9 @@ function Binary_oMathReader(stream)
{
if (oDeg.content && length == 0 && props.degHide !== true)
oDeg.content.fillPlaceholders();
else if ( oDeg.content && length == 0 && props.degHide == true)
oDeg.content = null;
res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oDeg.content);
});
......@@ -10032,6 +10052,7 @@ function Binary_oMathReader(stream)
});
props.type = DEGREE_PreSubSup;
var oSPre = new CDegreeSubSup(props);
if (oParent)
oParent.addElementToContent(oSPre);
oSub.content = oSPre.getLowerIterator();
oSup.content = oSPre.getUpperIterator();
......@@ -10090,6 +10111,7 @@ function Binary_oMathReader(stream)
});
props.type = DEGREE_SUBSCRIPT;
var oSSub = new CDegree(props);
if (oParent)
oParent.addElementToContent(oSSub);
oSub.content = oSSub.getLowerIterator();
oContent.content = oSSub.getBase();
......@@ -10139,6 +10161,7 @@ function Binary_oMathReader(stream)
});
props.type = DEGREE_SubSup;
var oSSubSup = new CDegreeSubSup(props);
if (oParent)
oParent.addElementToContent(oSSubSup);
oSub.content = oSSubSup.getLowerIterator();
oSup.content = oSSubSup.getUpperIterator();
......@@ -10203,6 +10226,7 @@ function Binary_oMathReader(stream)
});
props.type = DEGREE_SUPERSCRIPT;
var oSSup = new CDegree(props);
if (oParent)
oParent.addElementToContent(oSSup);
oSup.conten = oSSup.getUpperIterator();
oContent.content = oSSup.getBase();
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7