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

Исправлен баг с компиляцией стилей таблицы (баг 21641).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51054 954022d7-b5bf-4e40-9824-e11837661b57
parent 39f76c22
......@@ -4039,8 +4039,8 @@ CStyles.prototype =
{
var DefId = this.Default.Table;
Pr.ParaPr.Merge( this.Style[DefId].ParaPr );
Pr.TextPr.Merge( this.Style[DefId].TextPr );
//Pr.ParaPr.Merge( this.Style[DefId].ParaPr );
//Pr.TextPr.Merge( this.Style[DefId].TextPr );
Pr.TablePr.Merge( this.Styles[DefId].TablePr );
Pr.TableRowPr.Merge( this.Styles[DefId].TableRowPr );
Pr.TableCellPr.Merge( this.Styles[DefId].TableCellPr );
......@@ -4087,8 +4087,8 @@ CStyles.prototype =
{
var DefId = this.Default.Table;
Pr.ParaPr.Merge( this.Style[DefId].ParaPr );
Pr.TextPr.Merge( this.Style[DefId].TextPr );
//Pr.ParaPr.Merge( this.Style[DefId].ParaPr );
//Pr.TextPr.Merge( this.Style[DefId].TextPr );
Pr.TablePr.Merge( this.Styles[DefId].TablePr );
Pr.TableRowPr.Merge( this.Styles[DefId].TableRowPr );
Pr.TableCellPr.Merge( this.Styles[DefId].TableCellPr );
......@@ -4122,8 +4122,8 @@ CStyles.prototype =
}
case styletype_Table:
{
Pr.ParaPr.Merge( Style.ParaPr );
Pr.TextPr.Merge( Style.TextPr );
//Pr.ParaPr.Merge( Style.ParaPr );
//Pr.TextPr.Merge( Style.TextPr );
// Заглушка на случай, если в табличные стили начнут объединять с не табличными стилями
if ( undefined != Style.TablePr )
......@@ -4193,8 +4193,8 @@ CStyles.prototype =
}
case styletype_Table:
{
Pr.ParaPr.Merge( Style.ParaPr );
Pr.TextPr.Merge( Style.TextPr );
//Pr.ParaPr.Merge( Style.ParaPr );
//Pr.TextPr.Merge( Style.TextPr );
if ( undefined != Style.TablePr )
{
......
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