Commit 74b73513 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

fix: Bug 29937 - [Formula] Ошибка в консоли при попытке вычисления формулы...

fix: Bug 29937 - [Formula] Ошибка в консоли при попытке вычисления формулы INDIRECT или открытия книги, использующую ее при вычислении (http://bugzserver/show_bug.cgi?id=29937)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64069 954022d7-b5bf-4e40-9824-e11837661b57
parent 096fda76
......@@ -555,9 +555,6 @@ cINDIRECT.prototype.Calculate = function ( arg ) {
found_operand.isAbsolute = true;
}
}
else if ( parserHelp.isName.call( o, o.Formula, o.pCurrPos, wb )[0] ) {
found_operand = new cName( o.operand_str, wb );
}
else if ( parserHelp.isArea.call( o, o.Formula, o.pCurrPos ) ) {
found_operand = new cArea( o.operand_str.toUpperCase(), r.worksheet );
if ( o.operand_str.indexOf( "$" ) > -1 )
......@@ -568,6 +565,9 @@ cINDIRECT.prototype.Calculate = function ( arg ) {
if ( o.operand_str.indexOf( "$" ) > -1 )
found_operand.isAbsolute = true;
}
else if ( parserHelp.isName.call( o, o.Formula, o.pCurrPos, wb )[0] ) {
found_operand = new cName( o.operand_str, wb, r.worksheet );
}
}
if ( arg0 instanceof cArray ) {
......
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