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
1e788721
Commit
1e788721
authored
Mar 03, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 34217
parent
11870951
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
18 deletions
+17
-18
cell/model/FormulaObjects/lookupandreferenceFunctions.js
cell/model/FormulaObjects/lookupandreferenceFunctions.js
+4
-3
cell/model/FormulaObjects/parserFormula.js
cell/model/FormulaObjects/parserFormula.js
+13
-15
No files found.
cell/model/FormulaObjects/lookupandreferenceFunctions.js
View file @
1e788721
...
...
@@ -577,7 +577,8 @@
function
parseReference
()
{
if
((
ref
=
parserHelp
.
is3DRef
.
call
(
o
,
o
.
Formula
,
o
.
pCurrPos
))[
0
])
{
var
_wsFrom
=
ref
[
1
],
_wsTo
=
(
(
ref
[
2
]
!==
null
)
&&
(
ref
[
2
]
!==
undefined
)
)
?
ref
[
2
]
:
_wsFrom
;
if
(
!
(
wb
.
getWorksheetByName
(
_wsFrom
)
&&
wb
.
getWorksheetByName
(
_wsTo
)))
{
var
wsFrom
=
wb
.
getWorksheetByName
(
_wsFrom
);
if
(
!
(
wsFrom
&&
wb
.
getWorksheetByName
(
_wsTo
)))
{
return
t
.
value
=
new
cError
(
cErrorType
.
bad_reference
);
}
if
(
parserHelp
.
isArea
.
call
(
o
,
o
.
Formula
,
o
.
pCurrPos
))
{
...
...
@@ -586,7 +587,7 @@
if
(
_wsTo
!=
_wsFrom
)
{
found_operand
=
new
cArea3D
(
o
.
operand_str
.
toUpperCase
(),
_wsFrom
,
_wsTo
,
wb
);
}
else
{
found_operand
=
new
cRef3D
(
o
.
operand_str
.
toUpperCase
(),
_wsFrom
,
wb
);
found_operand
=
new
cRef3D
(
o
.
operand_str
.
toUpperCase
(),
wsFrom
);
}
}
}
else
if
(
parserHelp
.
isArea
.
call
(
o
,
o
.
Formula
,
o
.
pCurrPos
))
{
...
...
@@ -959,7 +960,7 @@
var
wsName
=
arg0
.
ws
.
getName
();
if
(
box
.
r1
==
box
.
r2
&&
box
.
c1
==
box
.
c2
)
{
ref
=
g_oCellAddressUtils
.
colnumToColstrFromWsView
(
box
.
c1
+
1
)
+
_getRowTitle
(
box
.
r1
);
this
.
value
=
(
cElementType
.
cell
===
arg0
.
type
)
?
new
cRef
(
ref
,
arg0
.
ws
)
:
new
cRef3D
(
ref
,
wsName
,
arg0
.
wb
);
this
.
value
=
(
cElementType
.
cell
===
arg0
.
type
)
?
new
cRef
(
ref
,
arg0
.
ws
)
:
new
cRef3D
(
ref
,
arg0
.
ws
);
}
else
{
ref
=
g_oCellAddressUtils
.
colnumToColstrFromWsView
(
box
.
c1
+
1
)
+
_getRowTitle
(
box
.
r1
)
+
"
:
"
+
g_oCellAddressUtils
.
colnumToColstrFromWsView
(
box
.
c2
+
1
)
+
_getRowTitle
(
box
.
r2
);
...
...
cell/model/FormulaObjects/parserFormula.js
View file @
1e788721
...
...
@@ -1427,25 +1427,21 @@ cRef.prototype.getBBox0 = function () {
return
excludeHiddenRows
&&
this
.
_valid
&&
this
.
ws
.
getRowHidden
(
this
.
getRange
().
r1
);
};
/** @constructor */
function
cRef3D
(
val
,
_wsFrom
,
wb
)
{
/*Ref means Sheat1!A1 for example*/
this
.
constructor
.
call
(
this
,
val
,
cElementType
.
cell3D
);
/** @constructor */
function
cRef3D
(
val
,
ws
)
{
/*Ref means Sheat1!A1 for example*/
this
.
constructor
.
call
(
this
,
val
,
cElementType
.
cell3D
);
this
.
ws
=
null
;
if
(
_wsFrom
)
{
this
.
ws
=
wb
.
getWorksheetByName
(
_wsFrom
);
}
this
.
ws
=
ws
;
this
.
range
=
null
;
if
(
val
&&
this
.
ws
)
{
this
.
range
=
this
.
ws
.
getRange2
(
val
);
}
}
}
cRef3D
.
prototype
=
Object
.
create
(
cBaseType
.
prototype
);
cRef3D
.
prototype
.
clone
=
function
(
opt_ws
)
{
var
ws
=
opt_ws
?
opt_ws
:
this
.
ws
;
var
wb
=
ws
.
workbook
;
var
oRes
=
new
cRef3D
(
null
,
null
,
wb
);
var
oRes
=
new
cRef3D
(
null
,
null
);
// cBaseType.prototype.cloneTo.call( this, oRes );
this
.
constructor
.
prototype
.
cloneTo
.
call
(
this
,
oRes
);
if
(
opt_ws
&&
this
.
ws
.
getName
()
==
opt_ws
.
getName
())
{
...
...
@@ -1846,9 +1842,10 @@ cStrucTable.prototype.toLocaleString = function () {
}
if
(
tableData
.
range
)
{
var
refName
=
tableData
.
range
.
getAbsName
();
var
sheetName
=
this
.
wb
.
getWorksheetById
(
tableData
.
wsID
).
getName
();
var
wsFrom
=
this
.
wb
.
getWorksheetById
(
tableData
.
wsID
);
var
sheetName
=
wsFrom
.
getName
();
if
(
tableData
.
range
.
isOneCell
())
{
this
.
area
=
new
cRef3D
(
refName
,
sheetName
,
this
.
wb
);
this
.
area
=
new
cRef3D
(
refName
,
wsFrom
);
}
else
{
this
.
area
=
new
cArea3D
(
refName
,
sheetName
,
sheetName
,
this
.
wb
);
}
...
...
@@ -4052,7 +4049,7 @@ parserFormula.prototype.parse = function(local, digitDelim) {
return
false
;
}
var
stack
=
[],
val
,
valUp
,
tmp
,
elem
,
len
,
indentCount
=
-
1
,
args
=
[],
prev
,
next
,
arr
=
null
,
bArrElemSign
=
false
;
var
stack
=
[],
val
,
valUp
,
tmp
,
elem
,
len
,
indentCount
=
-
1
,
args
=
[],
prev
,
next
,
arr
=
null
,
bArrElemSign
=
false
,
wsF
;
for
(
var
i
=
0
,
nLength
=
aTokens
.
length
;
i
<
nLength
;
++
i
)
{
found_operand
=
null
;
val
=
aTokens
[
i
].
value
;
...
...
@@ -4072,8 +4069,9 @@ parserFormula.prototype.parse = function(local, digitDelim) {
tmp
=
AscCommonExcel
.
g_oRangeCache
.
getRange3D
(
val
);
if
(
tmp
)
{
this
.
is3D
=
true
;
wsF
=
this
.
wb
.
getWorksheetByName
(
tmp
.
sheet
);
elem
=
(
tmp
.
isOneCell
()
&&
(
null
===
tmp
.
sheet2
||
tmp
.
sheet
===
tmp
.
sheet2
))
?
new
cRef3D
(
tmp
.
getName
(),
tmp
.
sheet
,
this
.
wb
)
:
new
cRef3D
(
tmp
.
getName
(),
wsF
)
:
new
cArea3D
(
tmp
.
getName
(),
tmp
.
sheet
,
null
!==
tmp
.
sheet2
?
tmp
.
sheet2
:
tmp
.
sheet
,
this
.
wb
);
}
else
{
this
.
error
.
push
(
c_oAscError
.
ID
.
FrmlWrongOperator
);
...
...
@@ -4613,7 +4611,7 @@ parserFormula.prototype.parse = function(local, digitDelim) {
found_operand
=
new
cArea3D
(
this
.
operand_str
.
toUpperCase
(),
_wsFrom
,
_wsTo
,
this
.
wb
);
pos
.
oper
=
found_operand
;
}
else
{
found_operand
=
new
cRef3D
(
this
.
operand_str
.
toUpperCase
(),
_wsFrom
,
this
.
wb
);
found_operand
=
new
cRef3D
(
this
.
operand_str
.
toUpperCase
(),
wsF
);
pos
.
oper
=
found_operand
;
}
this
.
RefPos
.
push
(
pos
);
...
...
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