Commit 6f89d8ee authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

|| -> &&

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57335 954022d7-b5bf-4e40-9824-e11837661b57
parent 74e5d62d
...@@ -2914,7 +2914,7 @@ CSlideBoundsChecker.prototype = ...@@ -2914,7 +2914,7 @@ CSlideBoundsChecker.prototype =
if (!shape) if (!shape)
return; return;
var _ln = shape.pen; var _ln = shape.pen;
if (_ln != null || _ln.Fill != null || _ln.Fill.fill != null) if (_ln != null && _ln.Fill != null && _ln.Fill.fill != null)
{ {
this.LineWidth = (_ln.w == null) ? 12700 : parseInt(_ln.w); this.LineWidth = (_ln.w == null) ? 12700 : parseInt(_ln.w);
this.LineWidth /= 36000.0; this.LineWidth /= 36000.0;
......
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