Commit 368a2df8 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

Bug 25718 - Ошибка в консоли при копировании листа с диаграммой если были вставлены столбцы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57499 954022d7-b5bf-4e40-9824-e11837661b57
parent 89d345ad
...@@ -2067,8 +2067,11 @@ Woorksheet.prototype.clone=function(sNewId){ ...@@ -2067,8 +2067,11 @@ Woorksheet.prototype.clone=function(sNewId){
oNewWs.TableParts.push(this.TableParts[i].clone(oNewWs)); oNewWs.TableParts.push(this.TableParts[i].clone(oNewWs));
if(this.AutoFilter) if(this.AutoFilter)
oNewWs.AutoFilter = this.AutoFilter.clone(); oNewWs.AutoFilter = this.AutoFilter.clone();
for(i in this.aCols) for (i in this.aCols) {
oNewWs.aCols[i] = this.aCols[i].clone(oNewWs); var col = this.aCols[i];
if(null != col)
oNewWs.aCols[i] = col.clone(oNewWs);
}
if(null != this.oAllCol) if(null != this.oAllCol)
oNewWs.oAllCol = this.oAllCol.clone(oNewWs); oNewWs.oAllCol = this.oAllCol.clone(oNewWs);
for(i in this.aGCells) for(i in this.aGCells)
...@@ -2729,8 +2732,9 @@ Woorksheet.prototype.setColWidth=function(width, start, stop){ ...@@ -2729,8 +2732,9 @@ Woorksheet.prototype.setColWidth=function(width, start, stop){
var col = this.getAllCol(); var col = this.getAllCol();
fProcessCol(col); fProcessCol(col);
for(var i in this.aCols){ for(var i in this.aCols){
var col = this.aCols[i]; var col = this.aCols[i];
fProcessCol(col); if (null != col)
fProcessCol(col);
} }
} }
else else
...@@ -2784,8 +2788,9 @@ Woorksheet.prototype.setColHidden=function(bHidden, start, stop){ ...@@ -2784,8 +2788,9 @@ Woorksheet.prototype.setColHidden=function(bHidden, start, stop){
if(null != col) if(null != col)
fProcessCol(col); fProcessCol(col);
for(var i in this.aCols){ for(var i in this.aCols){
var col = this.aCols[i]; var col = this.aCols[i];
fProcessCol(col); if (null != col)
fProcessCol(col);
} }
} }
else else
...@@ -2835,8 +2840,9 @@ Woorksheet.prototype.setColBestFit=function(bBestFit, width, start, stop){ ...@@ -2835,8 +2840,9 @@ Woorksheet.prototype.setColBestFit=function(bBestFit, width, start, stop){
if(null != col) if(null != col)
fProcessCol(col); fProcessCol(col);
for(var i in this.aCols){ for(var i in this.aCols){
var col = this.aCols[i]; var col = this.aCols[i];
fProcessCol(col); if (null != col)
fProcessCol(col);
} }
} }
else else
......
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