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

fix: Bug 21066 - Не рассчитывается функция INDIRECT когда аргумент задан именованной ссылкой

дополнительный фикс для Bug 21089 - Некорректно вычисляется количество рабочих дней в формуле NETWORKDAYS

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50558 954022d7-b5bf-4e40-9824-e11837661b57
parent 01972eb7
......@@ -745,7 +745,8 @@ cFormulaFunction.DateAndTime = {
return true;
}
dif = ( val1 - val0 + c_msPerDay ) / c_msPerDay;
dif = ( val1 - val0 )
dif = ( dif + (dif >= 0 ? c_msPerDay : 0 ) ) / c_msPerDay;
for(var i = 0; i < Math.abs(dif); i++ ){
var date = new Date( val0 );
date.setDate(val0.getDate()+i) ;
......
......@@ -448,8 +448,12 @@ cFormulaFunction.LookupAndReference = {
parseReference();
}
if ( found_operand )
if ( found_operand ){
if( found_operand instanceof cName )
found_operand = found_operand.toRef()
return this.value = found_operand;
}
return this.value = new cError( cErrorType.bad_reference );
......
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