Commit 1fed6c5c authored by GoshaZotov's avatar GoshaZotov

fix bug 32553 - Строка итогов учитывается в менеджере имен и при выборе...

fix bug 32553 - Строка итогов учитывается в менеджере имен и при выборе таблицы из списка имен при открытии XLSX книги
parent 8bfb160d
...@@ -3888,7 +3888,7 @@ ...@@ -3888,7 +3888,7 @@
return oThis.ReadTable(t,l, oNewTable); return oThis.ReadTable(t,l, oNewTable);
}); });
if(null != oNewTable.Ref && null != oNewTable.DisplayName) if(null != oNewTable.Ref && null != oNewTable.DisplayName)
this.ws.workbook.dependencyFormulas.addTableName(oNewTable.DisplayName, this.ws, oNewTable.Ref); this.ws.workbook.dependencyFormulas.addTableName(oNewTable.DisplayName, this.ws, oNewTable.Ref, oNewTable);
aTables.push(oNewTable); aTables.push(oNewTable);
} }
else else
......
...@@ -1191,13 +1191,22 @@ DependencyGraph.prototype = { ...@@ -1191,13 +1191,22 @@ DependencyGraph.prototype = {
this.addTableName( sNewName, ws, Ref ); this.addTableName( sNewName, ws, Ref );
return sNewName; return sNewName;
}, },
addTableName:function ( sName, ws, Ref ) { addTableName:function ( sName, ws, Ref, table ) {
var refClone, defNameSheetsList, dfv, nSE, se; var refClone, defNameSheetsList, dfv, nSE, se;
if(this.defNameSheets["WB"]){ if(this.defNameSheets["WB"]){
dfv = this.defNameSheets["WB"][getDefNameVertexId( null, sName )] dfv = this.defNameSheets["WB"][getDefNameVertexId( null, sName )]
} }
refClone = Ref.clone(true )
refClone.r1++; if(table)
{
refClone = table.getRangeWithoutHeaderFooter().clone();
}
else
{
refClone = Ref.clone( true );
refClone.r1++;
}
if(!dfv){ if(!dfv){
dfv = new DefNameVertex( null, sName, parserHelp.get3DRef( ws.getName(), refClone.getAbsName() ), null, this.wb, true ); dfv = new DefNameVertex( null, sName, parserHelp.get3DRef( ws.getName(), refClone.getAbsName() ), null, this.wb, true );
defNameSheetsList = this.defNameSheets[dfv.sheetId]; defNameSheetsList = this.defNameSheets[dfv.sheetId];
......
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