Commit 30c229a8 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@58662 954022d7-b5bf-4e40-9824-e11837661b57
parent 685a6b39
...@@ -209,11 +209,12 @@ ParaMath.prototype.Add = function(Item) ...@@ -209,11 +209,12 @@ ParaMath.prototype.Add = function(Item)
var EndPos = Pos + 1; var EndPos = Pos + 1;
var oItem = oStartContent.Content[i]; var oItem = oStartContent.Content[i];
oMRun.Add(oItem, true); oMRun.Add(oItem, true);
oStartContent.Remove_FromContent(i, 1, false); oStartContent.Remove_FromContent(i, 1, false);
} }
oStartContent.Selection_Remove(); oStartContent.Selection_Remove();
oMRun.State.ContentPos = 0;
} }
oContent.Content.Load_FromMenu(Item.Menu, this.Paragraph); oContent.Content.Load_FromMenu(Item.Menu, this.Paragraph);
if(nPosStart != nLenStart) if(nPosStart != nLenStart)
...@@ -225,6 +226,8 @@ ParaMath.prototype.Add = function(Item) ...@@ -225,6 +226,8 @@ ParaMath.prototype.Add = function(Item)
PosEnd = Pos + 1; PosEnd = Pos + 1;
History.Add(oContent.Content, {Type: historyitem_Math_AddItem, Items: items, Pos: Pos, PosEnd: PosEnd}); History.Add(oContent.Content, {Type: historyitem_Math_AddItem, Items: items, Pos: Pos, PosEnd: PosEnd});
} }
else
oContent.Content.CurPos++;
} }
......
...@@ -7330,7 +7330,10 @@ ParaRun.prototype.Read_FromBinary2 = function(Reader) ...@@ -7330,7 +7330,10 @@ ParaRun.prototype.Read_FromBinary2 = function(Reader)
this.Pr.Read_FromBinary( Reader ); this.Pr.Read_FromBinary( Reader );
if (para_Math_Run == this.Type) if (para_Math_Run == this.Type)
{
this.MathPrp = new CMPrp(); this.MathPrp = new CMPrp();
this.size = new CMathSize();
}
if(undefined !== editor && true === editor.isDocumentEditor) if(undefined !== editor && true === editor.isDocumentEditor)
{ {
......
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