fix: Bug 30395 - TypeError: e.getMatrix при открытии XLSX файла...

fix: Bug 30395 - TypeError: e.getMatrix при открытии XLSX файла (http://bugzserver/show_bug.cgi?id=30395)

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

Excel/model/FormulaObjects/mathematicFunctions.js

@@ -3851,7 +3851,8 @@ function cSUMIF() {
         noneFormat:-2
     };
     this.numFormat = this.formatType.def;
-
+    this.operatorRE = new RegExp( "^ *[<=> ]+ *" );
+    this.spaceRE = /\s/g;
 }
 
 cSUMIF.prototype = Object.create( cBaseFunction.prototype )
@@ -3879,11 +3880,10 @@ cSUMIF.prototype.Calculate = function ( arg ) {
     }
 
     arg1 = arg1.toString();
-    var operators = new RegExp( "^ *[<=> ]+ *" ), match = arg1.match( operators ),
-        search, oper, val;
+    var match = arg1.match( this.operatorRE ), search, oper, val;
     if ( match ) {
         search = arg1.substr( match[0].length );
-        oper = match[0].replace( /\s/g, "" );
+        oper = match[0].replace( this.spaceRE, "" );
     }
     else {
         search = arg1;
@@ -3894,7 +3894,7 @@ cSUMIF.prototype.Calculate = function ( arg ) {
         for ( var i = 0; i < arg0Matrix.length; i++ ) {
             for ( var j = 0; j < arg0Matrix[i].length; j++ ) {
                 valMatrix0 = arg0Matrix[i][j];
-                valMatrix2 = arg2Matrix[i][j] ? arg2Matrix[i][j] : new cEmpty();
+                valMatrix2 = arg2Matrix[i]? (arg2Matrix[i][j] ? arg2Matrix[i][j] : new cEmpty()) : new cEmpty();
                 if ( matching( valMatrix0, valueForSearching, oper ) ) {
                     if ( valMatrix2 instanceof cNumber ) {
                         _sum += valMatrix2.getValue();

Excel/model/FormulaObjects/parserFormula.js

@@ -1140,6 +1140,9 @@ cRef.prototype.getWS = function () {
 cRef.prototype.isValid = function () {
     return this._valid;
 };
+cRef.prototype.getMatrix = function () {
+    return [[this.getValue()]];
+}
 
 /** @constructor */
 function cRef3D( val, _wsFrom, wb ) {/*Ref means Sheat1!A1 for example*/
@@ -1273,7 +1276,7 @@ cName.prototype.reInit = function () {
 cName.prototype.toRef = function () {
 
     if ( !this.defName || !this.defName.Ref ) {
-        return new cError( "#NAME?" );
+        return new cError( cErrorType.wrong_name );
     }
 
     var _3DRefTmp, ref = this.defName.Ref, _wsFrom, _wsTo;
@@ -1293,7 +1296,7 @@ cName.prototype.toRef = function () {
             return new cRef3D( parserHelp.operand_str, _wsFrom, this.wb );
         }
     }
-    return new cError( "#NAME?" );
+    return new cError( cErrorType.wrong_name );
 };
 cName.prototype.toString = function () {
     if( this.defName ){