Skip to content

S
sdkjs
Commit 18227baa authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov
Browse files
Options

к rev. 61868 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61869 954022d7-b5bf-4e40-9824-e11837661b57
parent 1754c0d3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 183 deletions
Word/Math/base.js
View file @ 18227baa
......@@ -1879,138 +1879,6 @@ CMathBase.prototype.Recalculate_Range_OneLine = function(PRS, ParaPr, Depth)
{
this.Recalculate_Range(PRS, ParaPr, Depth);
};
CMathBase.prototype.old_Recalculate_LineMetrics = function(PRS, ParaPr, _CurLine, _CurRange)
{
if(this.bOneLine)
{
this.UpdateMetrics(PRS, this.size);
this.Bounds.UpdateMetrics(0, this.size);
PRS.ContentMetrics.UpdateMetrics(this.size);
}
else
{
var CurLine = _CurLine - this.StartLine;
var CurRange = (0 === CurLine ? _CurRange - this.StartRange : _CurRange);
var StartPos = this.protected_GetRangeStartPos(CurLine, CurRange);
var EndPos = this.protected_GetRangeEndPos(CurLine, CurRange);
for (var CurPos = StartPos; CurPos <= EndPos; CurPos++)
{
var Item = this.Content[CurPos];
if(CurPos == this.NumBreakContent)
{
Item.Recalculate_LineMetrics(PRS, ParaPr, _CurLine, _CurRange);
this.Bounds.UpdateMetrics(CurLine, PRS.ContentMetrics);
}
else
{
this.UpdateMetrics(PRS, Item.size);
this.Bounds.UpdateMetrics(CurLine, Item.size);
}
}
}
};
CMathBase.prototype.Recalculate_LineMetrics_3 = function(PRS, ParaPr, _CurLine, _CurRange)
{
var CurLine = _CurLine - this.StartLine;
var CurRange = (0 === CurLine ? _CurRange - this.StartRange : _CurRange);
if(CurLine == 0 && CurRange == 0)
{
this.Bounds.Reset();
}
var StartPos, EndPos;
if(this.bOneLine)
{
for (var CurPos = 0; CurPos <= this.Content.length - 1; CurPos++)
{
var Item = this.Content[CurPos];
Item.Recalculate_LineMetrics(PRS, ParaPr, _CurLine, _CurRange);
}
PRS.ContentMetrics.UpdateMetrics(this.size);
this.Bounds.UpdateMetrics(CurLine, this.size);
if(PRS.LineAscent < this.size.ascent)
PRS.LineAscent = this.size.ascent;
if(PRS.LineDescent < this.size.height - this.size.ascent)
PRS.LineDescent = this.size.height - this.size.ascent;
}
else
{
StartPos = this.protected_GetRangeStartPos(CurLine, CurRange);
EndPos = this.protected_GetRangeEndPos(CurLine, CurRange);
for (var CurPos = StartPos; CurPos <= EndPos; CurPos++)
{
var Item = this.Content[CurPos];
Item.Recalculate_LineMetrics(PRS, ParaPr, _CurLine, _CurRange);
}
this.Bounds.UpdateMetrics(CurLine, PRS.ContentMetrics);
}
if(this.bOneLine)
{
StartPos = 0;
EndPos = this.Content.length - 1;
}
else
{
StartPos = this.protected_GetRangeStartPos(CurLine, CurRange);
EndPos = this.protected_GetRangeEndPos(CurLine, CurRange);
}
for (var CurPos = StartPos; CurPos <= EndPos; CurPos++)
{
var Item = this.Content[CurPos];
Item.Recalculate_LineMetrics(PRS, ParaPr, _CurLine, _CurRange);
//PRS.ContentMetrics.UpdateMetrics(Size);
}
if(this.bOneLine)
{
PRS.ContentMetrics.UpdateMetrics(this.size);
this.Bounds.UpdateMetrics(CurLine, this.size);
if(PRS.LineAscent < this.size.ascent)
PRS.LineAscent = this.size.ascent;
if(PRS.LineDescent < this.size.height - this.size.ascent)
PRS.LineDescent = this.size.height - this.size.ascent;
}
else
this.Bounds.UpdateMetrics(CurLine, PRS.ContentMetrics);
/*for (var CurPos = StartPos; CurPos <= EndPos; CurPos++)
{
var Item = this.Content[CurPos];
if(CurPos == this.NumBreakContent)
{
Item.Recalculate_LineMetrics(PRS, ParaPr, _CurLine, _CurRange);
this.Bounds.UpdateMetrics(CurLine, PRS.ContentMetrics);
}
else
{
this.UpdateMetrics(PRS, Item.size);
this.Bounds.UpdateMetrics(CurLine, Item.size);
}
}*/
};
CMathBase.prototype.Recalculate_LineMetrics = function(PRS, ParaPr, _CurLine, _CurRange)
{
var CurLine = _CurLine - this.StartLine;
......@@ -2035,12 +1903,6 @@ CMathBase.prototype.Recalculate_LineMetrics = function(PRS, ParaPr, _CurLine, _C
PRS.ContentMetrics.UpdateMetrics(this.size);
this.UpdatePRS(PRS, this.size);
/*if(PRS.LineAscent < this.size.ascent)
PRS.LineAscent = this.size.ascent;
if(PRS.LineDescent < this.size.height - this.size.ascent)
PRS.LineDescent = this.size.height - this.size.ascent;*/
}
else
{
......@@ -2058,12 +1920,6 @@ CMathBase.prototype.Recalculate_LineMetrics = function(PRS, ParaPr, _CurLine, _C
PRS.ContentMetrics.UpdateMetrics(BoundItem);
this.UpdatePRS(PRS, BoundItem);
/*if(PRS.LineAscent < BoundItem.Asc)
PRS.LineAscent = BoundItem.Asc;
if(PRS.LineDescent < BoundItem.H - BoundItem.Asc)
PRS.LineDescent = BoundItem.H - BoundItem.Asc;*/
}
}
};
......
Word/Math/nary.js
View file @ 18227baa
......@@ -572,36 +572,6 @@ CNary.prototype.Draw_Elements = function(PDSE)
this.Arg.Draw_Elements(PDSE);
};
CNary.prototype.Recalculate_LineMetrics_2 = function(PRS, ParaPr, _CurLine, _CurRange)
{
var CurLine = _CurLine - this.StartLine;
var CurRange = (0 === CurLine ? _CurRange - this.StartRange : _CurRange);
if(CurLine == 0 && CurRange == 0)
{
this.Bounds.Reset();
if(this.Base.IsJustDraw())
{
PRS.ContentMetrics.UpdateMetrics(this.Base.size);
}
else
{
this.Base.Recalculate_LineMetrics(PRS, ParaPr, _CurLine, _CurRange);
}
}
var ParentContentMetric = PRS.ContentMetrics;
PRS.ContentMetrics = new CMathBoundsMeasures();
this.Arg.Recalculate_LineMetrics(PRS, ParaPr, _CurLine, _CurRange);
this.Bounds.UpdateMetrics(CurLine, PRS.ContentMetrics);
ParentContentMetric.UpdateMetrics(PRS.ContentMetrics);
PRS.ContentMetrics = ParentContentMetric;
};
CNary.prototype.Recalculate_LineMetrics = function(PRS, ParaPr, _CurLine, _CurRange)
{
if(this.bOneLine)
......@@ -741,11 +711,6 @@ function CNaryOvr(bInside)
this.setDimension(2, 1);
}
Asc.extendClass(CNaryOvr, CMathBase);
CNaryOvr.prototype.old_setDistance = function()
{
var zetta = this.Get_TxtPrControlLetter().FontSize* 25.4/96;
this.dH = zetta*0.1;
};
CNaryOvr.prototype.PreRecalc = function(Parent, ParaMath, ArgSize, RPI)
{
this.Parent = Parent;
......@@ -785,10 +750,6 @@ CNaryOvr.prototype.recalculateSize = function()
this.size.width = width;
this.size.ascent = ascent;
};
CNaryOvr.prototype.old_getAscent = function()
{
return this.elements[0][0].size.ascent;
};
CNaryOvr.prototype.getLowerIterator = function()
{
return this.elements[1][0];
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7