fixed: Bug 19774 - Ошибка при вычислении формулы SUMPRODUCT, аргументы в...

fixed: Bug 19774 - Ошибка при вычислении формулы SUMPRODUCT, аргументы в которой заданы именованным диапазоном

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49045 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/FormulaObjects/mathematicFunctions.js

@@ -3148,7 +3148,7 @@ cFormulaFunction.Mathematic = {
             for ( var i = 0; i < arg.length; i++ ) {
 
                 if ( arg[i] instanceof cArea3D )
-                    return this.value = new cError( bad_reference );
+                    return this.value = new cError( cErrorType.bad_reference );
 
                 if ( arg[i] instanceof cArea || arg[i] instanceof cArray ) {
                     resArr[i] = arg[i].getMatrix();

Excel/model/FormulaObjects/parserFormula.js

@@ -2425,7 +2425,10 @@ cName.prototype.toRef = function ( wsID ) {
         _wsFrom = _3DRefTmp[1];
         _wsTo = ( (_3DRefTmp[2] !== null) && (_3DRefTmp[2] !== undefined) ) ? _3DRefTmp[2] : _wsFrom;
         if ( parserHelp.isArea( ref, ref.indexOf( "!" ) + 1 ) ) {
-            return new cArea3D( parserHelp.operand_str, _wsFrom, _wsTo, this.wb );
+            if( _wsFrom == _wsTo )
+                return new cArea( parserHelp.operand_str, this.wb.getWorksheetByName(_wsFrom) );
+            else
+                return new cArea3D( parserHelp.operand_str, _wsFrom, _wsTo, this.wb );
         }
         else if ( parserHelp.isRef( ref, ref.indexOf( "!" ) + 1 ) ) {
             return new cRef3D( parserHelp.operand_str, _wsFrom, this.wb );