fix:

Bug 21613 - Ошибка #N/A при вычислении функции VLOOKUP
Bug 21707 - [Copy&Paste] Ошибка в консоли при копировании ячейки содержащую ссылку на merge ячейку с данными

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

Excel/model/FormulaObjects/lookupandreferenceFunctions.js

@@ -256,6 +256,9 @@ cFormulaFunction.LookupAndReference = {
                         var cv = cell.getValueWithoutFormat(), cvType = checkTypeCell(cv);
                         if ( c == c1 )
                             min = cv;
+                        else if ( min > cv ) {
+                            min = cv;
+                        }
                         if ( arg3.value == true ) {
                             if ( arg0 instanceof cString ) {
                                 if ( cvType instanceof cString ){
@@ -738,6 +741,9 @@ cFormulaFunction.LookupAndReference = {
                         var cv = cell.getValueWithoutFormat(), cvType = checkTypeCell(cv);
                         if ( r == r1 )
                             min = cv;
+                        else if( min > cv ){
+                            min = cv;
+                        }
                         if ( arg3.value == true ) {
                             if ( arg0 instanceof cString ) {
                                 if ( cvType instanceof cString ){

Excel/model/FormulaObjects/parserFormula.js

@@ -1439,7 +1439,11 @@ cArea.prototype.getValue2 = function ( cell ) {
                             _val.push( checkTypeCell( "" + _cell.getValueWithoutFormat() ) );
                 }
         } );
-    return _val[0];
+
+    if( _val[0] == undefined || _val[0] == null )
+        return new cEmpty();
+    else
+        return _val[0];
 };
 cArea.prototype.getRange = function () {
     return this.ws.getRange2( this._cells );
@@ -1755,7 +1759,11 @@ cArea3D.prototype.getValue2 = function ( cell ) {
                         _val.push( checkTypeCell( "" + _cell.getValueWithoutFormat() ) );
             }
     } )
-    return _val[0];
+
+    if( _val[0] == undefined || _val[0] == null )
+        return new cEmpty();
+    else
+        return _val[0];
 };
 cArea3D.prototype.changeSheet = function ( lastName, newName ) {
     if ( this.wsFrom == this._wb.getWorksheetByName( lastName ).getId() && this.wsTo == this._wb.getWorksheetByName( lastName ).getId() ) {