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
b50c9305
Commit
b50c9305
authored
Jul 27, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete tryConvert
delete checkTypeCell checkTypeCell2 -> checkTypeCell
parent
3a713b55
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
94 deletions
+71
-94
cell/model/FormulaObjects/lookupandreferenceFunctions.js
cell/model/FormulaObjects/lookupandreferenceFunctions.js
+6
-6
cell/model/FormulaObjects/parserFormula.js
cell/model/FormulaObjects/parserFormula.js
+65
-88
No files found.
cell/model/FormulaObjects/lookupandreferenceFunctions.js
View file @
b50c9305
...
...
@@ -62,7 +62,7 @@
var
cArray
=
AscCommonExcel
.
cArray
;
var
cBaseFunction
=
AscCommonExcel
.
cBaseFunction
;
var
checkTypeCell
2
=
AscCommonExcel
.
checkTypeCell2
;
var
checkTypeCell
=
AscCommonExcel
.
checkTypeCell
;
var
cFormulaFunctionGroup
=
AscCommonExcel
.
cFormulaFunctionGroup
;
var
_func
=
AscCommonExcel
.
_func
;
...
...
@@ -454,7 +454,7 @@
}
var
v
=
arg1
.
getWS
().
_getCellNoEmpty
(
bb
.
r1
+
numberRow
,
resC
);
return
this
.
value
=
checkTypeCell
2
(
v
);
return
this
.
value
=
checkTypeCell
(
v
);
};
cHLOOKUP
.
prototype
.
getInfo
=
function
()
{
return
{
...
...
@@ -540,7 +540,7 @@
}
}
else
if
(
cElementType
.
cell
===
arg0
.
type
||
cElementType
.
cell3D
===
arg0
.
type
)
{
if
((
arg1
==
0
||
arg1
==
1
)
&&
(
arg2
==
0
||
arg2
==
1
))
{
res
=
arg0
.
tryConvert
();
res
=
arg0
.
getValue
();
}
}
else
{
res
=
new
cError
(
cErrorType
.
wrong_value_type
);
...
...
@@ -701,7 +701,7 @@
return
this
.
value
=
arg0
;
}
if
(
cElementType
.
cell
===
arg0
.
type
)
{
arg0
=
arg0
.
tryConvert
();
arg0
=
arg0
.
getValue
();
}
function
arrFinder
(
arr
)
{
...
...
@@ -759,7 +759,7 @@
}
var
c
=
new
CellAddress
(
BBox
.
r1
+
resR
,
BBox
.
c1
+
resC
);
return
this
.
value
=
checkTypeCell
2
(
_arg2
.
getWS
().
_getCellNoEmpty
(
c
.
getRow0
(),
c
.
getCol0
()));
return
this
.
value
=
checkTypeCell
(
_arg2
.
getWS
().
_getCellNoEmpty
(
c
.
getRow0
(),
c
.
getCol0
()));
}
else
{
var
arg1Range
=
arg1
.
getRange
(),
arg2Range
=
arg2
.
getRange
();
...
...
@@ -1424,7 +1424,7 @@
}
var
v
=
arg1
.
getWS
().
_getCellNoEmpty
(
resR
,
bb
.
c1
+
numberCol
);
return
this
.
value
=
checkTypeCell
2
(
v
);
return
this
.
value
=
checkTypeCell
(
v
);
};
cVLOOKUP
.
prototype
.
getInfo
=
function
()
{
return
{
...
...
cell/model/FormulaObjects/parserFormula.js
View file @
b50c9305
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