Commit 486c7847 authored by konovalovsergey's avatar konovalovsergey

errors after merge

parent 58153bba
......@@ -1421,6 +1421,9 @@ function cRef3D( val, _wsFrom, wb ) {/*Ref means Sheat1!A1 for example*/
this.constructor.call( this, val, cElementType.cell3D );
this.ws = null;
if (_wsFrom) {
this.ws = wb.getWorksheetByName(_wsFrom);
}
this.range = null;
if (val && this.ws) {
this.range = this.ws.getRange2(val);
......
......@@ -2454,6 +2454,8 @@
var tableTo = tableFrom.clone(null);
if(tableNames && tableNames.length) {
tableTo.changeDisplayName(tableNames[i]);
} else {
tableTo.changeDisplayName(this.workbook.dependencyFormulas.getNextTableName());
}
this.addTablePart(tableTo, true);
renameParams.tableNameMap[tableFrom.DisplayName] = tableTo.DisplayName;
......@@ -4487,7 +4489,7 @@ Woorksheet.prototype.isApplyFilterBySheet = function(){
Woorksheet.prototype.addTablePart = function (tablePart, bAddToDependencies) {
this.TableParts.push(tablePart);
if (bAddToDependencies) {
this.dependencyFormulas.addTableName(sheet, tablePart);
this.workbook.dependencyFormulas.addTableName(this, tablePart);
tablePart.buildDependencies();
}
};
......
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