Commit 3e32cdde authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 35858

parent fdada8dd
......@@ -1977,9 +1977,15 @@
// Вставка формулы в редактор
WorkbookView.prototype.insertFormulaInEditor = function (name, type, autoComplete) {
var t = this, ws = this.getWorksheet(), cursorPos, isNotFunction, tmp;
var activeCellRange = ws.getActiveCell(0, 0, false);
if (ws.model.inPivotTable(activeCellRange)) {
this.handlers.trigger("asc_onError", c_oAscError.ID.LockedCellPivot, c_oAscError.Level.NoCritical);
return false;
}
if (c_oAscPopUpSelectorType.None === type) {
this.getWorksheet().setSelectionInfo("value", name, /*onlyActive*/true);
ws.setSelectionInfo("value", name, /*onlyActive*/true);
return;
}
......@@ -2011,15 +2017,8 @@
return false;
}
var activeCellRange = ws.getActiveCell(0, 0, false);
var selectionRange = ws.model.selectionRange.clone();
var activeWsModel = this.model.getActiveWs();
if (activeWsModel.inPivotTable(activeCellRange)) {
this.handlers.trigger("asc_onError", c_oAscError.ID.LockedCellPivot, c_oAscError.Level.NoCritical);
return false;
}
// Редактор закрыт
var cellRange = null;
// Если нужно сделать автозаполнение формулы, то ищем ячейки)
......
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