From f92cd96d6d3d84aac66784c81738999d94b1031d Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Thu, 20 Jun 2013 09:44:11 +0100 Subject: [PATCH] namespace updates --- Classes/PHPExcel/Worksheet.php | 2 +- Classes/PHPExcel/Worksheet/Protection.php | 4 ++-- Examples/07reader.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Classes/PHPExcel/Worksheet.php b/Classes/PHPExcel/Worksheet.php index 20c43f0..74608cf 100644 --- a/Classes/PHPExcel/Worksheet.php +++ b/Classes/PHPExcel/Worksheet.php @@ -2243,7 +2243,7 @@ class Worksheet implements IComparable */ public function getCommentByColumnAndRow($pColumn = 0, $pRow = 1) { - return $this->getComment(PHPExcel\Cell::stringFromColumnIndex($pColumn) . $pRow); + return $this->getComment(Cell::stringFromColumnIndex($pColumn) . $pRow); } /** diff --git a/Classes/PHPExcel/Worksheet/Protection.php b/Classes/PHPExcel/Worksheet/Protection.php index 891af2c..394ef83 100644 --- a/Classes/PHPExcel/Worksheet/Protection.php +++ b/Classes/PHPExcel/Worksheet/Protection.php @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * @category PHPExcel - * @package PHPExcel_Worksheet + * @package PHPExcel\Worksheet * @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel) * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @version ##VERSION##, ##DATE## @@ -29,7 +29,7 @@ namespace PHPExcel; /** - * PHPExcel_Worksheet_Protection + * PHPExcel\Worksheet_Protection * * @category PHPExcel * @package PHPExcel\Worksheet diff --git a/Examples/07reader.php b/Examples/07reader.php index 93456ce..345ba4c 100644 --- a/Examples/07reader.php +++ b/Examples/07reader.php @@ -33,8 +33,8 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); -/** Include PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +/** Include PHPExcel Bootstrap */ +require_once '../Classes/Bootstrap.php'; if (!file_exists("05featuredemo.xlsx")) { @@ -44,7 +44,7 @@ if (!file_exists("05featuredemo.xlsx")) { echo date('H:i:s') , " Load from Excel2007 file" , EOL; $callStartTime = microtime(true); -$objPHPExcel = PHPExcel_IOFactory::load("05featuredemo.xlsx"); +$objPHPExcel = PHPExcel\IOFactory::load("05featuredemo.xlsx"); $callEndTime = microtime(true); $callTime = $callEndTime - $callStartTime; @@ -56,7 +56,7 @@ echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 echo date('H:i:s') , " Write to Excel2007 format" , EOL; $callStartTime = microtime(true); -$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007'); +$objWriter = PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007'); $objWriter->save(str_replace('.php', '.xlsx', __FILE__)); $callEndTime = microtime(true);