Bug 19726 - Изменение атрибутов текста возвращает тексту стиль до Clear...

Bug 19726 - Изменение атрибутов текста возвращает тексту стиль до Clear Format, прописанный в самой таблице

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49001 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/Workbook.js

@@ -3278,6 +3278,8 @@ Woorksheet.prototype._getRow=function(row){
 	if(!oCurRow){
 		oCurRow = new Row(this);
 		oCurRow.create(row + 1);
+		if(null != this.oAllCol && null != this.oAllCol.xfs)
+			oCurRow.xfs = this.oAllCol.xfs.clone();
 		this.aGCells[row] = oCurRow;
 		this.nRowsCount = row > this.nRowsCount ? row : this.nRowsCount ;
 		//History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_CreateRow, this.getId(), null, new UndoRedoData_SingleProperty(row));
@@ -4157,17 +4159,6 @@ Cell.prototype.setType=function(type){
 Cell.prototype.getType=function(){
 	return this.oValue.type;
 };
-Cell.prototype.getDefaultFormat=function(oDefault){
-	var nRow = this.oId.getRow0();
-	var nCol = this.oId.getCol0();
-	var row = this.ws._getRowNoEmpty(nRow);
-	if(null != row && null != row.xfs)
-		return row.xfs;
-	var col = this.ws._getColNoEmptyWithAll(nCol);
-	if(null != col && null != col.xfs)
-		return col.xfs;
-	return oDefault;
-};
 Cell.prototype.setCellStyle=function(val){
 	var newVal = this.cs._prepareCellStyle(val);
 	var oRes = this.sm.setCellStyle(this, newVal);

Excel/model/WorkbookElems.js

@@ -1428,7 +1428,7 @@ StyleManager.prototype =
     _prepareSet : function(oItemWithXfs)
 	{
 		if(null == oItemWithXfs.xfs)
-			oItemWithXfs.xfs = oItemWithXfs.getDefaultFormat(this.oDefaultXfs).clone();
+			oItemWithXfs.xfs = this.oDefaultXfs.clone();
         return oItemWithXfs.xfs;
 	},
     _prepareSetFont : function(oItemWithXfs)
@@ -2059,13 +2059,6 @@ Col.prototype =
 		else
 			this.BestFit = null;
 	},
-	getDefaultFormat : function(oDefault)
-	{
-		if(null != this.ws.oAllCol && null != this.ws.oAllCol.xfs)
-			return this.ws.oAllCol.xfs;
-		else
-			return oDefault;
-	},
 	getMerged : function()
 	{
 		return this.merged;
@@ -2338,13 +2331,6 @@ Row.prototype =
 		if(null != otherRow.hd)
 			this.hd = otherRow.hd;
 	},
-	getDefaultFormat : function(oDefault)
-	{
-		if(null != this.ws.oAllCol && null != this.ws.oAllCol.xfs)
-			return this.ws.oAllCol.xfs;
-		else
-			return oDefault;
-	},
 	getMerged : function()
 	{
 		return this.merged;