Commit 8a2a6d92 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@55340 954022d7-b5bf-4e40-9824-e11837661b57
parent 75731697
...@@ -160,16 +160,26 @@ ParaMath.prototype = ...@@ -160,16 +160,26 @@ ParaMath.prototype =
oElem.relate(oParent); oElem.relate(oParent);
oElem.init(props); oElem.init(props);
var Pos = oParent.CurPos,
PosEnd = Pos + 1;
var items = new Array();
if (oParent) if (oParent)
{
oParent.addElementToContent(oElem); oParent.addElementToContent(oElem);
var element = new mathElem(oElem);
items.push(element);
History.Add(oParent, {Type: historyitem_Math_AddItem, Items: items, Pos: Pos, PosEnd: PosEnd});
}
}, },
CreateFraction : function (oFraction,oParentElem,props,sNumText,sDenText) CreateFraction : function (oFraction,oParentElem,props,sNumText,sDenText)
{ {
this.CreateElem(oFraction, oParentElem, props); this.CreateElem(oFraction, oParentElem, props);
var oElemDen = oFraction.getDenominator(); var oElemDen = oFraction.getDenominator();
this.AddText(oElemDen, sDenText); this.AddText(oElemDen, sDenText);
var oElemNum = oFraction.getNumerator(); var oElemNum = oFraction.getNumerator();
......
...@@ -8193,6 +8193,7 @@ function Binary_oMathReader(stream) ...@@ -8193,6 +8193,7 @@ function Binary_oMathReader(stream)
else if (c_oSer_OMathContentType.MRun === type) else if (c_oSer_OMathContentType.MRun === type)
{ {
var oMRun = new ParaRun(); var oMRun = new ParaRun();
oMRun.bMathRun = true;
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathMRun(t,l,oMRun,props,oElem); return oThis.ReadMathMRun(t,l,oMRun,props,oElem);
}); });
......
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