Commit a8dd1d3c authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 31103

parent 2d7238f3
...@@ -2006,6 +2006,9 @@ var editor; ...@@ -2006,6 +2006,9 @@ var editor;
} }
return; return;
} }
if (d.new) {
return;
}
// Получаем sheet по имени // Получаем sheet по имени
var ws = this.wbModel.getWorksheetByName(d.sheet); var ws = this.wbModel.getWorksheetByName(d.sheet);
......
...@@ -11178,7 +11178,7 @@ ...@@ -11178,7 +11178,7 @@
WorksheetView.prototype.findCell = function (reference, isViewerMode) { WorksheetView.prototype.findCell = function (reference, isViewerMode) {
var range = AscCommonExcel.g_oRangeCache.getRange3D(reference) || var range = AscCommonExcel.g_oRangeCache.getRange3D(reference) ||
AscCommonExcel.g_oRangeCache.getAscRange(reference); AscCommonExcel.g_oRangeCache.getAscRange(reference), bNew = false;
if (!range) { if (!range) {
if (isViewerMode) { if (isViewerMode) {
return range; return range;
...@@ -11205,6 +11205,7 @@ ...@@ -11205,6 +11205,7 @@
ascRange = new asc_Range(c1, r1, c2, r2); ascRange = new asc_Range(c1, r1, c2, r2);
defName = this.model.workbook.editDefinesNames(null, defName = this.model.workbook.editDefinesNames(null,
new Asc.asc_CDefName(reference, this.model.getName() + "!" + ascRange.getAbsName())); new Asc.asc_CDefName(reference, this.model.getName() + "!" + ascRange.getAbsName()));
bNew = true;
} }
if (defName) { if (defName) {
...@@ -11235,7 +11236,7 @@ ...@@ -11235,7 +11236,7 @@
if (range && sheetName) { if (range && sheetName) {
ar_norm = range.normalize(); ar_norm = range.normalize();
mc = sheetName.getMergedByCell(ar_norm.r1, ar_norm.c1); mc = sheetName.getMergedByCell(ar_norm.r1, ar_norm.c1);
range = {range: mc ? mc : range, sheet: sheetName.getName()}; range = {range: mc ? mc : range, sheet: sheetName.getName(), new: bNew};
} }
} }
} else { } else {
......
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