Commit f829ab77 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

fix: Bug 29788 - [NamedRanges] Диапазон с областью действия на одном листе не...

fix: Bug 29788 - [NamedRanges] Диапазон с областью действия на одном листе не добавляется и вызывает ошибку в консоли (http://bugzserver/show_bug.cgi?id=29788)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63720 954022d7-b5bf-4e40-9824-e11837661b57
parent bbdc83c1
...@@ -839,8 +839,10 @@ DependencyGraph.prototype = { ...@@ -839,8 +839,10 @@ DependencyGraph.prototype = {
} }
sheetNodeList = this.defNameSheets["WB"]; sheetNodeList = this.defNameSheets["WB"];
nodeId = getDefNameVertexId( null, name ); if( sheetNodeList ){
oRes = sheetNodeList[nodeId]; nodeId = getDefNameVertexId( null, name );
oRes = sheetNodeList[nodeId];
}
if ( oRes && !oRes.Ref ) oRes = false; if ( oRes && !oRes.Ref ) oRes = false;
return oRes; return oRes;
...@@ -1305,7 +1307,7 @@ Vertex.prototype = { ...@@ -1305,7 +1307,7 @@ Vertex.prototype = {
function DefNameVertex( scope, defName, defRef, wb, isTable ) { function DefNameVertex( scope, defName, defRef, wb, isTable ) {
this.sheetId = scope === null || scope === undefined ? "WB" : scope this.sheetId = scope === null || scope === undefined ? "WB" : scope;
// this.sheetId = scope || "WB"; // this.sheetId = scope || "WB";
this.cellId = defName.toLowerCase(); this.cellId = defName.toLowerCase();
...@@ -1316,7 +1318,7 @@ function DefNameVertex( scope, defName, defRef, wb, isTable ) { ...@@ -1316,7 +1318,7 @@ function DefNameVertex( scope, defName, defRef, wb, isTable ) {
this.wb = wb; this.wb = wb;
if(!isTable){ if(!isTable){
this.parsedRef = new parserFormula(this.Ref, "", this.wb.getWorksheet(0)) this.parsedRef = new parserFormula(this.Ref, "", this.wb.getWorksheet(0));
if( this.Ref ){ if( this.Ref ){
this.parsedRef.parse(); this.parsedRef.parse();
} }
......
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