Commit 6d055e9e authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с дублированием подкоренного выражения в радикале при записи (баг 27347).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59400 954022d7-b5bf-4e40-9824-e11837661b57
parent fe59d833
...@@ -754,6 +754,7 @@ CMathBase.prototype.Fill_LogicalContent = function(nCount) ...@@ -754,6 +754,7 @@ CMathBase.prototype.Fill_LogicalContent = function(nCount)
{ {
this.Content[nIndex] = new CMathContent(); this.Content[nIndex] = new CMathContent();
this.Content[nIndex].ParentElement = this; this.Content[nIndex].ParentElement = this;
this.Content[nIndex].Parent = this;
} }
}; };
CMathBase.prototype.Copy = function() CMathBase.prototype.Copy = function()
...@@ -813,6 +814,7 @@ CMathBase.prototype.Read_FromBinary2 = function( Reader ) ...@@ -813,6 +814,7 @@ CMathBase.prototype.Read_FromBinary2 = function( Reader )
{ {
this.Content[nIndex] = g_oTableId.Get_ById(Reader.GetString2()); this.Content[nIndex] = g_oTableId.Get_ById(Reader.GetString2());
this.Content[nIndex].ParentElement = this; this.Content[nIndex].ParentElement = this;
this.Content[nIndex].Parent = this;
} }
this.Pr.Read_FromBinary(Reader); this.Pr.Read_FromBinary(Reader);
......
...@@ -426,11 +426,7 @@ CRadical.prototype.kind = MATH_RADICAL; ...@@ -426,11 +426,7 @@ CRadical.prototype.kind = MATH_RADICAL;
CRadical.prototype.init = function(props) CRadical.prototype.init = function(props)
{ {
this.setProperties(props); this.setProperties(props);
this.Fill_LogicalContent(2);
if (true === this.Pr.degHide)
this.Fill_LogicalContent(1);
else
this.Fill_LogicalContent(2);
this.fillContent(); this.fillContent();
} }
...@@ -649,10 +645,7 @@ CRadical.prototype.draw = function(x, y, pGraphics) ...@@ -649,10 +645,7 @@ CRadical.prototype.draw = function(x, y, pGraphics)
} }
CRadical.prototype.getBase = function() CRadical.prototype.getBase = function()
{ {
if (true === this.Pr.degHide) return this.Content[1];
return this.Content[0];
else
return this.Content[1];
} }
CRadical.prototype.getDegree = function() CRadical.prototype.getDegree = 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