Skip to content

S
sdkjs
Commit f62e626a authored by konovalovsergey's avatar konovalovsergey
Browse files
Options

in case of changes in workbook defname should not be sheet defname

parent 073adb85
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
cell/model/FormulaObjects/parserFormula.js
View file @ f62e626a
...@@ -1587,10 +1587,17 @@ cName.prototype.Calculate = function () { ...@@ -1587,10 +1587,17 @@ cName.prototype.Calculate = function () {
}; };
cName.prototype.changeDefName = function (from, to) { cName.prototype.changeDefName = function (from, to) {
var sheetId = this.ws ? this.ws.getId() : null; var sheetId = this.ws ? this.ws.getId() : null;
if (AscCommonExcel.getDefNameIndex(this.value) == AscCommonExcel.getDefNameIndex(from.name) && if (AscCommonExcel.getDefNameIndex(this.value) == AscCommonExcel.getDefNameIndex(from.name)) {
(null == from.sheetId || sheetId == from.sheetId )) { if (null == from.sheetId) {
//in case of changes in workbook defname should not be sheet defname
var defName = this.getDefName();
if (!(defName && null != defName.sheetId)) {
this.value = to.name;
}
} else if (sheetId == from.sheetId) {
this.value = to.name; this.value = to.name;
} }
}
}; };
/** @constructor */ /** @constructor */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7