Commit 00317d2c authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug #27437 внесенный при правке bug #27581 в Revision: 59731

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59877 954022d7-b5bf-4e40-9824-e11837661b57
parent 1343b33e
......@@ -5587,18 +5587,18 @@
WorksheetView.prototype._getCursorFormulaOrChart = function (vr, x, y, offsetX, offsetY) {
var i, l;
var cursor, oFormulaRange, xFormula1, xFormula2, yFormula1, yFormula2;
var cursor, oFormulaRange, oFormulaRangeIn, xFormula1, xFormula2, yFormula1, yFormula2;
var col = -1, row = -1;
var arrRanges = this.isFormulaEditMode ? this.arrActiveFormulaRanges : this.arrActiveChartsRanges,
targetArr = this.isFormulaEditMode ? 0 : -1;
for (i = 0, l = arrRanges.length; i < l; ++i) {
oFormulaRange = arrRanges[i].clone(true);
// oFormulaRange = oFormulaRange.intersectionSimple(vr);
if (oFormulaRange) {
xFormula1 = this.cols[oFormulaRange.c1].left - offsetX;
xFormula2 = this.cols[oFormulaRange.c2].left + this.cols[oFormulaRange.c2].width - offsetX;
yFormula1 = this.rows[oFormulaRange.r1].top - offsetY;
yFormula2 = this.rows[oFormulaRange.r2].top + this.rows[oFormulaRange.r2].height - offsetY;
oFormulaRangeIn = oFormulaRange.intersectionSimple(vr);
if (oFormulaRangeIn) {
xFormula1 = this.cols[oFormulaRangeIn.c1].left - offsetX;
xFormula2 = this.cols[oFormulaRangeIn.c2].left + this.cols[oFormulaRangeIn.c2].width - offsetX;
yFormula1 = this.rows[oFormulaRangeIn.r1].top - offsetY;
yFormula2 = this.rows[oFormulaRangeIn.r2].top + this.rows[oFormulaRangeIn.r2].height - offsetY;
if (
(x >= xFormula1 + 5 && x <= xFormula2 - 5) && ((y >= yFormula1 - this.height_2px && y <= yFormula1 + this.height_2px) || (y >= yFormula2 - this.height_2px && y <= yFormula2 + this.height_2px))
......
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