Commit 46708a21 authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

добавление готовой формулы из меню в текущую формулу

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53025 954022d7-b5bf-4e40-9824-e11837661b57
parent 472f3c46
...@@ -7691,12 +7691,16 @@ ParaMath.prototype = ...@@ -7691,12 +7691,16 @@ ParaMath.prototype =
this.Math.AddLetter( 0x0020 ); this.Math.AddLetter( 0x0020 );
else if ( para_Math === Type ) else if ( para_Math === Type )
{ {
var oCurContent = this.Math.CurrentContent; /*var oCurContent = this.Math.CurrentContent;
var rPr = oCurContent.getCurrRunPrp(); var rPr = oCurContent.getCurrRunPrp();
Item.Math.Root.setRPrp(rPr); Item.Math.Root.setRPrp(rPr);
oCurContent.addToContent_2(Item.Math.Root); oCurContent.addToContent_2(Item.Math.Root);
//Item.Measure(g_oTextMeasurer, rPr); //Item.Measure(g_oTextMeasurer, rPr);
oCurContent.verifyRPrp_MC_2(rPr); oCurContent.verifyRPrp_MC_2(rPr);*/
var rPr = this.Math.GetCurrentRPrp();
Item.Math.Root.setRPrp(rPr);
this.Math.AddToComposition(Item.Math.Root);
} }
}, },
......
...@@ -7031,6 +7031,9 @@ CMathComposition.prototype = ...@@ -7031,6 +7031,9 @@ CMathComposition.prototype =
var result = this.Root.selection_End(x, y, MouseEvent); var result = this.Root.selection_End(x, y, MouseEvent);
this.SelectContent = result.SelectContent; this.SelectContent = result.SelectContent;
if(!this.SelectContent.selectUse())
this.CurrentContent = this.SelectContent;
}, },
Selection_Draw: function() Selection_Draw: function()
{ {
......
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