pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-02-10 18:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #77378

Browse Source 
Fixed an infinite recalculation loop when braking to a new line due to wrapping and the prohibition to start a line with specified characters
This commit is contained in:
Ilya Kirillov
2025-11-26 15:18:21 +03:00
parent 4f9a27ceeb
commit 248bf7c9a0
2 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
word/Editor/Paragraph_Recalculate.js
View File

@ -1282,11 +1282,41 @@ Paragraph.prototype.private_RecalculateLineMetrics = function(CurLine, CurPa
// текста, на котором закончилась данная строка.
if ( true === PRS.EmptyLine || (PRS.LineAscent < 0.001 && PRS.LineDescent < 0.001) || (true === PRS.End && true !== PRS.TextOnLine))
{
var LastItem = (true === PRS.End ? this.Content[this.Content.length - 1] : this.Content[this.Lines[CurLine].Ranges[this.Lines[CurLine].Ranges.length - 1].EndPos]);
if (true === PRS.End)
let useParaEnd = true;
if (true !== PRS.End)
{
let lastRange = this.Lines[CurLine].Ranges.length - 1;
let lastItem = this.Content[this.Lines[CurLine].Ranges[lastRange].EndPos];
let lastRun = lastItem.Get_LastRunInRange(CurLine, lastRange);
if (lastRun && lastRun instanceof AscWord.CRun)
{
let metrics = lastRun.getTextMetrics(true);
let textDescent = metrics.Descent;
let textAscent = metrics.Ascent + metrics.LineGap;
let textAscent2 = metrics.Ascent;
if (PRS.LineTextAscent < textAscent)
PRS.LineTextAscent = textAscent;
if (PRS.LineTextAscent2 < textAscent2)
PRS.LineTextAscent2 = textAscent2;
if (PRS.LineTextDescent < textDescent)
PRS.LineTextDescent = textDescent;
if (PRS.LineAscent < textAscent)
PRS.LineAscent = textAscent;
if (PRS.LineDescent < textDescent)
PRS.LineDescent = textDescent;
useParaEnd = false;
}
}
if (useParaEnd || (PRS.LineAscent < 0.001 && PRS.LineDescent < 0.001))
{
// TODO: Как только переделаем para_End переделать тут
let oTextPr = this.GetParaEndCompiledPr();
let oMetrics = oTextPr.GetTextMetrics(oTextPr.CS || oTextPr.RTL ? AscWord.fontslot_CS : AscWord.fontslot_ASCII, this.GetTheme());
@ -1304,33 +1334,6 @@ Paragraph.prototype.private_RecalculateLineMetrics = function(CurLine, CurPa
if (PRS.LineDescent < EndTextDescent)
PRS.LineDescent = EndTextDescent;
}
else if (undefined !== LastItem)
{
let lastRun = LastItem.Get_LastRunInRange(PRS.Line, PRS.Range);
if (lastRun && lastRun instanceof AscWord.CRun)
{
let metrics = lastRun.getTextMetrics();
let textDescent = metrics.Descent;
let textAscent = metrics.Ascent + metrics.LineGap;
let textAscent2 = metrics.Ascent;
if (PRS.LineTextAscent < textAscent)
PRS.LineTextAscent = textAscent;
if (PRS.LineTextAscent2 < textAscent2)
PRS.LineTextAscent2 = textAscent2;
if (PRS.LineTextDescent < textDescent)
PRS.LineTextDescent = textDescent;
if (PRS.LineAscent < textAscent)
PRS.LineAscent = textAscent;
if (PRS.LineDescent < textDescent)
PRS.LineDescent = textDescent;
}
}
}
// Рассчитаем метрики строки

6
word/Editor/Run.js
View File

@ -2224,7 +2224,7 @@ ParaRun.prototype.Get_ParaPosByContentPos = function(ContentPos, Depth)
}
}
return new CParaPos((LinesCount === 1 ? this.protected_GetRangesCount(0) - 1 + this.StartRange : this.protected_GetRangesCount(0) - 1), LinesCount - 1 + this.StartLine, 0, 0);
return new CParaPos((LinesCount === 1 ? this.protected_GetRangesCount(0) - 1 + this.StartRange : this.protected_GetRangesCount(LinesCount - 1) - 1), LinesCount - 1 + this.StartLine, 0, 0);
};
ParaRun.prototype.recalculateCursorPosition = function(positionCalculator, isCurrent)
@ -3437,7 +3437,7 @@ ParaRun.prototype.Recalculate_MeasureContent = function()
this.RecalcInfo.Recalc = true;
this.RecalcInfo.ResetMeasure();
};
ParaRun.prototype.getTextMetrics = function()
ParaRun.prototype.getTextMetrics = function(isForceEmpty)
{
let textPr = this.Get_CompiledPr(false);
if (this.IsUseAscFont(textPr))
@ -3453,7 +3453,7 @@ ParaRun.prototype.getTextMetrics = function()
fontSlot |= this.Content[nPos].GetFontSlot(textPr);
}
if (AscWord.fontslot_Unknown === fontSlot)
if ((AscWord.fontslot_Unknown === fontSlot) || (AscWord.fontslot_None === fontSlot && isForceEmpty))
fontSlot = textPr.CS || textPr.RTL ? AscWord.fontslot_CS : AscWord.fontslot_ASCII;
return textPr.GetTextMetrics(fontSlot, this.Paragraph.GetTheme());