Commit 34b20673 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Выставление формата для ячейки при выставлении стиля

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48280 954022d7-b5bf-4e40-9824-e11837661b57
parent 9db80d27
...@@ -4153,6 +4153,7 @@ Cell.prototype.setCellStyle=function(val){ ...@@ -4153,6 +4153,7 @@ Cell.prototype.setCellStyle=function(val){
this.setFont(oStyle.getFont()); this.setFont(oStyle.getFont());
this.setFill(oStyle.getFill()); this.setFill(oStyle.getFill());
this.setBorder(oStyle.getBorder()); this.setBorder(oStyle.getBorder());
this.setNumFormat(oStyle.getNumFormatStr());
} }
this.bNeedCompileXfs = true; this.bNeedCompileXfs = true;
this.oValue.cleanCache(); this.oValue.cleanCache();
......
...@@ -1380,6 +1380,11 @@ CCellStyle.prototype = { ...@@ -1380,6 +1380,11 @@ CCellStyle.prototype = {
if (null != this.xfs && null != this.xfs.border) if (null != this.xfs && null != this.xfs.border)
return this.xfs.border; return this.xfs.border;
return g_oDefaultBorder; return g_oDefaultBorder;
},
getNumFormatStr: function () {
if(null != this.xfs && null != this.xfs.num)
return this.xfs.num.f;
return g_oDefaultNum.f;
} }
}; };
/** @constructor */ /** @constructor */
...@@ -2078,6 +2083,7 @@ Col.prototype = ...@@ -2078,6 +2083,7 @@ Col.prototype =
this.setFont(oStyle.getFont()); this.setFont(oStyle.getFont());
this.setFill(oStyle.getFill()); this.setFill(oStyle.getFill());
this.setBorder(oStyle.getBorder()); this.setBorder(oStyle.getBorder());
this.setNumFormat(oStyle.getNumFormatStr());
} }
}, },
setNumFormat : function(val) setNumFormat : function(val)
...@@ -2352,6 +2358,7 @@ Row.prototype = ...@@ -2352,6 +2358,7 @@ Row.prototype =
this.setFont(oStyle.getFont()); this.setFont(oStyle.getFont());
this.setFill(oStyle.getFill()); this.setFill(oStyle.getFill());
this.setBorder(oStyle.getBorder()); this.setBorder(oStyle.getBorder());
this.setNumFormat(oStyle.getNumFormatStr());
} }
}, },
setNumFormat : function(val) setNumFormat : function(val)
......
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