Commit 01fb8dfa authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

баг с применением свойств к символу конца параграфа

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64138 954022d7-b5bf-4e40-9824-e11837661b57
parent fe1e7c9f
...@@ -652,7 +652,14 @@ ParaTextPr.prototype = ...@@ -652,7 +652,14 @@ ParaTextPr.prototype =
if ( undefined != TextPr.Color ) if ( undefined != TextPr.Color )
{ {
this.Set_Color(TextPr.Color); this.Set_Color(TextPr.Color);
this.Set_Unifill(undefined); if(undefined != this.Value.Unifill)
{
this.Set_Unifill(undefined);
}
if(undefined != this.Value.TextFill)
{
this.Set_TextFill(undefined);
}
} }
if ( undefined != TextPr.VertAlign ) if ( undefined != TextPr.VertAlign )
...@@ -688,7 +695,14 @@ ParaTextPr.prototype = ...@@ -688,7 +695,14 @@ ParaTextPr.prototype =
if(undefined != TextPr.Unifill) if(undefined != TextPr.Unifill)
{ {
this.Set_Unifill(TextPr.Unifill.createDuplicate()); this.Set_Unifill(TextPr.Unifill.createDuplicate());
this.Set_Color(undefined); if(undefined != this.Value.Color)
{
this.Set_Color(undefined);
}
if(undefined != this.Value.TextFill)
{
this.Set_TextFill(undefined);
}
} }
if(undefined != TextPr.TextOutline) if(undefined != TextPr.TextOutline)
{ {
...@@ -697,6 +711,14 @@ ParaTextPr.prototype = ...@@ -697,6 +711,14 @@ ParaTextPr.prototype =
if(undefined != TextPr.TextFill) if(undefined != TextPr.TextFill)
{ {
this.Set_TextFill(TextPr.TextFill); this.Set_TextFill(TextPr.TextFill);
if(undefined != this.Value.Color)
{
this.Set_Color(undefined);
}
if(undefined != this.Value.Unifill)
{
this.Set_Unifill(undefined);
}
} }
}, },
......
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