функции на прототипах

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

Excel/model/FormulaObjects/cubeFunctions.js

@@ -7,32 +7,46 @@
  */
 cFormulaFunction.Cube = {
     'groupName':"Cube",
-    'CUBEKPIMEMBER':function () {
-        var r = new cBaseFunction( "CUBEKPIMEMBER" );
-        return r;
-    },
-    'CUBEMEMBER':function () {
-        var r = new cBaseFunction( "CUBEMEMBER" );
-        return r;
-    },
-    'CUBEMEMBERPROPERTY':function () {
-        var r = new cBaseFunction( "CUBEMEMBERPROPERTY" );
-        return r;
-    },
-    'CUBERANKEDMEMBER':function () {
-        var r = new cBaseFunction( "CUBERANKEDMEMBER" );
-        return r;
-    },
-    'CUBESET':function () {
-        var r = new cBaseFunction( "CUBESET" );
-        return r;
-    },
-    'CUBESETCOUNT':function () {
-        var r = new cBaseFunction( "CUBESETCOUNT" );
-        return r;
-    },
-    'CUBEVALUE':function () {
-        var r = new cBaseFunction( "CUBEVALUE" );
-        return r;
-    }
-}
\ No newline at end of file
+    'CUBEKPIMEMBER':cCUBEKPIMEMBER,
+    'CUBEMEMBER':cCUBEMEMBER,
+    'CUBEMEMBERPROPERTY':cCUBEMEMBERPROPERTY,
+    'CUBERANKEDMEMBER':cCUBERANKEDMEMBER,
+    'CUBESET':cCUBESET,
+    'CUBESETCOUNT':cCUBESETCOUNT,
+    'CUBEVALUE':cCUBEVALUE
+}
+
+function cCUBEKPIMEMBER() {
+    cBaseFunction.call( this, "CUBEKPIMEMBER" );
+}
+cCUBEKPIMEMBER.prototype = Object.create( cBaseFunction.prototype )
+
+function cCUBEMEMBER() {
+    cBaseFunction.call( this, "CUBEMEMBER" );
+}
+cCUBEMEMBER.prototype = Object.create( cBaseFunction.prototype )
+
+function cCUBEMEMBERPROPERTY() {
+    cBaseFunction.call( this, "CUBEMEMBERPROPERTY" );
+}
+cCUBEMEMBERPROPERTY.prototype = Object.create( cBaseFunction.prototype )
+
+function cCUBERANKEDMEMBER() {
+    cBaseFunction.call( this, "CUBERANKEDMEMBER" );
+}
+cCUBERANKEDMEMBER.prototype = Object.create( cBaseFunction.prototype )
+
+function cCUBESET() {
+    cBaseFunction.call( this, "CUBESET" );
+}
+cCUBESET.prototype = Object.create( cBaseFunction.prototype )
+
+function cCUBESETCOUNT() {
+    cBaseFunction.call( this, "CUBESETCOUNT" );
+}
+cCUBESETCOUNT.prototype = Object.create( cBaseFunction.prototype )
+
+function cCUBEVALUE() {
+    cBaseFunction.call( this, "CUBEVALUE" );
+}
+cCUBEVALUE.prototype = Object.create( cBaseFunction.prototype )

Excel/model/FormulaObjects/databaseFunctions.js

@@ -7,52 +7,76 @@
  */
 cFormulaFunction.Database = {
     'groupName':"Database",
-    'DAVERAGE':function () {
-        var r = new cBaseFunction( "DAVERAGE" );
-        return r;
-    },
-    'DCOUNT':function () {
-        var r = new cBaseFunction( "DCOUNT" );
-        return r;
-    },
-    'DCOUNTA':function () {
-        var r = new cBaseFunction( "DCOUNTA" );
-        return r;
-    },
-    'DGET':function () {
-        var r = new cBaseFunction( "DGET" );
-        return r;
-    },
-    'DMAX':function () {
-        var r = new cBaseFunction( "DMAX" );
-        return r;
-    },
-    'DMIN':function () {
-        var r = new cBaseFunction( "DMIN" );
-        return r;
-    },
-    'DPRODUCT':function () {
-        var r = new cBaseFunction( "DPRODUCT" );
-        return r;
-    },
-    'DSTDEV':function () {
-        var r = new cBaseFunction( "DSTDEV" );
-        return r;
-    },
-    'DSTDEVP':function () {
-        var r = new cBaseFunction( "DSTDEVP" );
-        return r;
-    },
-    'DSUM':function () {
-        var r = new cBaseFunction( "DSUM" );
-        return r;
-    },
-    'DVAR':function () {
-        var r = new cBaseFunction( "DVAR" );
-        return r;
-    },
-    'DVARP':function () {
-        var r = new cBaseFunction( "DVARP" );
-        return r;
-    }
+    'DAVERAGE':cDAVERAGE,
+    'DCOUNT':cDCOUNT,
+    'DCOUNTA':cDCOUNTA,
+    'DGET':cDGET,
+    'DMAX':cDMAX,
+    'DMIN':cDMIN,
+    'DPRODUCT':cDPRODUCT,
+    'DSTDEV':cDSTDEV,
+    'DSTDEVP':cDSTDEVP,
+    'DSUM':cDSUM,
+    'DVAR':cDVAR,
+    'DVARP':cDVARP
 }
