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

падение на сборке файлов

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@65196 954022d7-b5bf-4e40-9824-e11837661b57
parent a39f58ec
...@@ -3478,7 +3478,7 @@ UndoRedoWoorksheet.prototype = { ...@@ -3478,7 +3478,7 @@ UndoRedoWoorksheet.prototype = {
var dN; var dN;
for(var id in arrDefNameRecalc ){ for(var id in arrDefNameRecalc ){
dN = arrDefNameRecalc[id]; dN = arrDefNameRecalc[id];
if( !dN.parsedRef ){ if( !dN.parsedRef && dN.Ref ){
dN.parsedRef = new parserFormula(dN.Ref, "", ws.workbook.getWorksheet(0)); dN.parsedRef = new parserFormula(dN.Ref, "", ws.workbook.getWorksheet(0));
dN.parsedRef.parse(); dN.parsedRef.parse();
} }
......
...@@ -1024,13 +1024,15 @@ DependencyGraph.prototype = { ...@@ -1024,13 +1024,15 @@ DependencyGraph.prototype = {
}, },
relinkDefNameByWorksheet:function (oName, nName){ relinkDefNameByWorksheet:function (oName, nName){
var oldS = this.defNameList; var oldS = this.defNameList, dN;
for( var id in oldS ){ for( var id in oldS ){
if(oldS[id].isTable){ dN = oldS[id];
oldS[id].Ref = oldS[id].Ref.replace(oName,nName); if(dN.isTable ){
if(dN.Ref)
dN.Ref = dN.Ref.replace(oName,nName);
} }
else{ else{
oldS[id].relinkRef(oName, nName); dN.relinkRef(oName, nName);
} }
} }
...@@ -1614,7 +1616,7 @@ DefNameVertex.prototype = { ...@@ -1614,7 +1616,7 @@ DefNameVertex.prototype = {
}, },
relinkRef:function(oName, nName){ relinkRef:function(oName, nName){
if( this.parsedRef.isParsed ){ if( this.parsedRef && this.parsedRef.isParsed ){
this.Ref = this.parsedRef.assemble(); this.Ref = this.parsedRef.assemble();
} }
}, },
......
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