Merge pull request macellan#3 from mortenscheel/patch-1

Fix typo and array access

Author: faytekin

Classes/PHPExcel/Calculation.php

@@ -3212,7 +3212,7 @@ private function _parseFormula($formula, PHPExcel_Cell $pCell = null)
                     }
                 }
                 $d = $stack->last(2);
-                if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
+                if (is_array($d) && preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
                     $functionName = $matches[1];                                        //    Get the function name
 //echo 'Closed Function is '.$functionName, PHP_EOL;
                     $d = $stack->pop();

Classes/PHPExcel/Writer/Excel2007/Worksheet.php

@@ -768,7 +768,7 @@ private function writeAutoFilter(PHPExcel_Shared_XMLWriter $objWriter = null, PH
             $objWriter->writeAttribute('ref', str_replace('$', '', $range));
 
             $columns = $pSheet->getAutoFilter()->getColumns();
-            if (count($columns > 0)) {
+            if (count($columns) > 0) {
                 foreach ($columns as $columnID => $column) {
                     $rules = $column->getRules();
                     if (count($rules) > 0) {
@@ -1114,7 +1114,7 @@ private function writeCell(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel
                         break;
                     case 'f':            // Formula
                         $attributes = $pCell->getFormulaAttributes();
-                        if ($attributes['t'] == 'array') {
+                        if (is_array($attributes) && $attributes['t'] == 'array') {
                             $objWriter->startElement('f');
                             $objWriter->writeAttribute('t', 'array');
                             $objWriter->writeAttribute('ref', $pCellAddress);