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

Поправлен баг на открытие : в случае если в eqArray вложены еще EqqArray, в...

Поправлен баг на открытие : в случае если в eqArray вложены еще EqqArray, в этом случае RecalculateInfo c точками выравнивания и массивом соответсвующих ширин не должен затираться внутренним EqArray

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57875 954022d7-b5bf-4e40-9824-e11837661b57
parent a428bd91
No related merge requests found
...@@ -53,6 +53,7 @@ CRPI.prototype.Copy = function() ...@@ -53,6 +53,7 @@ CRPI.prototype.Copy = function()
RPI.bInsideFraction = this.bInsideFraction; RPI.bInsideFraction = this.bInsideFraction;
RPI.bChangeInline = this.bChangeInline; RPI.bChangeInline = this.bChangeInline;
RPI.bNaryInline = this.bNaryInline; RPI.bNaryInline = this.bNaryInline;
RPI.bManyRuns = false;
return RPI; return RPI;
} }
......
...@@ -710,12 +710,14 @@ CEqArray.prototype.init = function(props) ...@@ -710,12 +710,14 @@ CEqArray.prototype.init = function(props)
} }
CEqArray.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize) CEqArray.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize)
{ {
var CurrAmperWPoints = RPI.AmperWPoints,
CurrEqqArray = RPI.bEqqArray;
RPI.bEqqArray = true; RPI.bEqqArray = true;
this.Parent = Parent; this.Parent = Parent;
this.ParaMath = ParaMath; this.ParaMath = ParaMath;
//this.Set_CompiledCtrPrp(ParaMath);
RPI.AmperWPoints = new AmperWidths(); RPI.AmperWPoints = new AmperWidths();
...@@ -728,8 +730,8 @@ CEqArray.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize) ...@@ -728,8 +730,8 @@ CEqArray.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize)
this.recalculateSize(oMeasure, RPI); this.recalculateSize(oMeasure, RPI);
RPI.AmperWPoints = null; RPI.AmperWPoints = CurrAmperWPoints;
RPI.bEqqArray = false; RPI.bEqqArray = CurrEqqArray;
//CEqArray.superclass.Resize.call(this, oMeasure, Parent, ParaMath, RPI, ArgSize); //CEqArray.superclass.Resize.call(this, oMeasure, Parent, ParaMath, RPI, ArgSize);
} }
......
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