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
c230346e
Commit
c230346e
authored
May 30, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32527
parent
202fc9d6
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
108 additions
and
108 deletions
+108
-108
cell/model/FormulaObjects/mathematicFunctions.js
cell/model/FormulaObjects/mathematicFunctions.js
+9
-9
cell/model/FormulaObjects/statisticalFunctions.js
cell/model/FormulaObjects/statisticalFunctions.js
+99
-99
No files found.
cell/model/FormulaObjects/mathematicFunctions.js
View file @
c230346e
...
...
@@ -2622,14 +2622,14 @@ function cPRODUCT() {
}
cPRODUCT
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
)
cPRODUCT
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
)
;
cPRODUCT
.
prototype
.
Calculate
=
function
(
arg
)
{
var
arg0
=
new
cNumber
(
1
);
for
(
var
i
=
0
;
i
<
arg
.
length
;
i
++
)
{
if
(
arg
[
i
]
instanceof
cArea
||
arg
[
i
]
instanceof
cArea3D
)
{
var
_arrVal
=
arg
[
i
].
getValue
();
for
(
var
j
=
0
;
j
<
_arrVal
.
length
;
j
++
)
{
arg0
=
_func
[
arg0
.
type
][
_arrVal
[
j
].
type
](
arg0
,
_arrVal
[
j
],
"
*
"
)
arg0
=
_func
[
arg0
.
type
][
_arrVal
[
j
].
type
](
arg0
,
_arrVal
[
j
],
"
*
"
)
;
if
(
arg0
instanceof
cError
)
return
this
.
value
=
arg0
;
}
...
...
@@ -2655,13 +2655,13 @@ cPRODUCT.prototype.Calculate = function ( arg ) {
}
return
this
.
value
=
arg0
;
}
}
;
cPRODUCT
.
prototype
.
getInfo
=
function
()
{
return
{
name
:
this
.
name
,
args
:
"
( argument-list )
"
};
}
}
;
function
cQUOTIENT
()
{
// cBaseFunction.call( this, "QUOTIENT" );
...
...
@@ -3808,7 +3808,7 @@ function cSUBTOTAL() {
this
.
setArgumentsMax
(
255
);
}
cSUBTOTAL
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
)
cSUBTOTAL
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
)
;
cSUBTOTAL
.
prototype
.
Calculate
=
function
(
arg
)
{
var
f
,
arg0
=
arg
[
0
];
...
...
@@ -3900,7 +3900,7 @@ function cSUM() {
}
cSUM
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
)
cSUM
.
prototype
=
Object
.
create
(
cBaseFunction
.
prototype
)
;
cSUM
.
prototype
.
Calculate
=
function
(
arg
)
{
var
arg0
=
new
cNumber
(
0
);
for
(
var
i
=
0
;
i
<
arg
.
length
;
i
++
)
{
...
...
@@ -3908,7 +3908,7 @@ cSUM.prototype.Calculate = function ( arg ) {
var
_arrVal
=
arg
[
i
].
getValue
();
for
(
var
j
=
0
;
j
<
_arrVal
.
length
;
j
++
)
{
if
(
!
(
_arrVal
[
j
]
instanceof
cBool
||
_arrVal
[
j
]
instanceof
cString
)
)
arg0
=
_func
[
arg0
.
type
][
_arrVal
[
j
].
type
](
arg0
,
_arrVal
[
j
],
"
+
"
)
arg0
=
_func
[
arg0
.
type
][
_arrVal
[
j
].
type
](
arg0
,
_arrVal
[
j
],
"
+
"
)
;
if
(
arg0
instanceof
cError
)
return
this
.
value
=
arg0
;
}
...
...
@@ -3936,13 +3936,13 @@ cSUM.prototype.Calculate = function ( arg ) {
}
return
this
.
value
=
arg0
;
}
}
;
cSUM
.
prototype
.
getInfo
=
function
()
{
return
{
name
:
this
.
name
,
args
:
"
( argument-list )
"
};
}
}
;
function
cSUMIF
()
{
// cBaseFunction.call( this, "SUMIF" );
...
...
cell/model/FormulaObjects/statisticalFunctions.js
View file @
c230346e
This diff is collapsed.
Click to expand it.
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