From 118a8682b1f556055c6c5112c92f8e54812ba88f Mon Sep 17 00:00:00 2001
From: "Alexander.Trofimov" <Alexander.Trofimov@OnlyOffice.com>
Date: Fri, 15 Aug 2014 09:22:42 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
=?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20http://bugzserver/show=5Fbug.cgi?=
=?UTF-8?q?=3Fid=3D20970?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57836 954022d7-b5bf-4e40-9824-e11837661b57
---
Excel/view/WorksheetView.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Excel/view/WorksheetView.js b/Excel/view/WorksheetView.js
index 37cc2fb41..2cdbc379a 100644
--- a/Excel/view/WorksheetView.js
+++ b/Excel/view/WorksheetView.js
@@ -2914,7 +2914,7 @@
continue;
// draw diagonal borders
- if ((bCur.dd || bCur.du) && (!mc || (row === mc.r1 && col === mc.c1))) {
+ if ((bCur.borders.dd || bCur.borders.du) && (!mc || (row === mc.r1 && col === mc.c1))) {
var x2Diagonal = x2;
var y2Diagonal = y2;
if (mc) {
@@ -2931,13 +2931,13 @@
r[row].height + this.height_1px * ( -1 + (tb.w < 1 ? +1 : (tb.w < 3 ? 0 : -1)) + (bb.w < 1 ? +1 : (bb.w < 2 ? 0 : -1)) ))
.clip();
*/
- if (bCur.dd) {
+ if (bCur.borders.dd) {
// draw diagonal line l,t - r,b
- drawDiagonal(bCur.d, x1 - t.width_1px, y1 - t.height_1px, x2Diagonal, y2Diagonal);
+ drawDiagonal(bCur.borders.d, x1 - t.width_1px, y1 - t.height_1px, x2Diagonal, y2Diagonal);
}
- if (bCur.du) {
+ if (bCur.borders.du) {
// draw diagonal line l,b - r,t
- drawDiagonal(bCur.d, x1 - t.width_1px, y2Diagonal, x2Diagonal, y1 - t.height_1px);
+ drawDiagonal(bCur.borders.d, x1 - t.width_1px, y2Diagonal, x2Diagonal, y1 - t.height_1px);
}
// ToDo Clip diagonal borders
//ctx.restore();
--
2.30.9