Commit 8a670ef2 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov

fix:

Bug 27581 - Диапазон данных диаграммы устанавливается по верхней границе видимой строки в рабочей области

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59731 954022d7-b5bf-4e40-9824-e11837661b57
parent 05289d04
......@@ -5607,7 +5607,7 @@
targetArr = this.isFormulaEditMode ? 0 : -1;
for (i = 0, l = arrRanges.length; i < l; ++i) {
oFormulaRange = arrRanges[i].clone(true);
oFormulaRange = oFormulaRange.intersectionSimple(vr);
// 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;
......@@ -7670,11 +7670,12 @@
this.overlayCtx.clear();
if (targetInfo.cursor == kCurNEResize || targetInfo.cursor == kCurSEResize) {
if (colByX < this.startCellMoveResizeRange2.c1) {
ar.c2 = this.startCellMoveResizeRange2.c1;
ar.c2 = this.startCellMoveResizeRange2.c1;
ar.c1 = colByX;
} else if (colByX > this.startCellMoveResizeRange2.c1) {
ar.c1 = this.startCellMoveResizeRange2.c1;
ar.c1 = this.startCellMoveResizeRange2.c1;
ar.c2 = colByX;
} else {
ar.c1 = this.startCellMoveResizeRange2.c1;
......@@ -7683,12 +7684,12 @@
if (rowByY < this.startCellMoveResizeRange2.r1) {
ar.r2 = this.startCellMoveResizeRange2.r2;
ar.r1 = rowByY;
ar.r1 = rowByY;
} else if (rowByY > this.startCellMoveResizeRange2.r1) {
ar.r1 = this.startCellMoveResizeRange2.r1;
ar.r2 = rowByY;
} else {
ar.r1 = this.startCellMoveResizeRange2.r1;
ar.r1 = this.startCellMoveResizeRange2.r1;
ar.r2 = this.startCellMoveResizeRange2.r1;
}
......
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