git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50222 954022d7-b5bf-4e40-9824-e11837661b57

Excel/view/WorksheetView.js

@@ -2572,9 +2572,6 @@
 							}
 						}
 
-						if (isMerged || mergedCellsStage &&
-							row !== range.r1 && row !== range.r2&& col !== range.c1 && col !== range.c2) {continue;}
-
 						var x1 = this.cols[col].left - offsetX;
 						var x2 = x1 + this.cols[col].width - this.width_1px;
 						//
@@ -2595,6 +2592,9 @@
 						var tbNext = this._getActiveBorder(col + 1, row, kcbidTop);
 						var bbNext = this._getActiveBorder(col + 1, row, kcbidBottom);
 
+						if (isMerged || mergedCellsStage &&
+							row !== range.r1 && row !== range.r2&& col !== range.c1 && col !== range.c2) {continue;}
+
 						var hasDD = dd.w > 0 && dd.s !== kcbNone;
 						var hasDU = du.w > 0 && du.s !== kcbNone;
 						if ( (hasDD || hasDU) && (!mergedCellsStage || row === range.r1 && col === range.c1) ) {