Commit 20350ffe authored by Sergey Luzyanin's avatar Sergey Luzyanin

fixed bugs in the dotted line

parent 548c98e5
...@@ -4120,6 +4120,9 @@ CLn.prototype = ...@@ -4120,6 +4120,9 @@ CLn.prototype =
{ {
_ret.prstDash = this.prstDash; _ret.prstDash = this.prstDash;
} }
else{
_ret.prstDash = undefined;
}
if(this.Join === line.Join) if(this.Join === line.Join)
{ {
_ret.Join = this.Join; _ret.Join = this.Join;
...@@ -4245,7 +4248,7 @@ CLn.prototype = ...@@ -4245,7 +4248,7 @@ CLn.prototype =
return ln && (this.Fill == null ? ln.Fill == null : this.Fill.IsIdentical(ln.Fill) )&& (this.Join == null ? ln.Join == null : this.Join.IsIdentical(ln.Join) ) return ln && (this.Fill == null ? ln.Fill == null : this.Fill.IsIdentical(ln.Fill) )&& (this.Join == null ? ln.Join == null : this.Join.IsIdentical(ln.Join) )
&& (this.headEnd == null ? ln.headEnd == null : this.headEnd.IsIdentical(ln.headEnd) ) && (this.headEnd == null ? ln.headEnd == null : this.headEnd.IsIdentical(ln.headEnd) )
&& (this.tailEnd == null ? ln.tailEnd == null : this.tailEnd.IsIdentical(ln.headEnd)) && && (this.tailEnd == null ? ln.tailEnd == null : this.tailEnd.IsIdentical(ln.headEnd)) &&
this.algn == ln.algn && this.cap == ln.cap && this.cmpd == ln.cmpd && this.w== ln.w; this.algn == ln.algn && this.cap == ln.cap && this.cmpd == ln.cmpd && this.w== ln.w && this.prstDash === ln.prstDash;
}, },
setFill: function(fill) setFill: function(fill)
...@@ -11654,7 +11657,7 @@ function CreateAscStroke(ln, _canChangeArrows) ...@@ -11654,7 +11657,7 @@ function CreateAscStroke(ln, _canChangeArrows)
if(AscFormat.isRealNumber(ln.prstDash)){ if(AscFormat.isRealNumber(ln.prstDash)){
ret.prstDash = ln.prstDash; ret.prstDash = ln.prstDash;
} }
else{ else if(ln.prstDash === null){
ret.prstDash = Asc.c_oDashType.solid; ret.prstDash = Asc.c_oDashType.solid;
} }
if (true === _canChangeArrows) if (true === _canChangeArrows)
...@@ -11748,9 +11751,6 @@ function CorrectUniStroke(asc_stroke, unistroke, flag) ...@@ -11748,9 +11751,6 @@ function CorrectUniStroke(asc_stroke, unistroke, flag)
if(AscFormat.isRealNumber(asc_stroke.prstDash)){ if(AscFormat.isRealNumber(asc_stroke.prstDash)){
ret.prstDash = asc_stroke.prstDash; ret.prstDash = asc_stroke.prstDash;
} }
else{
ret.prstDash = Asc.c_oDashType.solid;
}
return ret; return ret;
} }
......
...@@ -7959,8 +7959,16 @@ CTextPr.prototype = ...@@ -7959,8 +7959,16 @@ CTextPr.prototype =
} }
if(undefined !== this.TextOutline && !this.TextOutline.IsIdentical(TextPr.TextOutline)) if(undefined !== this.TextOutline && !this.TextOutline.IsIdentical(TextPr.TextOutline)){
this.TextOutline = undefined; if(TextPr.TextOutline !== undefined){
this.TextOutline = this.TextOutline.compare(TextPr.TextOutline);
}
else{
this.TextOutline = 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