Commit 5c69c6cd authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

Ошибки в стилях при создании ячейки, если есть стиль всех колонок.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53053 954022d7-b5bf-4e40-9824-e11837661b57
parent 7ba99302
...@@ -3400,8 +3400,6 @@ Woorksheet.prototype._getRow=function(row){ ...@@ -3400,8 +3400,6 @@ Woorksheet.prototype._getRow=function(row){
if(!oCurRow){ if(!oCurRow){
oCurRow = new Row(this); oCurRow = new Row(this);
oCurRow.create(row + 1); oCurRow.create(row + 1);
if(null != this.oAllCol && null != this.oAllCol.xfs)
oCurRow.xfs = this.oAllCol.xfs.clone();
this.aGCells[row] = oCurRow; this.aGCells[row] = oCurRow;
this.nRowsCount = row > this.nRowsCount ? row : this.nRowsCount ; this.nRowsCount = row > this.nRowsCount ? row : this.nRowsCount ;
//History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_CreateRow, this.getId(), null, new UndoRedoData_SingleProperty(row)); //History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_CreateRow, this.getId(), null, new UndoRedoData_SingleProperty(row));
......
...@@ -1450,7 +1450,12 @@ StyleManager.prototype = ...@@ -1450,7 +1450,12 @@ StyleManager.prototype =
_prepareSet : function(oItemWithXfs) _prepareSet : function(oItemWithXfs)
{ {
if(null == oItemWithXfs.xfs) if(null == oItemWithXfs.xfs)
oItemWithXfs.xfs = this.oDefaultXfs.clone(); {
if(oItemWithXfs.getDefaultXfs)
oItemWithXfs.xfs = oItemWithXfs.getDefaultXfs();
if(null == oItemWithXfs.xfs)
oItemWithXfs.xfs = this.oDefaultXfs.clone();
}
return oItemWithXfs.xfs; return oItemWithXfs.xfs;
}, },
_prepareSetFont : function(oItemWithXfs) _prepareSetFont : function(oItemWithXfs)
...@@ -2336,6 +2341,13 @@ Row.prototype = ...@@ -2336,6 +2341,13 @@ Row.prototype =
oNewRow.c[i] = this.c[i].clone(); oNewRow.c[i] = this.c[i].clone();
return oNewRow; return oNewRow;
}, },
getDefaultXfs : function()
{
var oRes = null;
if(null != this.ws.oAllCol && null != this.ws.oAllCol.xfs)
oRes = this.ws.oAllCol.xfs.clone();
return oRes;
},
getHeightProp : function() getHeightProp : function()
{ {
return new UndoRedoData_RowProp(this); return new UndoRedoData_RowProp(this);
......
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