+
+function cDAVERAGE() {
+    cBaseFunction.call( this, "DAVERAGE" );
+}
+cDAVERAGE.prototype = Object.create( cBaseFunction.prototype )
+
+function cDCOUNT() {
+    cBaseFunction.call( this, "DCOUNT" );
+}
+cDCOUNT.prototype = Object.create( cBaseFunction.prototype )
+
+function cDCOUNTA() {
+    cBaseFunction.call( this, "DCOUNTA" );
+}
+cDCOUNTA.prototype = Object.create( cBaseFunction.prototype )
+
+function cDGET() {
+    cBaseFunction.call( this, "DGET" );
+}
+cDGET.prototype = Object.create( cBaseFunction.prototype )
+
+function cDMAX() {
+    cBaseFunction.call( this, "DMAX" );
+}
+cDMAX.prototype = Object.create( cBaseFunction.prototype )
+
+function cDMIN() {
+    cBaseFunction.call( this, "DMIN" );
+}
+cDMIN.prototype = Object.create( cBaseFunction.prototype )
+
+function cDPRODUCT() {
+    cBaseFunction.call( this, "DPRODUCT" );
+}
+cDPRODUCT.prototype = Object.create( cBaseFunction.prototype )
+
+function cDSTDEV() {
+    cBaseFunction.call( this, "DSTDEV" );
+}
+cDSTDEV.prototype = Object.create( cBaseFunction.prototype )
+
+function cDSTDEVP() {
+    cBaseFunction.call( this, "DSTDEVP" );
+}
+cDSTDEVP.prototype = Object.create( cBaseFunction.prototype )
+
+function cDSUM() {
+    cBaseFunction.call( this, "DSUM" );
+}
+cDSUM.prototype = Object.create( cBaseFunction.prototype )
+
+function cDVAR() {
+    cBaseFunction.call( this, "DVAR" );
+}
+cDVAR.prototype = Object.create( cBaseFunction.prototype )
+
+function cDVARP() {
+    cBaseFunction.call( this, "DVARP" );
+}
+cDVARP.prototype = Object.create( cBaseFunction.prototype )

Excel/model/FormulaObjects/parserFormula.js

@@ -2659,38 +2659,38 @@ parserFormula.prototype = {
                 else if ( parserHelp.isFunc.call( this, this.Formula, this.pCurrPos ) ) {
 
                     var found_operator = null;
-                    if ( this.operand_str.toUpperCase() in cFormulaFunction.Mathematic )//mathematic
-                        found_operator = cFormulaFunction.Mathematic[this.operand_str.toUpperCase()]();
+                    if ( this.operand_str.toUpperCase() in cFormulaFunction.Mathematic )//Mathematic
+                        found_operator = new cFormulaFunction.Mathematic[this.operand_str.toUpperCase()]();
 
-                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.Logical )//logical
-                        found_operator = cFormulaFunction.Logical[this.operand_str.toUpperCase()]();
+                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.Logical )//Logical
+                        found_operator = new cFormulaFunction.Logical[this.operand_str.toUpperCase()]();
 
-                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.Information )//information
-                        found_operator = cFormulaFunction.Information[this.operand_str.toUpperCase()]();
+                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.Information )//Information
+                        found_operator = new cFormulaFunction.Information[this.operand_str.toUpperCase()]();
 
-                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.Statistical )//statistical
-                        found_operator = cFormulaFunction.Statistical[this.operand_str.toUpperCase()]();
+                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.Statistical )//Statistical
+                        found_operator = new cFormulaFunction.Statistical[this.operand_str.toUpperCase()]();
 
-                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.TextAndData )//text and data
-                        found_operator = cFormulaFunction.TextAndData[this.operand_str.toUpperCase()]();
+                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.TextAndData )//Text and data
+                        found_operator = new cFormulaFunction.TextAndData[this.operand_str.toUpperCase()]();
 
-                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.Cube )//cube
-                        found_operator = cFormulaFunction.Cube[this.operand_str.toUpperCase()]();
+                    else if ( this.operand_str.toUpperCase() in cFormulaFunction.Cube )//Cube
+                        found_operator = new cFormulaFunction.Cube[this.operand_str.toUpperCase()]();
 
                     else if ( this.operand_str.toUpperCase() in cFormulaFunction.Database )//Database
-                        found_operator = cFormulaFunction.Database[this.operand_str.toUpperCase()]();
+                        found_operator = new cFormulaFunction.Database[this.operand_str.toUpperCase()]();
 
                     else if ( this.operand_str.toUpperCase() in cFormulaFunction.DateAndTime )//Date and time
-                        found_operator = cFormulaFunction.DateAndTime[this.operand_str.toUpperCase()]();
+                        found_operator = new cFormulaFunction.DateAndTime[this.operand_str.toUpperCase()]();
 
                     else if ( this.operand_str.toUpperCase() in cFormulaFunction.Engineering )//Engineering
-                        found_operator = cFormulaFunction.Engineering[this.operand_str.toUpperCase()]();
+                        found_operator = new cFormulaFunction.Engineering[this.operand_str.toUpperCase()]();
 
                     else if ( this.operand_str.toUpperCase() in cFormulaFunction.Financial )//Financial
-                        found_operator = cFormulaFunction.Financial[this.operand_str.toUpperCase()]();
+                        found_operator = new cFormulaFunction.Financial[this.operand_str.toUpperCase()]();
 
                     else if ( this.operand_str.toUpperCase() in cFormulaFunction.LookupAndReference )//Lookup and reference
-                        found_operator = cFormulaFunction.LookupAndReference[this.operand_str.toUpperCase()]();
+                        found_operator = new cFormulaFunction.LookupAndReference[this.operand_str.toUpperCase()]();
 
                     if ( found_operator != null && found_operator != undefined )
                         this.elemArr.push( found_operator );