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

При несовпадении Unifill и TextFill выставляем их в undefined

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66957 954022d7-b5bf-4e40-9824-e11837661b57
parent a1be4503
...@@ -7768,6 +7768,9 @@ CTextPr.prototype = ...@@ -7768,6 +7768,9 @@ CTextPr.prototype =
if(undefined !== this.Unifill && !this.Unifill.IsIdentical(TextPr.Unifill)) if(undefined !== this.Unifill && !this.Unifill.IsIdentical(TextPr.Unifill))
{ {
this.Unifill = CompareUniFill(this.Unifill, TextPr.Unifill); this.Unifill = CompareUniFill(this.Unifill, TextPr.Unifill);
if(null === this.Unifill){
this.Unifill = undefined;
}
this.Color = undefined; this.Color = undefined;
this.TextFill = undefined; this.TextFill = undefined;
} }
...@@ -7777,7 +7780,10 @@ CTextPr.prototype = ...@@ -7777,7 +7780,10 @@ CTextPr.prototype =
{ {
this.Unifill = undefined; this.Unifill = undefined;
this.Color = undefined; this.Color = undefined;
this.TextFill = CompareUniFill(this.TextFill, TextPr.TextFill);; this.TextFill = CompareUniFill(this.TextFill, TextPr.TextFill);
if(null === this.TextFill){
this.TextFill = 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