pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 42377

Browse Source
This commit is contained in:
Oleg Korshul
2019-08-12 17:10:57 +03:00
parent 9d67ad3d1d
commit 9d3d2de60c
3 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cell/model/DrawingObjects/ShapeDrawer.js
View File

@ -473,7 +473,13 @@ CShapeDrawer.prototype =
}
if (this.Ln == null || this.Ln.Fill == null || this.Ln.Fill.fill == null)
{
this.bIsNoStrokeAttack = true;
if (true === graphics.IsTrack)
graphics.Graphics.ArrayPoints = null;
else
graphics.ArrayPoints = null;
}
else
{
var _fill = this.Ln.Fill.fill;
@ -549,13 +555,14 @@ CShapeDrawer.prototype =
if (graphics.IsSlideBoundsCheckerType && !this.bIsNoStrokeAttack)
graphics.LineWidth = this.StrokeWidth;
var isUseArrayPoints = false;
if ((this.Ln.headEnd != null && this.Ln.headEnd.type != null) || (this.Ln.tailEnd != null && this.Ln.tailEnd.type != null))
{
if (true === graphics.IsTrack)
graphics.Graphics.ArrayPoints = [];
else
graphics.ArrayPoints = [];
}
isUseArrayPoints = true;
if (true === graphics.IsTrack)
graphics.Graphics.ArrayPoints = isUseArrayPoints ? [] : null;
else
graphics.ArrayPoints = isUseArrayPoints ? [] : null;
if (this.Graphics.m_oContext != null && this.Ln.Join != null && this.Ln.Join.type != null)
this.OldLineJoin = this.Graphics.m_oContext.lineJoin;

24
common/Native/Wrappers/ShapeDrawer.js
View File

@ -424,7 +424,13 @@ CShapeDrawer.prototype =
}
if (this.Ln == null || this.Ln.Fill == null || this.Ln.Fill.fill == null)
{
this.bIsNoStrokeAttack = true;
if (true === graphics.IsTrack)
graphics.Graphics.ArrayPoints = null;
else
graphics.ArrayPoints = null;
}
else
{
var _fill = this.Ln.Fill.fill;
@ -491,18 +497,14 @@ CShapeDrawer.prototype =
if (graphics.IsSlideBoundsCheckerType && !this.bIsNoStrokeAttack)
graphics.LineWidth = this.StrokeWidth;
var isUseArrayPoints = false;
if ((this.Ln.headEnd != null && this.Ln.headEnd.type != null) || (this.Ln.tailEnd != null && this.Ln.tailEnd.type != null))
{
if (true === graphics.IsTrack)
{
if(graphics.Graphics)
{
graphics.Graphics.ArrayPoints = [];
}
}
else
graphics.ArrayPoints = [];
}
isUseArrayPoints = true;
if (true === graphics.IsTrack)
graphics.Graphics.ArrayPoints = isUseArrayPoints ? [] : null;
else
graphics.ArrayPoints = isUseArrayPoints ? [] : null;
if (this.Graphics.m_oContext != null && this.Ln.Join != null && this.Ln.Join.type != null)
this.OldLineJoin = this.Graphics.m_oContext.lineJoin;

24
word/Drawing/ShapeDrawer.js
View File

@ -446,7 +446,13 @@ CShapeDrawer.prototype =
}
if (this.Ln == null || this.Ln.Fill == null || this.Ln.Fill.fill == null)
{
this.bIsNoStrokeAttack = true;
if (true === graphics.IsTrack)
graphics.Graphics.ArrayPoints = null;
else
graphics.ArrayPoints = null;
}
else
{
var _fill = this.Ln.Fill.fill;
@ -522,18 +528,14 @@ CShapeDrawer.prototype =
if (graphics.IsSlideBoundsCheckerType && !this.bIsNoStrokeAttack)
graphics.LineWidth = this.StrokeWidth;
var isUseArrayPoints = false;
if ((this.Ln.headEnd != null && this.Ln.headEnd.type != null) || (this.Ln.tailEnd != null && this.Ln.tailEnd.type != null))
{
if (true === graphics.IsTrack)
{
if(graphics.Graphics)
{
graphics.Graphics.ArrayPoints = [];
}
}
else
graphics.ArrayPoints = [];
}
isUseArrayPoints = true;
if (true === graphics.IsTrack)
graphics.Graphics.ArrayPoints = isUseArrayPoints ? [] : null;
else
graphics.ArrayPoints = isUseArrayPoints ? [] : null;
if (this.Graphics.m_oContext != null && this.Ln.Join != null && this.Ln.Join.type != null)
this.OldLineJoin = this.Graphics.m_oContext.lineJoin;