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

Не принимались изменения argSize

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64170 954022d7-b5bf-4e40-9824-e11837661b57
parent cef62b94
...@@ -590,8 +590,6 @@ ParaMath.prototype.Copy = function(Selected) ...@@ -590,8 +590,6 @@ ParaMath.prototype.Copy = function(Selected)
this.Root.CopyTo(NewMath.Root, Selected); this.Root.CopyTo(NewMath.Root, Selected);
} }
/// argSize, bDot и bRoot выставить на объединении контентов
NewMath.Root.Correct_Content(true); NewMath.Root.Correct_Content(true);
return NewMath; return NewMath;
......
...@@ -1133,6 +1133,7 @@ CMathContent.prototype.GetParent = function() ...@@ -1133,6 +1133,7 @@ CMathContent.prototype.GetParent = function()
}; };
CMathContent.prototype.SetArgSize = function(val) CMathContent.prototype.SetArgSize = function(val)
{ {
History.Add( this, { Type : historyitem_Math_ArgSize, New: val, Old: this.ArgSize.GetValue()});
this.ArgSize.SetValue(val); this.ArgSize.SetValue(val);
}; };
CMathContent.prototype.GetArgSize = function() CMathContent.prototype.GetArgSize = function()
...@@ -1689,11 +1690,6 @@ CMathContent.prototype.Internal_Content_Add = function(Pos, Item, bUpdatePositio ...@@ -1689,11 +1690,6 @@ CMathContent.prototype.Internal_Content_Add = function(Pos, Item, bUpdatePositio
this.private_UpdatePosOnAdd(Pos, bUpdatePosition); this.private_UpdatePosOnAdd(Pos, bUpdatePosition);
}; };
CMathContent.prototype.Apply_ArgSize = function(ArgSize)
{
History.Add( this, { Type : historyitem_Math_ArgSize, New: ArgSize, Old: this.ArgSize.GetValue()});
this.ArgSize.SetValue(ArgSize);
};
CMathContent.prototype.private_UpdatePosOnAdd = function(Pos, bUpdatePosition) CMathContent.prototype.private_UpdatePosOnAdd = function(Pos, bUpdatePosition)
{ {
if(bUpdatePosition !== false) if(bUpdatePosition !== false)
...@@ -1873,7 +1869,7 @@ CMathContent.prototype.CopyTo = function(OtherContent, Selected) ...@@ -1873,7 +1869,7 @@ CMathContent.prototype.CopyTo = function(OtherContent, Selected)
} }
OtherContent.plHid = this.plhHide; OtherContent.plHid = this.plhHide;
OtherContent.Apply_ArgSize(this.ArgSize.GetValue()); OtherContent.SetArgSize(this.ArgSize.GetValue());
for(var nPos = nStartPos; nPos <= nEndPos; nPos++) for(var nPos = nStartPos; nPos <= nEndPos; nPos++)
{ {
......
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