Commit 90351374 authored by Alexander.Trofimov's avatar Alexander.Trofimov

add Asc.c_oAscNumFormatType.None

return default formats by Asc.c_oAscNumFormatType.None
parent 3f92948a
...@@ -353,15 +353,12 @@ var editor; ...@@ -353,15 +353,12 @@ var editor;
res.push(AscCommonExcel.aStandartNumFormats[i]); res.push(AscCommonExcel.aStandartNumFormats[i]);
} }
//todo add all used in workbook formats //todo add all used in workbook formats
} else {
res.push(AscCommon.g_cGeneralFormat);
}
} else { } else {
res.push(AscCommon.g_cGeneralFormat); res.push(AscCommon.g_cGeneralFormat);
res.push('0.00'); res.push('0.00');
res.push(AscCommon.getCurrencyFormatSimple2(null, 2, true, false)); res.push(AscCommon.getCurrencyFormatSimple2(cultureInfo, 2, currency, false));
res.push(AscCommon.getCurrencyFormat(null, 2, true, true)); res.push(AscCommon.getCurrencyFormat(cultureInfo, 2, currency, true));
res.push(AscCommon.getShortDateFormat()); res.push(AscCommon.getShortDateFormat(cultureInfo));
//todo F800 F400 //todo F800 F400
res.push('[$-F800]dddd, mmmm dd, yyyy'); res.push('[$-F800]dddd, mmmm dd, yyyy');
res.push('[$-F400]h:mm:ss AM/PM'); res.push('[$-F400]h:mm:ss AM/PM');
...@@ -369,6 +366,7 @@ var editor; ...@@ -369,6 +366,7 @@ var editor;
res.push('# ?/?'); res.push('# ?/?');
res.push('@'); res.push('@');
} }
}
return res; return res;
}; };
spreadsheet_api.prototype.asc_getLocaleCurrency = function(val) { spreadsheet_api.prototype.asc_getLocaleCurrency = function(val) {
......
...@@ -229,6 +229,7 @@ ...@@ -229,6 +229,7 @@
//NumFormat defines //NumFormat defines
var c_oAscNumFormatType = { var c_oAscNumFormatType = {
None : -1,
General : 0, General : 0,
Custom : 1, Custom : 1,
Text : 2, Text : 2,
...@@ -1203,6 +1204,7 @@ ...@@ -1203,6 +1204,7 @@
prot['BlockInteraction'] = prot.BlockInteraction; prot['BlockInteraction'] = prot.BlockInteraction;
window['Asc']['c_oAscNumFormatType'] = window['Asc'].c_oAscNumFormatType = c_oAscNumFormatType; window['Asc']['c_oAscNumFormatType'] = window['Asc'].c_oAscNumFormatType = c_oAscNumFormatType;
prot = c_oAscNumFormatType; prot = c_oAscNumFormatType;
prot['None'] = prot.None;
prot['General'] = prot.General; prot['General'] = prot.General;
prot['Custom'] = prot.Custom; prot['Custom'] = prot.Custom;
prot['Text'] = prot.Text; prot['Text'] = prot.Text;
......
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