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

баг с выставлением outline у текста

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63680 954022d7-b5bf-4e40-9824-e11837661b57
parent 39159f29
......@@ -690,27 +690,14 @@ ParaTextPr.prototype =
this.Set_Unifill(TextPr.Unifill.createDuplicate());
this.Set_Color(undefined);
}
else if(undefined != TextPr.AscUnifill)
{
this.Set_Unifill(CorrectUniFill(TextPr.AscUnifill, this.Value.Unifill, 0));
this.Set_Color(undefined);
}
if(undefined != TextPr.TextOutline)
{
this.Set_TextOutline(TextPr.TextOutline);
}
// else if(undefined != TextPr.AscLine)
// {
// this.Set_TextOutline(CorrectUniStroke(TextPr.AscLine, this.Value.TextOutline, 0));
// }
if(undefined != TextPr.TextFill)
{
this.Set_TextFill(TextPr.TextFill);
}
// else if(undefined != TextPr.AscFill)
// {
// this.Set_TextFill(CorrectUniFill(TextPr.AscFill, this.Value.TextFill, 0));
// }
},
Clear_Style : function()
......
......@@ -5982,7 +5982,8 @@ ParaRun.prototype.Apply_Pr = function(TextPr)
}
else if(undefined !== TextPr.AscLine && this.Paragraph)
{
this.Set_TextOutline(CorrectUniStroke(TextPr.AscLine, TextPr.TextOutline, 0));
var oCompiledPr = this.Get_CompiledPr(true);
this.Set_TextOutline(CorrectUniStroke(TextPr.AscLine, oCompiledPr.TextOutline, 0));
}
if ( undefined != TextPr.VertAlign )
......
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