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

При вставке символа из меню не подхватывались текстовые настройки соответствующего Run

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68167 954022d7-b5bf-4e40-9824-e11837661b57
parent fdbe6e45
...@@ -2322,7 +2322,12 @@ CMathContent.prototype.private_LoadFromMenuSymbol = function(Type, Pr) ...@@ -2322,7 +2322,12 @@ CMathContent.prototype.private_LoadFromMenuSymbol = function(Type, Pr)
} }
if (-1 !== Code) if (-1 !== Code)
this.Add_Symbol(Code); {
var bSimpleInsert = this.Content.length > 0 && this.Content[this.CurPos].Type == para_Math_Run && this.Selection_IsEmpty() == true; // находимся в Run, селект отсутствует
var TextPr = bSimpleInsert == false ? new CTextPr() : this.Content[this.CurPos].Get_TextPr();
this.Add_Symbol(Code, TextPr);
}
}; };
CMathContent.prototype.private_LoadFromMenuFraction = function(Type, Pr) CMathContent.prototype.private_LoadFromMenuFraction = function(Type, Pr)
{ {
...@@ -2864,13 +2869,14 @@ CMathContent.prototype.Add_Text = function(sText, Paragraph, MathStyle) ...@@ -2864,13 +2869,14 @@ CMathContent.prototype.Add_Text = function(sText, Paragraph, MathStyle)
this.CurPos++; this.CurPos++;
} }
}; };
CMathContent.prototype.Add_Symbol = function(Code) CMathContent.prototype.Add_Symbol = function(Code, TextPr)
{ {
var MathRun = new ParaRun(this.Paragraph, true); var MathRun = new ParaRun(this.Paragraph, true);
var Symbol = new CMathText(false); var Symbol = new CMathText(false);
Symbol.add(Code); Symbol.add(Code);
MathRun.Add(Symbol, true); MathRun.Add(Symbol, true);
MathRun.Apply_Pr(TextPr);
this.Internal_Content_Add(this.CurPos, MathRun, false); this.Internal_Content_Add(this.CurPos, MathRun, false);
this.CurPos++; this.CurPos++;
......
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