Commit 0d630c56 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Правка падения при вводе в формулу невидимого диапазона.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56097 954022d7-b5bf-4e40-9824-e11837661b57
parent 3bedc4bb
......@@ -3695,9 +3695,11 @@
WorksheetView.prototype.cleanSelection = function (range, isFrozen) {
isFrozen = !!isFrozen;
if (range === undefined)
range = this.visibleRange;
var ctx = this.overlayCtx;
var arn = this.activeRange.clone(true);
var arnIntersection = arn.intersectionSimple(range ? range : this.visibleRange);
var arnIntersection = arn.intersectionSimple(range);
var width = ctx.getWidth();
var height = ctx.getHeight();
var offsetX, offsetY, diffWidth = 0, diffHeight = 0;
......@@ -3789,7 +3791,7 @@
for (i = 0; i < arrayElements.length; ++i) {
var arFormulaTmp = asc_Range (arrayElements[i].c1, arrayElements[i].r1, arrayElements[i].c2, arrayElements[i].r2);
var aFormulaIntersection = arFormulaTmp.intersection(range ? range : this.visibleRange);
var aFormulaIntersection = arFormulaTmp.intersection(range);
if (aFormulaIntersection) {
// Координаты для автозаполнения
......@@ -3812,7 +3814,7 @@
for (i = 0; i < this.arrActiveFormulaRanges.length; ++i) {
var activeFormula = this.arrActiveFormulaRanges[i].clone(true);
activeFormula = activeFormula.intersection(range ? range : activeFormula);
activeFormula = activeFormula.intersection(range);
if (null === activeFormula) {
// это ссылка из формулы на еще не добавленный рэндж
continue;
......@@ -3841,7 +3843,7 @@
for (i in this.arrActiveChartsRanges ) {
var activeFormula = this.arrActiveChartsRanges[i].clone(true);
activeFormula = activeFormula.intersection(range ? range : activeFormula);
activeFormula = activeFormula.intersection(range);
if (null === activeFormula) {
// это ссылка из формулы на еще не добавленный рэндж
continue;
......
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