Commit b12ce00c authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

SheetFormatPr.clone не возвращало объекта.

Баг http://bugzserver/show_bug.cgi?id=23934

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55764 954022d7-b5bf-4e40-9824-e11837661b57
parent 82d5548a
...@@ -1151,8 +1151,7 @@ Workbook.prototype.copyWorksheet=function(index, insertBefore, sName, sId, bFrom ...@@ -1151,8 +1151,7 @@ Workbook.prototype.copyWorksheet=function(index, insertBefore, sName, sId, bFrom
History.Create_NewPoint(); History.Create_NewPoint();
History.TurnOff(); History.TurnOff();
var wsFrom = this.aWorksheets[index]; var wsFrom = this.aWorksheets[index];
var nameSheet = wsFrom.getName(); var newSheet = wsFrom.clone(sId);
var newSheet = wsFrom.clone(sId, bFromRedo);
if(null != sName) if(null != sName)
{ {
if(true == this.checkValidSheetName(sName)) if(true == this.checkValidSheetName(sName))
...@@ -1795,8 +1794,8 @@ Woorksheet.prototype.generateFontMap=function(oFontMap){ ...@@ -1795,8 +1794,8 @@ Woorksheet.prototype.generateFontMap=function(oFontMap){
} }
} }
} }
} };
Woorksheet.prototype.clone=function(sNewId, bFromRedo){ Woorksheet.prototype.clone=function(sNewId){
var oNewWs, i, elem, range; var oNewWs, i, elem, range;
if(null != sNewId) if(null != sNewId)
oNewWs = new Woorksheet(this.workbook, this.workbook.aWorksheets.length, sNewId); oNewWs = new Woorksheet(this.workbook, this.workbook.aWorksheets.length, sNewId);
......
...@@ -2125,7 +2125,7 @@ function SheetFormatPr(){ ...@@ -2125,7 +2125,7 @@ function SheetFormatPr(){
this.nBaseColWidth = null; this.nBaseColWidth = null;
this.dDefaultColWidth = null; this.dDefaultColWidth = null;
this.oAllRow = null; this.oAllRow = null;
}; }
SheetFormatPr.prototype = { SheetFormatPr.prototype = {
clone : function(){ clone : function(){
var oRes = new SheetFormatPr(); var oRes = new SheetFormatPr();
...@@ -2133,8 +2133,9 @@ SheetFormatPr.prototype = { ...@@ -2133,8 +2133,9 @@ SheetFormatPr.prototype = {
oRes.dDefaultColWidth = this.dDefaultColWidth; oRes.dDefaultColWidth = this.dDefaultColWidth;
if(null != this.oAllRow) if(null != this.oAllRow)
oRes.oAllRow = this.oAllRow.clone(); oRes.oAllRow = this.oAllRow.clone();
return oRes;
} }
} };
/** @constructor */ /** @constructor */
function Col(worksheet, index) function Col(worksheet, index)
{ {
......
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