Поправил баг http://bugzserver/show_bug.cgi?id=24130

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

Excel/view/WorksheetView.js

@@ -10365,6 +10365,27 @@
 			c = t._getVisibleCell(col, row);
 			if (!c) {throw "Can not get cell data (col=" + col + ", row=" + row + ")";}
 
+			if (this.topLeftFrozenCell) {
+				var cFrozen = this.topLeftFrozenCell.getCol0();
+				var rFrozen = this.topLeftFrozenCell.getRow0();
+				if (0 < cFrozen) {
+					if (col >= cFrozen)
+						offsetX = tc[cFrozen].left - tc[0].left;
+					else {
+						vr.c1 = 0;
+						vr.c2 = cFrozen - 1;
+					}
+				}
+				if (0 < rFrozen) {
+					if (row >= rFrozen)
+						offsetY = tr[rFrozen].top - tr[0].top;
+					else {
+						vr.r1 = 0;
+						vr.r2 = rFrozen - 1;
+					}
+				}
+			}
+
 			fl = t._getCellFlags(c);
 			isMerged = fl.isMerged();
 			if (isMerged) {
@@ -10399,27 +10420,6 @@
 				}
 			}
 
-			if (this.topLeftFrozenCell) {
-				var cFrozen = this.topLeftFrozenCell.getCol0();
-				var rFrozen = this.topLeftFrozenCell.getRow0();
-				if (0 < cFrozen) {
-					if (col >= cFrozen)
-						offsetX = tc[cFrozen].left - tc[0].left;
-					else {
-						vr.c1 = 0;
-						vr.c2 = cFrozen - 1;
-					}
-				}
-				if (0 < rFrozen) {
-					if (row >= rFrozen)
-						offsetY = tr[rFrozen].top - tr[0].top;
-					else {
-						vr.r1 = 0;
-						vr.r2 = rFrozen - 1;
-					}
-				}
-			}
-
 			bg = c.getFill();
 			t.isFormulaEditMode = false;
 			// Очищаем массив ячеек для текущей формулы