diff --git a/src/PhpSpreadsheet/Calculation.php b/src/PhpSpreadsheet/Calculation.php index 0cc9b1c7..32577143 100644 --- a/src/PhpSpreadsheet/Calculation.php +++ b/src/PhpSpreadsheet/Calculation.php @@ -336,7 +336,7 @@ class Calculation ), 'ATAN2' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ATAN2', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::ATAN2', 'argumentCount' => '2' ), 'ATANH' => array( @@ -346,22 +346,22 @@ class Calculation ), 'AVEDEV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::AVEDEV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::AVEDEV', 'argumentCount' => '1+' ), 'AVERAGE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::AVERAGE', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::AVERAGE', 'argumentCount' => '1+' ), 'AVERAGEA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::AVERAGEA', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::AVERAGEA', 'argumentCount' => '1+' ), 'AVERAGEIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::AVERAGEIF', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::AVERAGEIF', 'argumentCount' => '2,3' ), 'AVERAGEIFS' => array( @@ -376,57 +376,57 @@ class Calculation ), 'BESSELI' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BESSELI', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::BESSELI', 'argumentCount' => '2' ), 'BESSELJ' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BESSELJ', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::BESSELJ', 'argumentCount' => '2' ), 'BESSELK' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BESSELK', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::BESSELK', 'argumentCount' => '2' ), 'BESSELY' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BESSELY', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::BESSELY', 'argumentCount' => '2' ), 'BETADIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::BETADIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::BETADIST', 'argumentCount' => '3-5' ), 'BETAINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::BETAINV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::BETAINV', 'argumentCount' => '3-5' ), 'BIN2DEC' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BINTODEC', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::BINTODEC', 'argumentCount' => '1' ), 'BIN2HEX' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BINTOHEX', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::BINTOHEX', 'argumentCount' => '1,2' ), 'BIN2OCT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BINTOOCT', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::BINTOOCT', 'argumentCount' => '1,2' ), 'BINOMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::BINOMDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::BINOMDIST', 'argumentCount' => '4' ), 'CEILING' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::CEILING', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::CEILING', 'argumentCount' => '2' ), 'CELL' => array( @@ -436,17 +436,17 @@ class Calculation ), 'CHAR' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::CHARACTER', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::CHARACTER', 'argumentCount' => '1' ), 'CHIDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CHIDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::CHIDIST', 'argumentCount' => '2' ), 'CHIINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CHIINV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::CHIINV', 'argumentCount' => '2' ), 'CHITEST' => array( @@ -456,58 +456,58 @@ class Calculation ), 'CHOOSE' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::CHOOSE', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::CHOOSE', 'argumentCount' => '2+' ), 'CLEAN' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::TRIMNONPRINTABLE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::TRIMNONPRINTABLE', 'argumentCount' => '1' ), 'CODE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::ASCIICODE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::ASCIICODE', 'argumentCount' => '1' ), 'COLUMN' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::COLUMN', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::COLUMN', 'argumentCount' => '-1', 'passByReference' => array(true) ), 'COLUMNS' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::COLUMNS', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::COLUMNS', 'argumentCount' => '1' ), 'COMBIN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::COMBIN', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::COMBIN', 'argumentCount' => '2' ), 'COMPLEX' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::COMPLEX', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::COMPLEX', 'argumentCount' => '2,3' ), 'CONCATENATE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::CONCATENATE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::CONCATENATE', 'argumentCount' => '1+' ), 'CONFIDENCE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CONFIDENCE', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::CONFIDENCE', 'argumentCount' => '3' ), 'CONVERT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::CONVERTUOM', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::CONVERTUOM', 'argumentCount' => '3' ), 'CORREL' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CORREL', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::CORREL', 'argumentCount' => '2' ), 'COS' => array( @@ -522,22 +522,22 @@ class Calculation ), 'COUNT' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COUNT', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::COUNT', 'argumentCount' => '1+' ), 'COUNTA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COUNTA', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::COUNTA', 'argumentCount' => '1+' ), 'COUNTBLANK' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COUNTBLANK', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::COUNTBLANK', 'argumentCount' => '1' ), 'COUNTIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COUNTIF', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::COUNTIF', 'argumentCount' => '2' ), 'COUNTIFS' => array( @@ -547,42 +547,42 @@ class Calculation ), 'COUPDAYBS' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPDAYBS', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::COUPDAYBS', 'argumentCount' => '3,4' ), 'COUPDAYS' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPDAYS', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::COUPDAYS', 'argumentCount' => '3,4' ), 'COUPDAYSNC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPDAYSNC', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::COUPDAYSNC', 'argumentCount' => '3,4' ), 'COUPNCD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPNCD', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::COUPNCD', 'argumentCount' => '3,4' ), 'COUPNUM' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPNUM', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::COUPNUM', 'argumentCount' => '3,4' ), 'COUPPCD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPPCD', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::COUPPCD', 'argumentCount' => '3,4' ), 'COVAR' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COVAR', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::COVAR', 'argumentCount' => '2' ), 'CRITBINOM' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CRITBINOM', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::CRITBINOM', 'argumentCount' => '3' ), 'CUBEKPIMEMBER' => array( @@ -622,77 +622,77 @@ class Calculation ), 'CUMIPMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::CUMIPMT', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::CUMIPMT', 'argumentCount' => '6' ), 'CUMPRINC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::CUMPRINC', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::CUMPRINC', 'argumentCount' => '6' ), 'DATE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATE', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::DATE', 'argumentCount' => '3' ), 'DATEDIF' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATEDIF', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::DATEDIF', 'argumentCount' => '2,3' ), 'DATEVALUE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATEVALUE', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::DATEVALUE', 'argumentCount' => '1' ), 'DAVERAGE' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DAVERAGE', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DAVERAGE', 'argumentCount' => '3' ), 'DAY' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DAYOFMONTH', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::DAYOFMONTH', 'argumentCount' => '1' ), 'DAYS360' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DAYS360', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::DAYS360', 'argumentCount' => '2,3' ), 'DB' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::DB', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::DB', 'argumentCount' => '4,5' ), 'DCOUNT' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DCOUNT', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DCOUNT', 'argumentCount' => '3' ), 'DCOUNTA' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DCOUNTA', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DCOUNTA', 'argumentCount' => '3' ), 'DDB' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::DDB', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::DDB', 'argumentCount' => '4,5' ), 'DEC2BIN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::DECTOBIN', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::DECTOBIN', 'argumentCount' => '1,2' ), 'DEC2HEX' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::DECTOHEX', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::DECTOHEX', 'argumentCount' => '1,2' ), 'DEC2OCT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::DECTOOCT', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::DECTOOCT', 'argumentCount' => '1,2' ), 'DEGREES' => array( @@ -702,67 +702,67 @@ class Calculation ), 'DELTA' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::DELTA', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::DELTA', 'argumentCount' => '1,2' ), 'DEVSQ' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::DEVSQ', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::DEVSQ', 'argumentCount' => '1+' ), 'DGET' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DGET', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DGET', 'argumentCount' => '3' ), 'DISC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::DISC', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::DISC', 'argumentCount' => '4,5' ), 'DMAX' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DMAX', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DMAX', 'argumentCount' => '3' ), 'DMIN' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DMIN', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DMIN', 'argumentCount' => '3' ), 'DOLLAR' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::DOLLAR', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::DOLLAR', 'argumentCount' => '1,2' ), 'DOLLARDE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::DOLLARDE', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::DOLLARDE', 'argumentCount' => '2' ), 'DOLLARFR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::DOLLARFR', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::DOLLARFR', 'argumentCount' => '2' ), 'DPRODUCT' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DPRODUCT', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DPRODUCT', 'argumentCount' => '3' ), 'DSTDEV' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DSTDEV', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DSTDEV', 'argumentCount' => '3' ), 'DSTDEVP' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DSTDEVP', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DSTDEVP', 'argumentCount' => '3' ), 'DSUM' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DSUM', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DSUM', 'argumentCount' => '3' ), 'DURATION' => array( @@ -772,37 +772,37 @@ class Calculation ), 'DVAR' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DVAR', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DVAR', 'argumentCount' => '3' ), 'DVARP' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => \\PHPExcel\\Calculation\\Database::DVARP', + 'functionCall' => '\\PHPExcel\\Calculation\\Database::DVARP', 'argumentCount' => '3' ), 'EDATE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::EDATE', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::EDATE', 'argumentCount' => '2' ), 'EFFECT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::EFFECT', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::EFFECT', 'argumentCount' => '2' ), 'EOMONTH' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::EOMONTH', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::EOMONTH', 'argumentCount' => '2' ), 'ERF' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::ERF', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::ERF', 'argumentCount' => '1,2' ), 'ERFC' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::ERFC', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::ERFC', 'argumentCount' => '1' ), 'ERROR.TYPE' => array( @@ -812,7 +812,7 @@ class Calculation ), 'EVEN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::EVEN', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::EVEN', 'argumentCount' => '1' ), 'EXACT' => array( @@ -827,22 +827,22 @@ class Calculation ), 'EXPONDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::EXPONDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::EXPONDIST', 'argumentCount' => '3' ), 'FACT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::FACT', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::FACT', 'argumentCount' => '1' ), 'FACTDOUBLE' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::FACTDOUBLE', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::FACTDOUBLE', 'argumentCount' => '1' ), 'FALSE' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Logical::FALSE', + 'functionCall' => '\\PHPExcel\\Calculation\\Logical::FALSE', 'argumentCount' => '0' ), 'FDIST' => array( @@ -852,12 +852,12 @@ class Calculation ), 'FIND' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::SEARCHSENSITIVE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::SEARCHSENSITIVE', 'argumentCount' => '2,3' ), 'FINDB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::SEARCHSENSITIVE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::SEARCHSENSITIVE', 'argumentCount' => '2,3' ), 'FINV' => array( @@ -867,27 +867,27 @@ class Calculation ), 'FISHER' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::FISHER', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::FISHER', 'argumentCount' => '1' ), 'FISHERINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::FISHERINV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::FISHERINV', 'argumentCount' => '1' ), 'FIXED' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::FIXEDFORMAT', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::FIXEDFORMAT', 'argumentCount' => '1-3' ), 'FLOOR' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::FLOOR', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::FLOOR', 'argumentCount' => '2' ), 'FORECAST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::FORECAST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::FORECAST', 'argumentCount' => '3' ), 'FREQUENCY' => array( @@ -902,42 +902,42 @@ class Calculation ), 'FV' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::FV', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::FV', 'argumentCount' => '3-5' ), 'FVSCHEDULE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::FVSCHEDULE', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::FVSCHEDULE', 'argumentCount' => '2' ), 'GAMMADIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GAMMADIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::GAMMADIST', 'argumentCount' => '4' ), 'GAMMAINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GAMMAINV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::GAMMAINV', 'argumentCount' => '3' ), 'GAMMALN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GAMMALN', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::GAMMALN', 'argumentCount' => '1' ), 'GCD' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::GCD', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::GCD', 'argumentCount' => '1+' ), 'GEOMEAN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GEOMEAN', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::GEOMEAN', 'argumentCount' => '1+' ), 'GESTEP' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::GESTEP', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::GESTEP', 'argumentCount' => '1,2' ), 'GETPIVOTDATA' => array( @@ -947,153 +947,153 @@ class Calculation ), 'GROWTH' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GROWTH', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::GROWTH', 'argumentCount' => '1-4' ), 'HARMEAN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::HARMEAN', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::HARMEAN', 'argumentCount' => '1+' ), 'HEX2BIN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::HEXTOBIN', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::HEXTOBIN', 'argumentCount' => '1,2' ), 'HEX2DEC' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::HEXTODEC', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::HEXTODEC', 'argumentCount' => '1' ), 'HEX2OCT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::HEXTOOCT', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::HEXTOOCT', 'argumentCount' => '1,2' ), 'HLOOKUP' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::HLOOKUP', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::HLOOKUP', 'argumentCount' => '3,4' ), 'HOUR' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::HOUROFDAY', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::HOUROFDAY', 'argumentCount' => '1' ), 'HYPERLINK' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::HYPERLINK', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::HYPERLINK', 'argumentCount' => '1,2', 'passCellReference' => true ), 'HYPGEOMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::HYPGEOMDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::HYPGEOMDIST', 'argumentCount' => '4' ), 'IF' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Logical::STATEMENT_IF', + 'functionCall' => '\\PHPExcel\\Calculation\\Logical::STATEMENT_IF', 'argumentCount' => '1-3' ), 'IFERROR' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Logical::IFERROR', + 'functionCall' => '\\PHPExcel\\Calculation\\Logical::IFERROR', 'argumentCount' => '2' ), 'IMABS' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMABS', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMABS', 'argumentCount' => '1' ), 'IMAGINARY' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMAGINARY', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMAGINARY', 'argumentCount' => '1' ), 'IMARGUMENT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMARGUMENT', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMARGUMENT', 'argumentCount' => '1' ), 'IMCONJUGATE' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMCONJUGATE', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMCONJUGATE', 'argumentCount' => '1' ), 'IMCOS' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMCOS', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMCOS', 'argumentCount' => '1' ), 'IMDIV' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMDIV', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMDIV', 'argumentCount' => '2' ), 'IMEXP' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMEXP', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMEXP', 'argumentCount' => '1' ), 'IMLN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMLN', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMLN', 'argumentCount' => '1' ), 'IMLOG10' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMLOG10', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMLOG10', 'argumentCount' => '1' ), 'IMLOG2' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMLOG2', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMLOG2', 'argumentCount' => '1' ), 'IMPOWER' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMPOWER', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMPOWER', 'argumentCount' => '2' ), 'IMPRODUCT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMPRODUCT', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMPRODUCT', 'argumentCount' => '1+' ), 'IMREAL' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMREAL', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMREAL', 'argumentCount' => '1' ), 'IMSIN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMSIN', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMSIN', 'argumentCount' => '1' ), 'IMSQRT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMSQRT', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMSQRT', 'argumentCount' => '1' ), 'IMSUB' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMSUB', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMSUB', 'argumentCount' => '2' ), 'IMSUM' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMSUM', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::IMSUM', 'argumentCount' => '1+' ), 'INDEX' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::INDEX', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::INDEX', 'argumentCount' => '1-4' ), 'INDIRECT' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::INDIRECT', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::INDIRECT', 'argumentCount' => '1,2', 'passCellReference' => true ), @@ -1104,27 +1104,27 @@ class Calculation ), 'INT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::INT', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::INT', 'argumentCount' => '1' ), 'INTERCEPT' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::INTERCEPT', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::INTERCEPT', 'argumentCount' => '2' ), 'INTRATE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::INTRATE', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::INTRATE', 'argumentCount' => '4,5' ), 'IPMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::IPMT', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::IPMT', 'argumentCount' => '4-6' ), 'IRR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::IRR', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::IRR', 'argumentCount' => '1,2' ), 'ISBLANK' => array( @@ -1174,7 +1174,7 @@ class Calculation ), 'ISPMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::ISPMT', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::ISPMT', 'argumentCount' => '4' ), 'ISREF' => array( @@ -1194,42 +1194,42 @@ class Calculation ), 'KURT' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::KURT', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::KURT', 'argumentCount' => '1+' ), 'LARGE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LARGE', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::LARGE', 'argumentCount' => '2' ), 'LCM' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::LCM', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::LCM', 'argumentCount' => '1+' ), 'LEFT' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::LEFT', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::LEFT', 'argumentCount' => '1,2' ), 'LEFTB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::LEFT', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::LEFT', 'argumentCount' => '1,2' ), 'LEN' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::STRINGLENGTH', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::STRINGLENGTH', 'argumentCount' => '1' ), 'LENB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::STRINGLENGTH', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::STRINGLENGTH', 'argumentCount' => '1' ), 'LINEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LINEST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::LINEST', 'argumentCount' => '1-4' ), 'LN' => array( @@ -1239,7 +1239,7 @@ class Calculation ), 'LOG' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::LOG_BASE', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::LOG_BASE', 'argumentCount' => '1,2' ), 'LOG10' => array( @@ -1249,52 +1249,52 @@ class Calculation ), 'LOGEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LOGEST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::LOGEST', 'argumentCount' => '1-4' ), 'LOGINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LOGINV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::LOGINV', 'argumentCount' => '3' ), 'LOGNORMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LOGNORMDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::LOGNORMDIST', 'argumentCount' => '3' ), 'LOOKUP' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::LOOKUP', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::LOOKUP', 'argumentCount' => '2,3' ), 'LOWER' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::LOWERCASE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::LOWERCASE', 'argumentCount' => '1' ), 'MATCH' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::MATCH', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::MATCH', 'argumentCount' => '2,3' ), 'MAX' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MAX', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::MAX', 'argumentCount' => '1+' ), 'MAXA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MAXA', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::MAXA', 'argumentCount' => '1+' ), 'MAXIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MAXIF', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::MAXIF', 'argumentCount' => '2+' ), 'MDETERM' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MDETERM', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::MDETERM', 'argumentCount' => '1' ), 'MDURATION' => array( @@ -1304,7 +1304,7 @@ class Calculation ), 'MEDIAN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MEDIAN', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::MEDIAN', 'argumentCount' => '1+' ), 'MEDIANIF' => array( @@ -1314,72 +1314,72 @@ class Calculation ), 'MID' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::MID', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::MID', 'argumentCount' => '3' ), 'MIDB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::MID', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::MID', 'argumentCount' => '3' ), 'MIN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MIN', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::MIN', 'argumentCount' => '1+' ), 'MINA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MINA', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::MINA', 'argumentCount' => '1+' ), 'MINIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MINIF', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::MINIF', 'argumentCount' => '2+' ), 'MINUTE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::MINUTEOFHOUR', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::MINUTEOFHOUR', 'argumentCount' => '1' ), 'MINVERSE' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MINVERSE', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::MINVERSE', 'argumentCount' => '1' ), 'MIRR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::MIRR', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::MIRR', 'argumentCount' => '3' ), 'MMULT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MMULT', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::MMULT', 'argumentCount' => '2' ), 'MOD' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MOD', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::MOD', 'argumentCount' => '2' ), 'MODE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MODE', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::MODE', 'argumentCount' => '1+' ), 'MONTH' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::MONTHOFYEAR', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::MONTHOFYEAR', 'argumentCount' => '1' ), 'MROUND' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MROUND', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::MROUND', 'argumentCount' => '2' ), 'MULTINOMIAL' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MULTINOMIAL', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::MULTINOMIAL', 'argumentCount' => '1+' ), 'N' => array( @@ -1394,77 +1394,77 @@ class Calculation ), 'NEGBINOMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NEGBINOMDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::NEGBINOMDIST', 'argumentCount' => '3' ), 'NETWORKDAYS' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::NETWORKDAYS', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::NETWORKDAYS', 'argumentCount' => '2+' ), 'NOMINAL' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::NOMINAL', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::NOMINAL', 'argumentCount' => '2' ), 'NORMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NORMDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::NORMDIST', 'argumentCount' => '4' ), 'NORMINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NORMINV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::NORMINV', 'argumentCount' => '3' ), 'NORMSDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NORMSDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::NORMSDIST', 'argumentCount' => '1' ), 'NORMSINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NORMSINV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::NORMSINV', 'argumentCount' => '1' ), 'NOT' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Logical::NOT', + 'functionCall' => '\\PHPExcel\\Calculation\\Logical::NOT', 'argumentCount' => '1' ), 'NOW' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATETIMENOW', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::DATETIMENOW', 'argumentCount' => '0' ), 'NPER' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::NPER', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::NPER', 'argumentCount' => '3-5' ), 'NPV' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::NPV', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::NPV', 'argumentCount' => '2+' ), 'OCT2BIN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::OCTTOBIN', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::OCTTOBIN', 'argumentCount' => '1,2' ), 'OCT2DEC' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::OCTTODEC', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::OCTTODEC', 'argumentCount' => '1' ), 'OCT2HEX' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => \\PHPExcel\\Calculation\\Engineering::OCTTOHEX', + 'functionCall' => '\\PHPExcel\\Calculation\\Engineering::OCTTOHEX', 'argumentCount' => '1,2' ), 'ODD' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ODD', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::ODD', 'argumentCount' => '1' ), 'ODDFPRICE' => array( @@ -1489,34 +1489,34 @@ class Calculation ), 'OFFSET' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::OFFSET', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::OFFSET', 'argumentCount' => '3,5', 'passCellReference' => true, 'passByReference' => array(true) ), 'OR' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Logical::LOGICAL_OR', + 'functionCall' => '\\PHPExcel\\Calculation\\Logical::LOGICAL_OR', 'argumentCount' => '1+' ), 'PEARSON' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CORREL', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::CORREL', 'argumentCount' => '2' ), 'PERCENTILE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::PERCENTILE', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::PERCENTILE', 'argumentCount' => '2' ), 'PERCENTRANK' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::PERCENTRANK', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::PERCENTRANK', 'argumentCount' => '2,3' ), 'PERMUT' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::PERMUT', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::PERMUT', 'argumentCount' => '2' ), 'PHONETIC' => array( @@ -1531,37 +1531,37 @@ class Calculation ), 'PMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::PMT', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::PMT', 'argumentCount' => '3-5' ), 'POISSON' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::POISSON', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::POISSON', 'argumentCount' => '3' ), 'POWER' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::POWER', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::POWER', 'argumentCount' => '2' ), 'PPMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::PPMT', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::PPMT', 'argumentCount' => '4-6' ), 'PRICE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::PRICE', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::PRICE', 'argumentCount' => '6,7' ), 'PRICEDISC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::PRICEDISC', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::PRICEDISC', 'argumentCount' => '4,5' ), 'PRICEMAT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::PRICEMAT', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::PRICEMAT', 'argumentCount' => '5,6' ), 'PROB' => array( @@ -1571,27 +1571,27 @@ class Calculation ), 'PRODUCT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::PRODUCT', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::PRODUCT', 'argumentCount' => '1+' ), 'PROPER' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::PROPERCASE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::PROPERCASE', 'argumentCount' => '1' ), 'PV' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::PV', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::PV', 'argumentCount' => '3-5' ), 'QUARTILE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::QUARTILE', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::QUARTILE', 'argumentCount' => '2' ), 'QUOTIENT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::QUOTIENT', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::QUOTIENT', 'argumentCount' => '2' ), 'RADIANS' => array( @@ -1601,37 +1601,37 @@ class Calculation ), 'RAND' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::RAND', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::RAND', 'argumentCount' => '0' ), 'RANDBETWEEN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::RAND', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::RAND', 'argumentCount' => '2' ), 'RANK' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::RANK', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::RANK', 'argumentCount' => '2,3' ), 'RATE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::RATE', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::RATE', 'argumentCount' => '3-6' ), 'RECEIVED' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::RECEIVED', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::RECEIVED', 'argumentCount' => '4-5' ), 'REPLACE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::REPLACE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::REPLACE', 'argumentCount' => '4' ), 'REPLACEB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::REPLACE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::REPLACE', 'argumentCount' => '4' ), 'REPT' => array( @@ -1641,17 +1641,17 @@ class Calculation ), 'RIGHT' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::RIGHT', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::RIGHT', 'argumentCount' => '1,2' ), 'RIGHTB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::RIGHT', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::RIGHT', 'argumentCount' => '1,2' ), 'ROMAN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ROMAN', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::ROMAN', 'argumentCount' => '1,2' ), 'ROUND' => array( @@ -1661,28 +1661,28 @@ class Calculation ), 'ROUNDDOWN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ROUNDDOWN', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::ROUNDDOWN', 'argumentCount' => '2' ), 'ROUNDUP' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ROUNDUP', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::ROUNDUP', 'argumentCount' => '2' ), 'ROW' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::ROW', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::ROW', 'argumentCount' => '-1', 'passByReference' => array(true) ), 'ROWS' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::ROWS', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::ROWS', 'argumentCount' => '1' ), 'RSQ' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::RSQ', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::RSQ', 'argumentCount' => '2' ), 'RTD' => array( @@ -1692,27 +1692,27 @@ class Calculation ), 'SEARCH' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::SEARCHINSENSITIVE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::SEARCHINSENSITIVE', 'argumentCount' => '2,3' ), 'SEARCHB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::SEARCHINSENSITIVE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::SEARCHINSENSITIVE', 'argumentCount' => '2,3' ), 'SECOND' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::SECONDOFMINUTE', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::SECONDOFMINUTE', 'argumentCount' => '1' ), 'SERIESSUM' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SERIESSUM', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SERIESSUM', 'argumentCount' => '4' ), 'SIGN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SIGN', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SIGN', 'argumentCount' => '1' ), 'SIN' => array( @@ -1727,22 +1727,22 @@ class Calculation ), 'SKEW' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::SKEW', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::SKEW', 'argumentCount' => '1+' ), 'SLN' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::SLN', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::SLN', 'argumentCount' => '3' ), 'SLOPE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::SLOPE', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::SLOPE', 'argumentCount' => '2' ), 'SMALL' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::SMALL', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::SMALL', 'argumentCount' => '2' ), 'SQRT' => array( @@ -1752,57 +1752,57 @@ class Calculation ), 'SQRTPI' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SQRTPI', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SQRTPI', 'argumentCount' => '1' ), 'STANDARDIZE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STANDARDIZE', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::STANDARDIZE', 'argumentCount' => '3' ), 'STDEV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STDEV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::STDEV', 'argumentCount' => '1+' ), 'STDEVA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STDEVA', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::STDEVA', 'argumentCount' => '1+' ), 'STDEVP' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STDEVP', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::STDEVP', 'argumentCount' => '1+' ), 'STDEVPA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STDEVPA', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::STDEVPA', 'argumentCount' => '1+' ), 'STEYX' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STEYX', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::STEYX', 'argumentCount' => '2' ), 'SUBSTITUTE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::SUBSTITUTE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::SUBSTITUTE', 'argumentCount' => '3,4' ), 'SUBTOTAL' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUBTOTAL', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SUBTOTAL', 'argumentCount' => '2+' ), 'SUM' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUM', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SUM', 'argumentCount' => '1+' ), 'SUMIF' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMIF', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SUMIF', 'argumentCount' => '2,3' ), 'SUMIFS' => array( @@ -1812,37 +1812,37 @@ class Calculation ), 'SUMPRODUCT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMPRODUCT', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SUMPRODUCT', 'argumentCount' => '1+' ), 'SUMSQ' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMSQ', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SUMSQ', 'argumentCount' => '1+' ), 'SUMX2MY2' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMX2MY2', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SUMX2MY2', 'argumentCount' => '2' ), 'SUMX2PY2' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMX2PY2', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SUMX2PY2', 'argumentCount' => '2' ), 'SUMXMY2' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMXMY2', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::SUMXMY2', 'argumentCount' => '2' ), 'SYD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::SYD', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::SYD', 'argumentCount' => '4' ), 'T' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::RETURNSTRING', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::RETURNSTRING', 'argumentCount' => '1' ), 'TAN' => array( @@ -1857,77 +1857,77 @@ class Calculation ), 'TBILLEQ' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::TBILLEQ', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::TBILLEQ', 'argumentCount' => '3' ), 'TBILLPRICE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::TBILLPRICE', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::TBILLPRICE', 'argumentCount' => '3' ), 'TBILLYIELD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::TBILLYIELD', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::TBILLYIELD', 'argumentCount' => '3' ), 'TDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::TDIST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::TDIST', 'argumentCount' => '3' ), 'TEXT' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::TEXTFORMAT', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::TEXTFORMAT', 'argumentCount' => '2' ), 'TIME' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::TIME', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::TIME', 'argumentCount' => '3' ), 'TIMEVALUE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::TIMEVALUE', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::TIMEVALUE', 'argumentCount' => '1' ), 'TINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::TINV', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::TINV', 'argumentCount' => '2' ), 'TODAY' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATENOW', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::DATENOW', 'argumentCount' => '0' ), 'TRANSPOSE' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::TRANSPOSE', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::TRANSPOSE', 'argumentCount' => '1' ), 'TREND' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::TREND', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::TREND', 'argumentCount' => '1-4' ), 'TRIM' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::TRIMSPACES', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::TRIMSPACES', 'argumentCount' => '1' ), 'TRIMMEAN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::TRIMMEAN', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::TRIMMEAN', 'argumentCount' => '2' ), 'TRUE' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Logical::TRUE', + 'functionCall' => '\\PHPExcel\\Calculation\\Logical::TRUE', 'argumentCount' => '0' ), 'TRUNC' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::TRUNC', + 'functionCall' => '\\PHPExcel\\Calculation\\MathTrig::TRUNC', 'argumentCount' => '1,2' ), 'TTEST' => array( @@ -1942,7 +1942,7 @@ class Calculation ), 'UPPER' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::UPPERCASE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::UPPERCASE', 'argumentCount' => '1' ), 'USDOLLAR' => array( @@ -1952,27 +1952,27 @@ class Calculation ), 'VALUE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => \\PHPExcel\\Calculation\\TextData::VALUE', + 'functionCall' => '\\PHPExcel\\Calculation\\TextData::VALUE', 'argumentCount' => '1' ), 'VAR' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::VARFunc', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::VARFunc', 'argumentCount' => '1+' ), 'VARA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::VARA', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::VARA', 'argumentCount' => '1+' ), 'VARP' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::VARP', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::VARP', 'argumentCount' => '1+' ), 'VARPA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::VARPA', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::VARPA', 'argumentCount' => '1+' ), 'VDB' => array( @@ -1987,47 +1987,47 @@ class Calculation ), 'VLOOKUP' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::VLOOKUP', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::VLOOKUP', 'argumentCount' => '3,4' ), 'WEEKDAY' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DAYOFWEEK', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::DAYOFWEEK', 'argumentCount' => '1,2' ), 'WEEKNUM' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::WEEKOFYEAR', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::WEEKOFYEAR', 'argumentCount' => '1,2' ), 'WEIBULL' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::WEIBULL', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::WEIBULL', 'argumentCount' => '4' ), 'WORKDAY' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::WORKDAY', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::WORKDAY', 'argumentCount' => '2+' ), 'XIRR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::XIRR', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::XIRR', 'argumentCount' => '2,3' ), 'XNPV' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::XNPV', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::XNPV', 'argumentCount' => '3' ), 'YEAR' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::YEAR', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::YEAR', 'argumentCount' => '1' ), 'YEARFRAC' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => \\PHPExcel\\Calculation\\DateTime::YEARFRAC', + 'functionCall' => '\\PHPExcel\\Calculation\\DateTime::YEARFRAC', 'argumentCount' => '2,3' ), 'YIELD' => array( @@ -2037,17 +2037,17 @@ class Calculation ), 'YIELDDISC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::YIELDDISC', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::YIELDDISC', 'argumentCount' => '4,5' ), 'YIELDMAT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => \\PHPExcel\\Calculation\\Financial::YIELDMAT', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::YIELDMAT', 'argumentCount' => '5,6' ), 'ZTEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => \\PHPExcel\\Calculation\\Statistical::ZTEST', + 'functionCall' => '\\PHPExcel\\Calculation\\Statistical::ZTEST', 'argumentCount' => '2-3' ) ); diff --git a/src/PhpSpreadsheet/Reader/Excel2007/Chart.php b/src/PhpSpreadsheet/Reader/Excel2007/Chart.php index 88f336b3..81c9b4b7 100644 --- a/src/PhpSpreadsheet/Reader/Excel2007/Chart.php +++ b/src/PhpSpreadsheet/Reader/Excel2007/Chart.php @@ -1,6 +1,9 @@ getARGB(); + return \PHPExcel\Style\Color::indexedColor($color["indexed"]-7, $background)->getARGB(); } } @@ -161,9 +156,9 @@ class PHPExcel_Reader_Excel2007_Chart } } if ($plotAreaLayout == null) { - $plotAreaLayout = new PHPExcel_Chart_Layout(); + $plotAreaLayout = new \PHPExcel\Chart\Layout(); } - $plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout, $plotSeries); + $plotArea = new \PHPExcel\Chart\PlotArea($plotAreaLayout, $plotSeries); self::setChartAttributes($plotAreaLayout, $plotAttributes); break; case "plotVisOnly": @@ -192,13 +187,13 @@ class PHPExcel_Reader_Excel2007_Chart break; } } - $legend = new PHPExcel_Chart_Legend($legendPos, $legendLayout, $legendOverlay); + $legend = new \PHPExcel\Chart\Legend($legendPos, $legendLayout, $legendOverlay); break; } } } } - $chart = new PHPExcel_Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, $dispBlanksAs, $XaxisLabel, $YaxisLabel); + $chart = new \PHPExcel\Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, $dispBlanksAs, $XaxisLabel, $YaxisLabel); return $chart; } @@ -225,7 +220,7 @@ class PHPExcel_Reader_Excel2007_Chart } } - return new PHPExcel_Chart_Title($caption, $titleLayout); + return new \PHPExcel\Chart\Title($caption, $titleLayout); } private static function chartLayoutDetails($chartDetail, $namespacesChartMeta) @@ -242,7 +237,7 @@ class PHPExcel_Reader_Excel2007_Chart // echo $detailKey, ' => ',self::getAttribute($detail, 'val', 'string'),PHP_EOL; $layout[$detailKey] = self::getAttribute($detail, 'val', 'string'); } - return new PHPExcel_Chart_Layout($layout); + return new \PHPExcel\Chart\Layout($layout); } private static function chartDataSeries($chartDetail, $namespacesChartMeta, $plotType) @@ -293,7 +288,7 @@ class PHPExcel_Reader_Excel2007_Chart } } } - return new PHPExcel_Chart_DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine); + return new \PHPExcel\Chart\DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine); } @@ -303,24 +298,24 @@ class PHPExcel_Reader_Excel2007_Chart $seriesSource = (string) $seriesDetail->strRef->f; $seriesData = self::chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']), 's'); - return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine); + return new \PHPExcel\Chart\DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine); } elseif (isset($seriesDetail->numRef)) { $seriesSource = (string) $seriesDetail->numRef->f; $seriesData = self::chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c'])); - return new PHPExcel_Chart_DataSeriesValues('Number', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine); + return new \PHPExcel\Chart\DataSeriesValues('Number', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine); } elseif (isset($seriesDetail->multiLvlStrRef)) { $seriesSource = (string) $seriesDetail->multiLvlStrRef->f; $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']), 's'); $seriesData['pointCount'] = count($seriesData['dataValues']); - return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine); + return new \PHPExcel\Chart\DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine); } elseif (isset($seriesDetail->multiLvlNumRef)) { $seriesSource = (string) $seriesDetail->multiLvlNumRef->f; $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']), 's'); $seriesData['pointCount'] = count($seriesData['dataValues']); - return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine); + return new \PHPExcel\Chart\DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine); } return null; } @@ -398,7 +393,7 @@ class PHPExcel_Reader_Excel2007_Chart private static function parseRichText($titleDetailPart = null) { - $value = new PHPExcel_RichText(); + $value = new \PHPExcel\RichText(); foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) { if (isset($titleDetailElement->t)) { @@ -416,7 +411,7 @@ class PHPExcel_Reader_Excel2007_Chart $fontColor = (self::getAttribute($titleDetailElement->rPr, 'color', 'string')); if (!is_null($fontColor)) { - $objText->getFont()->setColor(new PHPExcel_Style_Color(self::readColor($fontColor))); + $objText->getFont()->setColor(new \PHPExcel\Style\Color(self::readColor($fontColor))); } $bold = self::getAttribute($titleDetailElement->rPr, 'b', 'boolean'); @@ -441,11 +436,11 @@ class PHPExcel_Reader_Excel2007_Chart $underscore = (self::getAttribute($titleDetailElement->rPr, 'u', 'string')); if (!is_null($underscore)) { if ($underscore == 'sng') { - $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE); + $objText->getFont()->setUnderline(\PHPExcel\Style\Font::UNDERLINE_SINGLE); } elseif ($underscore == 'dbl') { - $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE); + $objText->getFont()->setUnderline(\PHPExcel\Style\Font::UNDERLINE_DOUBLE); } else { - $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE); + $objText->getFont()->setUnderline(\PHPExcel\Style\Font::UNDERLINE_NONE); } } diff --git a/src/PhpSpreadsheet/Reader/Excel2007/Theme.php b/src/PhpSpreadsheet/Reader/Excel2007/Theme.php index 134f4b60..1918905b 100644 --- a/src/PhpSpreadsheet/Reader/Excel2007/Theme.php +++ b/src/PhpSpreadsheet/Reader/Excel2007/Theme.php @@ -1,6 +1,9 @@ pos < $this->dataSize) { // offset: 2; size: 2: Record Type - $fbt = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos + 2); + $fbt = \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos + 2); switch ($fbt) { case self::DGGCONTAINER: @@ -173,15 +175,15 @@ class PHPExcel_Reader_Excel5_Escher private function readDefault() { // offset 0; size: 2; recVer and recInstance - $verInstance = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos); + $verInstance = \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos); // offset: 2; size: 2: Record Type - $fbt = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos + 2); + $fbt = \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos + 2); // bit: 0-3; mask: 0x000F; recVer $recVer = (0x000F & $verInstance) >> 0; - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -193,16 +195,16 @@ class PHPExcel_Reader_Excel5_Escher */ private function readDggContainer() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record $this->pos += 8 + $length; // record is a container, read contents - $dggContainer = new PHPExcel_Shared_Escher_DggContainer(); + $dggContainer = new \PHPExcel\Shared\Escher\DggContainer(); $this->object->setDggContainer($dggContainer); - $reader = new PHPExcel_Reader_Excel5_Escher($dggContainer); + $reader = new Escher($dggContainer); $reader->load($recordData); } @@ -211,7 +213,7 @@ class PHPExcel_Reader_Excel5_Escher */ private function readDgg() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -223,16 +225,16 @@ class PHPExcel_Reader_Excel5_Escher */ private function readBstoreContainer() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record $this->pos += 8 + $length; // record is a container, read contents - $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer(); + $bstoreContainer = new \PHPExcel\Shared\Escher\DggContainer\BstoreContainer(); $this->object->setBstoreContainer($bstoreContainer); - $reader = new PHPExcel_Reader_Excel5_Escher($bstoreContainer); + $reader = new Escher($bstoreContainer); $reader->load($recordData); } @@ -244,16 +246,16 @@ class PHPExcel_Reader_Excel5_Escher // offset: 0; size: 2; recVer and recInstance // bit: 4-15; mask: 0xFFF0; recInstance - $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4; + $recInstance = (0xFFF0 & \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos)) >> 4; - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record $this->pos += 8 + $length; // add BSE to BstoreContainer - $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE(); + $BSE = new \PHPExcel\Shared\Escher\DggContainer\BstoreContainer\BSE(); $this->object->addBSE($BSE); $BSE->setBLIPType($recInstance); @@ -268,16 +270,16 @@ class PHPExcel_Reader_Excel5_Escher $rgbUid = substr($recordData, 2, 16); // offset: 18; size: 2; tag - $tag = PHPExcel_Reader_Excel5::getInt2d($recordData, 18); + $tag = \PHPExcel\Reader\Excel5::getInt2d($recordData, 18); // offset: 20; size: 4; size of BLIP in bytes - $size = PHPExcel_Reader_Excel5::getInt4d($recordData, 20); + $size = \PHPExcel\Reader\Excel5::getInt4d($recordData, 20); // offset: 24; size: 4; number of references to this BLIP - $cRef = PHPExcel_Reader_Excel5::getInt4d($recordData, 24); + $cRef = \PHPExcel\Reader\Excel5::getInt4d($recordData, 24); // offset: 28; size: 4; MSOFO file offset - $foDelay = PHPExcel_Reader_Excel5::getInt4d($recordData, 28); + $foDelay = \PHPExcel\Reader\Excel5::getInt4d($recordData, 28); // offset: 32; size: 1; unused1 $unused1 = ord($recordData{32}); @@ -298,7 +300,7 @@ class PHPExcel_Reader_Excel5_Escher $blipData = substr($recordData, 36 + $cbName); // record is a container, read contents - $reader = new PHPExcel_Reader_Excel5_Escher($BSE); + $reader = new \PHPExcel\Reader\Excel5_Escher($BSE); $reader->load($blipData); } @@ -310,9 +312,9 @@ class PHPExcel_Reader_Excel5_Escher // offset: 0; size: 2; recVer and recInstance // bit: 4-15; mask: 0xFFF0; recInstance - $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4; + $recInstance = (0xFFF0 & \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos)) >> 4; - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -337,7 +339,7 @@ class PHPExcel_Reader_Excel5_Escher // offset: var; size: var; the raw image data $data = substr($recordData, $pos); - $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); + $blip = new \PHPExcel\Shared\Escher\DggContainer\BstoreContainer\BSE\Blip(); $blip->setData($data); $this->object->setBlip($blip); @@ -351,9 +353,9 @@ class PHPExcel_Reader_Excel5_Escher // offset: 0; size: 2; recVer and recInstance // bit: 4-15; mask: 0xFFF0; recInstance - $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4; + $recInstance = (0xFFF0 & \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos)) >> 4; - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -378,7 +380,7 @@ class PHPExcel_Reader_Excel5_Escher // offset: var; size: var; the raw image data $data = substr($recordData, $pos); - $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip(); + $blip = new \PHPExcel\Shared\Escher\DggContainer\BstoreContainer\BSE\Blip(); $blip->setData($data); $this->object->setBlip($blip); @@ -392,9 +394,9 @@ class PHPExcel_Reader_Excel5_Escher // offset: 0; size: 2; recVer and recInstance // bit: 4-15; mask: 0xFFF0; recInstance - $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4; + $recInstance = (0xFFF0 & \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos)) >> 4; - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -411,9 +413,9 @@ class PHPExcel_Reader_Excel5_Escher // offset: 0; size: 2; recVer and recInstance // bit: 4-15; mask: 0xFFF0; recInstance - $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4; + $recInstance = (0xFFF0 & \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos)) >> 4; - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -425,7 +427,7 @@ class PHPExcel_Reader_Excel5_Escher */ private function readSplitMenuColors() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -437,16 +439,16 @@ class PHPExcel_Reader_Excel5_Escher */ private function readDgContainer() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record $this->pos += 8 + $length; // record is a container, read contents - $dgContainer = new PHPExcel_Shared_Escher_DgContainer(); + $dgContainer = new \PHPExcel\Shared_Escher\DgContainer(); $this->object->setDgContainer($dgContainer); - $reader = new PHPExcel_Reader_Excel5_Escher($dgContainer); + $reader = new \PHPExcel\Reader\Excel5\Escher($dgContainer); $escher = $reader->load($recordData); } @@ -455,7 +457,7 @@ class PHPExcel_Reader_Excel5_Escher */ private function readDg() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -469,16 +471,16 @@ class PHPExcel_Reader_Excel5_Escher { // context is either context DgContainer or SpgrContainer - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record $this->pos += 8 + $length; // record is a container, read contents - $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer(); + $spgrContainer = new \PHPExcel\Shared\Escher\DgContainer\SpgrContainer(); - if ($this->object instanceof PHPExcel_Shared_Escher_DgContainer) { + if ($this->object instanceof \PHPExcel\Shared\Escher\DgContainer) { // DgContainer $this->object->setSpgrContainer($spgrContainer); } else { @@ -486,7 +488,7 @@ class PHPExcel_Reader_Excel5_Escher $this->object->addChild($spgrContainer); } - $reader = new PHPExcel_Reader_Excel5_Escher($spgrContainer); + $reader = new Escher($spgrContainer); $escher = $reader->load($recordData); } @@ -495,18 +497,18 @@ class PHPExcel_Reader_Excel5_Escher */ private function readSpContainer() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // add spContainer to spgrContainer - $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer(); + $spContainer = new \PHPExcel\Shared\Escher\DgContainer\SpgrContainer\SpContainer(); $this->object->addChild($spContainer); // move stream pointer to next record $this->pos += 8 + $length; // record is a container, read contents - $reader = new PHPExcel_Reader_Excel5_Escher($spContainer); + $reader = new Escher($spContainer); $escher = $reader->load($recordData); } @@ -515,7 +517,7 @@ class PHPExcel_Reader_Excel5_Escher */ private function readSpgr() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -530,9 +532,9 @@ class PHPExcel_Reader_Excel5_Escher // offset: 0; size: 2; recVer and recInstance // bit: 4-15; mask: 0xFFF0; recInstance - $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4; + $recInstance = (0xFFF0 & \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos)) >> 4; - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -547,9 +549,9 @@ class PHPExcel_Reader_Excel5_Escher // offset: 0; size: 2; recVer and recInstance // bit: 4-15; mask: 0xFFF0; recInstance - $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4; + $recInstance = (0xFFF0 & \PHPExcel\Reader\Excel5::getInt2d($this->data, $this->pos)) >> 4; - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -561,38 +563,38 @@ class PHPExcel_Reader_Excel5_Escher */ private function readClientAnchor() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record $this->pos += 8 + $length; // offset: 2; size: 2; upper-left corner column index (0-based) - $c1 = PHPExcel_Reader_Excel5::getInt2d($recordData, 2); + $c1 = \PHPExcel\Reader\Excel5::getInt2d($recordData, 2); // offset: 4; size: 2; upper-left corner horizontal offset in 1/1024 of column width - $startOffsetX = PHPExcel_Reader_Excel5::getInt2d($recordData, 4); + $startOffsetX = \PHPExcel\Reader\Excel5::getInt2d($recordData, 4); // offset: 6; size: 2; upper-left corner row index (0-based) - $r1 = PHPExcel_Reader_Excel5::getInt2d($recordData, 6); + $r1 = \PHPExcel\Reader\Excel5::getInt2d($recordData, 6); // offset: 8; size: 2; upper-left corner vertical offset in 1/256 of row height - $startOffsetY = PHPExcel_Reader_Excel5::getInt2d($recordData, 8); + $startOffsetY = \PHPExcel\Reader\Excel5::getInt2d($recordData, 8); // offset: 10; size: 2; bottom-right corner column index (0-based) - $c2 = PHPExcel_Reader_Excel5::getInt2d($recordData, 10); + $c2 = \PHPExcel\Reader\Excel5::getInt2d($recordData, 10); // offset: 12; size: 2; bottom-right corner horizontal offset in 1/1024 of column width - $endOffsetX = PHPExcel_Reader_Excel5::getInt2d($recordData, 12); + $endOffsetX = \PHPExcel\Reader\Excel5::getInt2d($recordData, 12); // offset: 14; size: 2; bottom-right corner row index (0-based) - $r2 = PHPExcel_Reader_Excel5::getInt2d($recordData, 14); + $r2 = \PHPExcel\Reader\Excel5::getInt2d($recordData, 14); // offset: 16; size: 2; bottom-right corner vertical offset in 1/256 of row height - $endOffsetY = PHPExcel_Reader_Excel5::getInt2d($recordData, 16); + $endOffsetY = \PHPExcel\Reader\Excel5::getInt2d($recordData, 16); // set the start coordinates - $this->object->setStartCoordinates(PHPExcel_Cell::stringFromColumnIndex($c1) . ($r1 + 1)); + $this->object->setStartCoordinates(\PHPExcel\Cell::stringFromColumnIndex($c1) . ($r1 + 1)); // set the start offsetX $this->object->setStartOffsetX($startOffsetX); @@ -601,7 +603,7 @@ class PHPExcel_Reader_Excel5_Escher $this->object->setStartOffsetY($startOffsetY); // set the end coordinates - $this->object->setEndCoordinates(PHPExcel_Cell::stringFromColumnIndex($c2) . ($r2 + 1)); + $this->object->setEndCoordinates(\PHPExcel\Cell::stringFromColumnIndex($c2) . ($r2 + 1)); // set the end offsetX $this->object->setEndOffsetX($endOffsetX); @@ -615,7 +617,7 @@ class PHPExcel_Reader_Excel5_Escher */ private function readClientData() { - $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4); + $length = \PHPExcel\Reader\Excel5::getInt4d($this->data, $this->pos + 4); $recordData = substr($this->data, $this->pos + 8, $length); // move stream pointer to next record @@ -638,7 +640,7 @@ class PHPExcel_Reader_Excel5_Escher $fopte = substr($data, 6 * $i, 6); // offset: 0; size: 2; opid - $opid = PHPExcel_Reader_Excel5::getInt2d($fopte, 0); + $opid = \PHPExcel\Reader\Excel5::getInt2d($fopte, 0); // bit: 0-13; mask: 0x3FFF; opid.opid $opidOpid = (0x3FFF & $opid) >> 0; @@ -650,7 +652,7 @@ class PHPExcel_Reader_Excel5_Escher $opidFComplex = (0x8000 & $opid) >> 15; // offset: 2; size: 4; the value for this property - $op = PHPExcel_Reader_Excel5::getInt4d($fopte, 2); + $op = \PHPExcel\Reader\Excel5::getInt4d($fopte, 2); if ($opidFComplex) { $complexData = substr($splicedComplexData, 0, $op); diff --git a/src/PhpSpreadsheet/Reader/Excel5/MD5.php b/src/PhpSpreadsheet/Reader/Excel5/MD5.php index f14ea946..b1d87f88 100644 --- a/src/PhpSpreadsheet/Reader/Excel5/MD5.php +++ b/src/PhpSpreadsheet/Reader/Excel5/MD5.php @@ -1,5 +1,7 @@ c; $D = $this->d; - $F = array('PHPExcel_Reader_Excel5_MD5','f'); - $G = array('PHPExcel_Reader_Excel5_MD5','g'); - $H = array('PHPExcel_Reader_Excel5_MD5','h'); - $I = array('PHPExcel_Reader_Excel5_MD5','i'); + $F = ['self','f']; + $G = ['self','g']; + $H = ['self','h']; + $I = ['self','i']; /* ROUND 1 */ self::step($F, $A, $B, $C, $D, $words[0], 7, 0xd76aa478); diff --git a/src/PhpSpreadsheet/Shared/OLE.php b/src/PhpSpreadsheet/Shared/OLE.php index fa391b64..ceb92e2e 100644 --- a/src/PhpSpreadsheet/Shared/OLE.php +++ b/src/PhpSpreadsheet/Shared/OLE.php @@ -214,7 +214,7 @@ class OLE $path = 'ole-chainedblockstream://oleInstanceId=' . $instanceId; if ($blockIdOrPps instanceof OLE\PPS) { - $path .= '&blockId=' . $blockIdOrPps->_StartBlock; + $path .= '&blockId=' . $blockIdOrPps->startBlock; $path .= '&size=' . $blockIdOrPps->Size; } else { $path .= '&blockId=' . $blockIdOrPps; @@ -300,7 +300,7 @@ class OLE fseek($fh, 20, SEEK_CUR); $pps->Time1st = self::OLE2LocalDate(fread($fh, 8)); $pps->Time2nd = self::OLE2LocalDate(fread($fh, 8)); - $pps->_StartBlock = self::_readInt4($fh); + $pps->startBlock = self::_readInt4($fh); $pps->Size = self::_readInt4($fh); $pps->No = count($this->_list); $this->_list[] = $pps; diff --git a/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php b/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php index e3fc5249..32946d98 100644 --- a/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php +++ b/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php @@ -85,9 +85,9 @@ class ChainedBlockStream $blockId = $this->params['blockId']; $this->data = ''; - if (isset($this->params['size']) && $this->params['size'] < $this->ole->bigBlockThreshold && $blockId != $this->ole->root->_StartBlock) { + if (isset($this->params['size']) && $this->params['size'] < $this->ole->bigBlockThreshold && $blockId != $this->ole->root->startBlock) { // Block id refers to small blocks - $rootPos = $this->ole->_getBlockOffset($this->ole->root->_StartBlock); + $rootPos = $this->ole->_getBlockOffset($this->ole->root->startBlock); while ($blockId != -2) { $pos = $rootPos + $blockId * $this->ole->bigBlockSize; $blockId = $this->ole->sbat[$blockId]; diff --git a/src/PhpSpreadsheet/Shared/OLE/PPS.php b/src/PhpSpreadsheet/Shared/OLE/PPS.php index 7334f9fe..7f506d4d 100644 --- a/src/PhpSpreadsheet/Shared/OLE/PPS.php +++ b/src/PhpSpreadsheet/Shared/OLE/PPS.php @@ -84,7 +84,7 @@ class PPS * Starting block (small or big) for this PPS's data inside the container * @var integer */ - public $_StartBlock; + public $startBlock; /** * The size of the PPS's data (in bytes) @@ -185,10 +185,9 @@ class PPS . "\xc0\x00\x00\x00" // 92 . "\x00\x00\x00\x46" // 96 // Seems to be ok only for Root . "\x00\x00\x00\x00" // 100 - . \PHPExcel\Shared\OLE::LocalDate2OLE($this->Time1st) // 108 - . \PHPExcel\Shared\OLE::LocalDate2OLE($this->Time2nd) // 116 - . pack("V", isset($this->_StartBlock)? - $this->_StartBlock:0) // 120 + . \PHPExcel\Shared\OLE::LocalDate2OLE($this->Time1st) // 108 + . \PHPExcel\Shared\OLE::LocalDate2OLE($this->Time2nd) // 116 + . pack("V", isset($this->startBlock) ? $this->startBlock : 0) // 120 . pack("V", $this->Size) // 124 . pack("V", 0); // 128 return $ret; diff --git a/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php b/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php index 26261b59..28bcdf20 100644 --- a/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php +++ b/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php @@ -282,7 +282,7 @@ class Root extends \PHPExcel\Shared\OLE\PPS fwrite($FILE, str_repeat("\x00", $this->_BIG_BLOCK_SIZE - ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE))); } // Set For PPS - $raList[$i]->_StartBlock = $iStBlk; + $raList[$i]->startBlock = $iStBlk; $iStBlk += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) + (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0)); @@ -339,7 +339,7 @@ class Root extends \PHPExcel\Shared\OLE\PPS $sRes .= str_repeat("\x00", $this->_SMALL_BLOCK_SIZE - ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)); } // Set for PPS - $raList[$i]->_StartBlock = $iSmBlk; + $raList[$i]->startBlock = $iSmBlk; $iSmBlk += $iSmbCnt; } } diff --git a/src/PhpSpreadsheet/Writer/Abstract.php b/src/PhpSpreadsheet/Writer/Abstract.php deleted file mode 100644 index 2a797a94..00000000 --- a/src/PhpSpreadsheet/Writer/Abstract.php +++ /dev/null @@ -1,157 +0,0 @@ -includeCharts; - } - - /** - * Set write charts in workbook - * Set to true, to advise the Writer to include any charts that exist in the PHPExcel object. - * Set to false (the default) to ignore charts. - * - * @param boolean $pValue - * @return PHPExcel_Writer_IWriter - */ - public function setIncludeCharts($pValue = false) - { - $this->includeCharts = (boolean) $pValue; - return $this; - } - - /** - * Get Pre-Calculate Formulas flag - * If this is true (the default), then the writer will recalculate all formulae in a workbook when saving, - * so that the pre-calculated values are immediately available to MS Excel or other office spreadsheet - * viewer when opening the file - * If false, then formulae are not calculated on save. This is faster for saving in PHPExcel, but slower - * when opening the resulting file in MS Excel, because Excel has to recalculate the formulae itself - * - * @return boolean - */ - public function getPreCalculateFormulas() - { - return $this->preCalculateFormulas; - } - - /** - * Set Pre-Calculate Formulas - * Set to true (the default) to advise the Writer to calculate all formulae on save - * Set to false to prevent precalculation of formulae on save. - * - * @param boolean $pValue Pre-Calculate Formulas? - * @return PHPExcel_Writer_IWriter - */ - public function setPreCalculateFormulas($pValue = true) - { - $this->preCalculateFormulas = (boolean) $pValue; - return $this; - } - - /** - * Get use disk caching where possible? - * - * @return boolean - */ - public function getUseDiskCaching() - { - return $this->_useDiskCaching; - } - - /** - * Set use disk caching where possible? - * - * @param boolean $pValue - * @param string $pDirectory Disk caching directory - * @throws PHPExcel_Writer_Exception when directory does not exist - * @return PHPExcel_Writer_Excel2007 - */ - public function setUseDiskCaching($pValue = false, $pDirectory = null) - { - $this->_useDiskCaching = $pValue; - - if ($pDirectory !== null) { - if (is_dir($pDirectory)) { - $this->_diskCachingDirectory = $pDirectory; - } else { - throw new PHPExcel_Writer_Exception("Directory does not exist: $pDirectory"); - } - } - return $this; - } - - /** - * Get disk caching directory - * - * @return string - */ - public function getDiskCachingDirectory() - { - return $this->_diskCachingDirectory; - } -} diff --git a/src/PhpSpreadsheet/Writer/CSV.php b/src/PhpSpreadsheet/Writer/CSV.php index 31ca874b..e4dad06c 100644 --- a/src/PhpSpreadsheet/Writer/CSV.php +++ b/src/PhpSpreadsheet/Writer/CSV.php @@ -1,5 +1,7 @@ phpExcel = $phpExcel; + $this->phpExcel = $phpExcel; } /** * Save PHPExcel to file * * @param string $pFilename - * @throws PHPExcel_Writer_Exception + * @throws Exception */ public function save($pFilename = null) { // Fetch sheet $sheet = $this->phpExcel->getSheet($this->sheetIndex); - $saveDebugLog = PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->getWriteDebugLog(); - PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog(false); - $saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType(); - PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE); + $saveDebugLog = \PHPExcel\Calculation::getInstance($this->phpExcel)->getDebugLog()->getWriteDebugLog(); + \PHPExcel\Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog(false); + $saveArrayReturnType = \PHPExcel\Calculation::getArrayReturnType(); + \PHPExcel\Calculation::setArrayReturnType(\PHPExcel\Calculation::RETURN_ARRAY_AS_VALUE); // Open file $fileHandle = fopen($pFilename, 'wb+'); if ($fileHandle === false) { - throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing."); + throw new Exception("Could not open file $pFilename for writing."); } if ($this->excelCompatibility) { @@ -134,8 +136,8 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W // Close file fclose($fileHandle); - PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType); - PHPExcel_Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog); + \PHPExcel\Calculation::setArrayReturnType($saveArrayReturnType); + \PHPExcel\Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog); } /** @@ -152,7 +154,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W * Set delimiter * * @param string $pValue Delimiter, defaults to , - * @return PHPExcel_Writer_CSV + * @return CSV */ public function setDelimiter($pValue = ',') { @@ -174,7 +176,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W * Set enclosure * * @param string $pValue Enclosure, defaults to " - * @return PHPExcel_Writer_CSV + * @return CSV */ public function setEnclosure($pValue = '"') { @@ -199,7 +201,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W * Set line ending * * @param string $pValue Line ending, defaults to OS line ending (PHP_EOL) - * @return PHPExcel_Writer_CSV + * @return CSV */ public function setLineEnding($pValue = PHP_EOL) { @@ -221,7 +223,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W * Set whether BOM should be used * * @param boolean $pValue Use UTF-8 byte-order mark? Defaults to false - * @return PHPExcel_Writer_CSV + * @return CSV */ public function setUseBOM($pValue = false) { @@ -244,7 +246,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W * * @param boolean $pValue Set the file to be written as a fully Excel compatible csv file * Note that this overrides other settings such as useBOM, enclosure and delimiter - * @return PHPExcel_Writer_CSV + * @return CSV */ public function setExcelCompatibility($pValue = false) { @@ -266,7 +268,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W * Set sheet index * * @param int $pValue Sheet index - * @return PHPExcel_Writer_CSV + * @return CSV */ public function setSheetIndex($pValue = 0) { @@ -279,7 +281,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W * * @param mixed $pFileHandle PHP filehandle * @param array $pValues Array containing values in a row - * @throws PHPExcel_Writer_Exception + * @throws Exception */ private function writeLine($pFileHandle = null, $pValues = null) { @@ -311,7 +313,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W // Write to file fwrite($pFileHandle, $line); } else { - throw new PHPExcel_Writer_Exception("Invalid data row passed to CSV writer."); + throw new Exception("Invalid data row passed to CSV writer."); } } } diff --git a/src/PhpSpreadsheet/Writer/Exception.php b/src/PhpSpreadsheet/Writer/Exception.php index bfa00568..a708ea18 100644 --- a/src/PhpSpreadsheet/Writer/Exception.php +++ b/src/PhpSpreadsheet/Writer/Exception.php @@ -1,5 +1,7 @@ renderer = new $rendererName($phpExcel); } @@ -73,7 +75,7 @@ class PHPExcel_Writer_PDF implements PHPExcel_Writer_IWriter public function __call($name, $arguments) { if ($this->renderer === null) { - throw new PHPExcel_Writer_Exception("PDF Rendering library has not been defined."); + throw new Exception("PDF Rendering library has not been defined."); } return call_user_func_array(array($this->renderer, $name), $arguments);