Commit 7f46f43e authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 30655

parent 50da75aa
...@@ -440,7 +440,7 @@ var c_sPerDay = 86400; ...@@ -440,7 +440,7 @@ var c_sPerDay = 86400;
var c_msPerDay = c_sPerDay * 1000; var c_msPerDay = c_sPerDay * 1000;
var rx_sFuncPref = /_xlfn\./i; var rx_sFuncPref = /_xlfn\./i;
var c_numFormatFirstCell = -1; var c_numFormatFirstCell = -1;
var c_numFormatNone = -2; var cNumFormatNone = -2;
Date.prototype.excelNullDate1900 = Date.UTC( 1899, 11, 30, 0, 0, 0 ); Date.prototype.excelNullDate1900 = Date.UTC( 1899, 11, 30, 0, 0, 0 );
Date.prototype.excelNullDate1904 = Date.UTC( 1904, 0, 1, 0, 0, 0 ); Date.prototype.excelNullDate1904 = Date.UTC( 1904, 0, 1, 0, 0, 0 );
...@@ -2780,8 +2780,8 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara ...@@ -2780,8 +2780,8 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara
} }
cConcatSTROperator.prototype = Object.create(cBaseOperator.prototype); cConcatSTROperator.prototype = Object.create(cBaseOperator.prototype);
cConcatSTROperator.prototype.numFormat = c_numFormatNone;
cConcatSTROperator.prototype.constructor = cConcatSTROperator; cConcatSTROperator.prototype.constructor = cConcatSTROperator;
cConcatSTROperator.prototype.numFormat = cNumFormatNone;
cConcatSTROperator.prototype.Calculate = function (arg) { cConcatSTROperator.prototype.Calculate = function (arg) {
var arg0 = arg[0], arg1 = arg[1]; var arg0 = arg[0], arg1 = arg[1];
if (arg0 instanceof cArea) { if (arg0 instanceof cArea) {
...@@ -4890,7 +4890,7 @@ parserFormula.prototype.parse = function(local, digitDelim) { ...@@ -4890,7 +4890,7 @@ parserFormula.prototype.parse = function(local, digitDelim) {
_tmp = currentElement.Calculate(arg, rangeCell, opt_defName, this.ws.getId()); _tmp = currentElement.Calculate(arg, rangeCell, opt_defName, this.ws.getId());
if (null != _tmp.numFormat) { if (null != _tmp.numFormat) {
numFormat = _tmp.numFormat; numFormat = _tmp.numFormat;
} else if (0 > numFormat || c_numFormatNone === currentElement.numFormat) { } else if (0 > numFormat || cNumFormatNone === currentElement.numFormat) {
numFormat = currentElement.numFormat; numFormat = currentElement.numFormat;
} }
elemArr.push(_tmp); elemArr.push(_tmp);
...@@ -5692,7 +5692,7 @@ function rtl_math_erfc( x ) { ...@@ -5692,7 +5692,7 @@ function rtl_math_erfc( x ) {
window['AscCommonExcel'].c_sPerDay = c_sPerDay; window['AscCommonExcel'].c_sPerDay = c_sPerDay;
window['AscCommonExcel'].c_msPerDay = c_msPerDay; window['AscCommonExcel'].c_msPerDay = c_msPerDay;
window['AscCommonExcel'].cNumFormatFirstCell = c_numFormatFirstCell; window['AscCommonExcel'].cNumFormatFirstCell = c_numFormatFirstCell;
window['AscCommonExcel'].cNumFormatNone = c_numFormatNone; window['AscCommonExcel'].cNumFormatNone = cNumFormatNone;
window['AscCommonExcel'].cNumber = cNumber; window['AscCommonExcel'].cNumber = cNumber;
window['AscCommonExcel'].cString = cString; window['AscCommonExcel'].cString = cString;
......
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
cCONCATENATE.prototype = Object.create(cBaseFunction.prototype); cCONCATENATE.prototype = Object.create(cBaseFunction.prototype);
cCONCATENATE.prototype.constructor = cCONCATENATE; cCONCATENATE.prototype.constructor = cCONCATENATE;
cCONCATENATE.prototype.argumentsMin = 1; cCONCATENATE.prototype.argumentsMin = 1;
cCONCATENATE.prototype.numFormat = AscCommonExcel.cNumFormatNone;
cCONCATENATE.prototype.Calculate = function (arg) { cCONCATENATE.prototype.Calculate = function (arg) {
var arg0 = new cString(""), argI; var arg0 = new cString(""), argI;
for (var i = 0; i < this.argumentsCurrent; i++) { for (var i = 0; i < this.argumentsCurrent; i++) {
......
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