Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
bab107c1
Commit
bab107c1
authored
Mar 15, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix num format for base function
parent
d07f4209
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
cell/model/FormulaObjects/parserFormula.js
cell/model/FormulaObjects/parserFormula.js
+6
-4
No files found.
cell/model/FormulaObjects/parserFormula.js
View file @
bab107c1
...
...
@@ -439,6 +439,8 @@ var c_Date1900Const = 25568; //разница в днях между 01.01.1970
var
c_sPerDay
=
86400
;
var
c_msPerDay
=
c_sPerDay
*
1000
;
var
rx_sFuncPref
=
/_xlfn
\.
/i
;
var
c_numFormatFirstCell
=
-
1
;
var
c_numFormatNone
=
-
1
;
Date
.
prototype
.
excelNullDate1900
=
Date
.
UTC
(
1899
,
11
,
30
,
0
,
0
,
0
);
Date
.
prototype
.
excelNullDate1904
=
Date
.
UTC
(
1904
,
0
,
1
,
0
,
0
,
0
);
...
...
@@ -2278,7 +2280,7 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara
cBaseFunction
.
prototype
.
type
=
cElementType
.
func
;
cBaseFunction
.
prototype
.
argumentsMin
=
0
;
cBaseFunction
.
prototype
.
argumentsMax
=
255
;
cBaseFunction
.
prototype
.
numFormat
=
AscCommonExcel
.
cN
umFormatFirstCell
;
cBaseFunction
.
prototype
.
numFormat
=
c_n
umFormatFirstCell
;
cBaseFunction
.
prototype
.
Calculate
=
function
()
{
this
.
value
=
new
cError
(
cErrorType
.
wrong_name
);
return
this
.
value
;
...
...
@@ -4892,7 +4894,7 @@ parserFormula.prototype.parse = function(local, digitDelim) {
_tmp
=
currentElement
.
Calculate
(
arg
,
rangeCell
,
opt_defName
,
this
.
ws
.
getId
());
if
(
null
!=
_tmp
.
numFormat
)
{
numFormat
=
_tmp
.
numFormat
;
}
else
if
(
0
>
numFormat
||
AscCommonExcel
.
cN
umFormatNone
===
currentElement
.
numFormat
)
{
}
else
if
(
0
>
numFormat
||
c_n
umFormatNone
===
currentElement
.
numFormat
)
{
numFormat
=
currentElement
.
numFormat
;
}
elemArr
.
push
(
_tmp
);
...
...
@@ -5693,8 +5695,8 @@ function rtl_math_erfc( x ) {
window
[
'
AscCommonExcel
'
].
c_DateCorrectConst
=
c_Date1900Const
;
window
[
'
AscCommonExcel
'
].
c_sPerDay
=
c_sPerDay
;
window
[
'
AscCommonExcel
'
].
c_msPerDay
=
c_msPerDay
;
window
[
'
AscCommonExcel
'
].
cNumFormatFirstCell
=
-
1
;
window
[
'
AscCommonExcel
'
].
cNumFormatNone
=
-
2
;
window
[
'
AscCommonExcel
'
].
cNumFormatFirstCell
=
c_numFormatFirstCell
;
window
[
'
AscCommonExcel
'
].
cNumFormatNone
=
c_numFormatNone
;
window
[
'
AscCommonExcel
'
].
cNumber
=
cNumber
;
window
[
'
AscCommonExcel
'
].
cString
=
cString
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment