Commit 24dce822 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug #29169

Заодно поправил проблему с выделение merge ячейки (справа снизу).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62194 954022d7-b5bf-4e40-9824-e11837661b57
parent eb67c1bf
......@@ -996,7 +996,6 @@
}
result.type = c_oAscSelectionType.RangeCells;
this._fixSelectionOfMergedCells(result);
result.normalize();
if (result.c1 === result.c2 && result.r1 === result.r2)
result.text = this._getCellTitle (result.c1, result.r1);
else
......@@ -1033,7 +1032,6 @@
}
result.type = c_oAscSelectionType.RangeCells;
this._fixSelectionOfMergedCells(result);
result.normalize();
if (result.c1 === result.c2 && result.r1 === result.r2)
result.text = this._getCellTitle(result.c1, result.r1);
else
......@@ -6010,6 +6008,7 @@
ar.c2 = ar.c1 === res.c1 ? res.c2 : (res.c1);
if (ar.r1 !== res.r1 && ar.r1 !== res.r2) {ar.r1 = ar.r1 <= ar.r2 ? res.r1 : res.r2;}
ar.r2 = ar.r1 === res.r1 ? res.r2 : res.r1;
ar.normalize();
};
WorksheetView.prototype._findVisibleCol = function (from, dc, flag) {
......@@ -6134,7 +6133,6 @@
ar.startCol = p.col;
ar.startRow = p.row;
this._fixSelectionOfMergedCells();
ar.normalize();
this._fixSelectionOfHiddenCells(dc>=0?+1:-1, dr>=0?+1:-1);
};
......
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