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

Исправлен баг с запросом первого параграфа в таблице (баг 19677).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50818 954022d7-b5bf-4e40-9824-e11837661b57
parent 15a47dea
......@@ -9148,6 +9148,8 @@ Paragraph.prototype =
else if ( type_Table === NextEl.GetType() )
{
var TableFirstParagraph = NextEl.Get_FirstParagraph();
if ( null != TableFirstParagraph && undefined != TableFirstParagraph )
{
var NextStyle = TableFirstParagraph.Style_Get();
var Next_Before = TableFirstParagraph.Get_CompiledPr2(false).ParaPr.Spacing.Before;
var Next_BeforeAuto = TableFirstParagraph.Get_CompiledPr2(false).ParaPr.Spacing.BeforeAutoSpacing;
......@@ -9166,6 +9168,7 @@ Paragraph.prototype =
}
}
}
}
else
{
Pr.ParaPr.Spacing.After = this.Internal_CalculateAutoSpacing( Pr.ParaPr.Spacing.After, Pr.ParaPr.Spacing.AfterAutoSpacing, this );
......
......@@ -2518,6 +2518,9 @@ CTable.prototype =
// Получаем первый параграф первой ячейки. (Нужно для контроля ContextualSpacing)
Get_FirstParagraph : function()
{
if ( this.Content.length <= 0 || this.Content[0].Content.length <= 0 )
return null;
return this.Content[0].Content[0].Content.Get_FirstParagraph();
},
......
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