Commit 32ed50c2 authored by Alexander.Trofimov's avatar Alexander.Trofimov

Добавил asc_getNumFormatType в asc_CCellInfo (Возвращается FormatType)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48433 954022d7-b5bf-4e40-9824-e11837661b57
parent c8947409
...@@ -152,6 +152,7 @@ ...@@ -152,6 +152,7 @@
this.isLocked = false; this.isLocked = false;
this.isFormatTable = false; this.isFormatTable = false;
this.styleName = null; this.styleName = null;
this.numFormatType = null;
} }
asc_CCellInfo.prototype = { asc_CCellInfo.prototype = {
...@@ -169,7 +170,8 @@ ...@@ -169,7 +170,8 @@
asc_getHyperlink: function(){ return this.hyperlink; }, asc_getHyperlink: function(){ return this.hyperlink; },
asc_getLocked: function(){ return this.isLocked; }, asc_getLocked: function(){ return this.isLocked; },
asc_getIsFormatTable: function () { return this.isFormatTable; }, asc_getIsFormatTable: function () { return this.isFormatTable; },
asc_getStyleName: function () { return this.styleName; } asc_getStyleName: function () { return this.styleName; },
asc_getNumFormatType: function(){ return this.numFormatType; }
}; };
window["Asc"].asc_CCellInfo = asc_CCellInfo; window["Asc"].asc_CCellInfo = asc_CCellInfo;
...@@ -191,6 +193,7 @@ ...@@ -191,6 +193,7 @@
prot["asc_getLocked"] = prot.asc_getLocked; prot["asc_getLocked"] = prot.asc_getLocked;
prot["asc_getIsFormatTable"] = prot.asc_getIsFormatTable; prot["asc_getIsFormatTable"] = prot.asc_getIsFormatTable;
prot["asc_getStyleName"] = prot.asc_getStyleName; prot["asc_getStyleName"] = prot.asc_getStyleName;
prot["asc_getNumFormatType"] = prot.asc_getNumFormatType;
// Класс точки // Класс точки
function asc_CCellRect (x, y, width, height) { function asc_CCellRect (x, y, width, height) {
......
...@@ -5721,6 +5721,8 @@ ...@@ -5721,6 +5721,8 @@
cell_info.border.diagDown = new asc_CBorder(b.dd.w, b.dd.s, b.dd.c); cell_info.border.diagDown = new asc_CBorder(b.dd.w, b.dd.s, b.dd.c);
cell_info.border.diagUp = new asc_CBorder(b.du.w, b.du.s, b.du.c); cell_info.border.diagUp = new asc_CBorder(b.du.w, b.du.s, b.du.c);
cell_info.numFormatType = c.getNumFormatType();
// Получаем гиперссылку // Получаем гиперссылку
var ar = this.activeRange.clone(); var ar = this.activeRange.clone();
var range = this.model.getRange3(ar.r1, ar.c1, ar.r2, ar.c2); var range = this.model.getRange3(ar.r1, ar.c1, ar.r2, ar.c2);
......
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