* @category PHPExcel
-* @package PHPExcel_Shared_OLE
+* @package PHPExcel\Shared_OLE
*/
-class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
+class Shared_OLE_PPS_Root extends Shared_OLE_PPS
{
/**
@@ -42,12 +44,12 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
*/
public function __construct($time_1st, $time_2nd, $raChild)
{
- $this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
+ $this->_tempDir = Shared_File::sys_get_temp_dir();
parent::__construct(
null,
- PHPExcel_Shared_OLE::Asc2Ucs('Root Entry'),
- PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT,
+ Shared_OLE::Asc2Ucs('Root Entry'),
+ Shared_OLE::OLE_PPS_TYPE_ROOT,
null,
null,
null,
@@ -80,21 +82,21 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
$this->_FILEH_ = $filename;
} else if ($filename == '-' || $filename == '') {
if ($this->_tmp_dir === NULL)
- $this->_tmp_dir = PHPExcel_Shared_File::sys_get_temp_dir();
+ $this->_tmp_dir = Shared_File::sys_get_temp_dir();
$this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
$this->_FILEH_ = fopen($this->_tmp_filename,"w+b");
if ($this->_FILEH_ == false) {
- throw new PHPExcel_Writer_Exception("Can't create temporary file.");
+ throw new Writer_Exception("Can't create temporary file.");
}
} else {
$this->_FILEH_ = fopen($filename, "wb");
}
if ($this->_FILEH_ == false) {
- throw new PHPExcel_Writer_Exception("Can't open $filename. It may be in use or protected.");
+ throw new Writer_Exception("Can't open $filename. It may be in use or protected.");
}
// Make an array of PPS's (for Save)
$aList = array();
- PHPExcel_Shared_OLE_PPS::_savePpsSetPnt($aList, array($this));
+ Shared_OLE_PPS::_savePpsSetPnt($aList, array($this));
// calculate values for header
list($iSBDcnt, $iBBcnt, $iPPScnt) = $this->_calcSize($aList); //, $rhInfo);
// Save Header
@@ -132,9 +134,9 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
$iSBcnt = 0;
$iCount = count($raList);
for ($i = 0; $i < $iCount; ++$i) {
- if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) {
+ if ($raList[$i]->Type == Shared_OLE::OLE_PPS_TYPE_FILE) {
$raList[$i]->Size = $raList[$i]->_DataLen();
- if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) {
+ if ($raList[$i]->Size < Shared_OLE::OLE_DATA_SIZE_SMALL) {
$iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
+ (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
} else {
@@ -144,12 +146,12 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
}
}
$iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE;
- $iSlCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE);
+ $iSlCnt = floor($this->_BIG_BLOCK_SIZE / Shared_OLE::OLE_LONG_INT_SIZE);
$iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0);
$iBBcnt += (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
(( $iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0));
$iCnt = count($raList);
- $iBdCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE;
+ $iBdCnt = $this->_BIG_BLOCK_SIZE / Shared_OLE::OLE_PPS_SIZE;
$iPPScnt = (floor($iCnt/$iBdCnt) + (($iCnt % $iBdCnt)? 1: 0));
return array($iSBDcnt, $iBBcnt, $iPPScnt);
@@ -182,8 +184,8 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
$FILE = $this->_FILEH_;
// Calculate Basic Setting
- $iBlCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
- $i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
+ $iBlCnt = $this->_BIG_BLOCK_SIZE / Shared_OLE::OLE_LONG_INT_SIZE;
+ $i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / Shared_OLE::OLE_LONG_INT_SIZE;
$iBdExL = 0;
$iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
@@ -249,7 +251,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
}
/**
- * Saving big data (PPS's with data bigger than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL)
+ * Saving big data (PPS's with data bigger than PHPExcel\Shared_OLE::OLE_DATA_SIZE_SMALL)
*
* @access public
* @param integer $iStBlk
@@ -262,10 +264,10 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
// cycle through PPS's
$iCount = count($raList);
for ($i = 0; $i < $iCount; ++$i) {
- if ($raList[$i]->Type != PHPExcel_Shared_OLE::OLE_PPS_TYPE_DIR) {
+ if ($raList[$i]->Type != Shared_OLE::OLE_PPS_TYPE_DIR) {
$raList[$i]->Size = $raList[$i]->_DataLen();
- if (($raList[$i]->Size >= PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) ||
- (($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT) && isset($raList[$i]->_data)))
+ if (($raList[$i]->Size >= Shared_OLE::OLE_DATA_SIZE_SMALL) ||
+ (($raList[$i]->Type == Shared_OLE::OLE_PPS_TYPE_ROOT) && isset($raList[$i]->_data)))
{
// Write Data
//if (isset($raList[$i]->_PPS_FILE)) {
@@ -299,7 +301,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
}
/**
- * get small data (PPS's with data smaller than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL)
+ * get small data (PPS's with data smaller than PHPExcel\Shared_OLE::OLE_DATA_SIZE_SMALL)
*
* @access public
* @param array &$raList Reference to array of PPS's
@@ -313,11 +315,11 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
$iCount = count($raList);
for ($i = 0; $i < $iCount; ++$i) {
// Make SBD, small data string
- if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) {
+ if ($raList[$i]->Type == Shared_OLE::OLE_PPS_TYPE_FILE) {
if ($raList[$i]->Size <= 0) {
continue;
}
- if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) {
+ if ($raList[$i]->Size < Shared_OLE::OLE_DATA_SIZE_SMALL) {
$iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
+ (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
// Add to SBD
@@ -345,7 +347,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
}
}
}
- $iSbCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE);
+ $iSbCnt = floor($this->_BIG_BLOCK_SIZE / Shared_OLE::OLE_LONG_INT_SIZE);
if ($iSmBlk % $iSbCnt) {
$iB = $iSbCnt - ($iSmBlk % $iSbCnt);
for ($i = 0; $i < $iB; ++$i) {
@@ -370,9 +372,9 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
}
// Adjust for Block
$iCnt = count($raList);
- $iBCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE;
+ $iBCnt = $this->_BIG_BLOCK_SIZE / Shared_OLE::OLE_PPS_SIZE;
if ($iCnt % $iBCnt) {
- fwrite($this->_FILEH_, str_repeat("\x00",($iBCnt - ($iCnt % $iBCnt)) * PHPExcel_Shared_OLE::OLE_PPS_SIZE));
+ fwrite($this->_FILEH_, str_repeat("\x00",($iBCnt - ($iCnt % $iBCnt)) * Shared_OLE::OLE_PPS_SIZE));
}
}
@@ -388,8 +390,8 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
{
$FILE = $this->_FILEH_;
// Calculate Basic Setting
- $iBbCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
- $i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
+ $iBbCnt = $this->_BIG_BLOCK_SIZE / Shared_OLE::OLE_LONG_INT_SIZE;
+ $i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / Shared_OLE::OLE_LONG_INT_SIZE;
$iBdExL = 0;
$iAll = $iBsize + $iPpsCnt + $iSbdSize;
diff --git a/Classes/PHPExcel/Shared/OLERead.php b/Classes/PHPExcel/Shared/OLERead.php
index 30e12a4..e591efb 100644
--- a/Classes/PHPExcel/Shared/OLERead.php
+++ b/Classes/PHPExcel/Shared/OLERead.php
@@ -19,16 +19,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @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##
*/
+
+namespace PHPExcel;
+
defined('IDENTIFIER_OLE') ||
define('IDENTIFIER_OLE', pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1));
-class PHPExcel_Shared_OLERead {
+class Shared_OLERead {
private $data = '';
// OLE identifier
@@ -71,13 +74,13 @@ class PHPExcel_Shared_OLERead {
* Read the file
*
* @param $sFileName string Filename
- * @throws PHPExcel_Reader_Exception
+ * @throws PHPExcel\Reader_Exception
*/
public function read($sFileName)
{
// Check if file exists and is readable
if(!is_readable($sFileName)) {
- throw new PHPExcel_Reader_Exception("Could not open " . $sFileName . " for reading! File does not exist, or it is not readable.");
+ throw new Reader_Exception("Could not open " . $sFileName . " for reading! File does not exist, or it is not readable.");
}
// Get the file identifier
@@ -86,7 +89,7 @@ class PHPExcel_Shared_OLERead {
// Check OLE identifier
if ($this->data != self::IDENTIFIER_OLE) {
- throw new PHPExcel_Reader_Exception('The filename ' . $sFileName . ' is not recognised as an OLE file');
+ throw new Reader_Exception('The filename ' . $sFileName . ' is not recognised as an OLE file');
}
// Get the file data
diff --git a/Classes/PHPExcel/Shared/PasswordHasher.php b/Classes/PHPExcel/Shared/PasswordHasher.php
index 270e54d..42c045d 100644
--- a/Classes/PHPExcel/Shared/PasswordHasher.php
+++ b/Classes/PHPExcel/Shared/PasswordHasher.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Shared_PasswordHasher
+ * PHPExcel\Shared_PasswordHasher
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Shared_PasswordHasher
+class Shared_PasswordHasher
{
/**
* Create a password hash from a given string.
diff --git a/Classes/PHPExcel/Shared/String.php b/Classes/PHPExcel/Shared/String.php
index 3ba1be2..90227cf 100644
--- a/Classes/PHPExcel/Shared/String.php
+++ b/Classes/PHPExcel/Shared/String.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Shared_String
+ * PHPExcel\Shared_String
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Shared_String
+class Shared_String
{
/** Constants */
/** Regular Expressions */
@@ -637,7 +639,7 @@ class PHPExcel_Shared_String
if (preg_match('/^'.self::STRING_REGEXP_FRACTION.'$/i', $operand, $match)) {
$sign = ($match[1] == '-') ? '-' : '+';
$fractionFormula = '='.$sign.$match[2].$sign.$match[3];
- $operand = PHPExcel_Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
+ $operand = Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
return true;
}
return false;
@@ -665,8 +667,8 @@ class PHPExcel_Shared_String
}
/**
- * Set the decimal separator. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
- * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
+ * Set the decimal separator. Only used by PHPExcel\Style_NumberFormat::toFormattedString()
+ * to format output by PHPExcel\Writer_HTML and PHPExcel\Writer_PDF
*
* @param string $pValue Character for decimal separator
*/
@@ -697,8 +699,8 @@ class PHPExcel_Shared_String
}
/**
- * Set the thousands separator. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
- * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
+ * Set the thousands separator. Only used by PHPExcel\Style_NumberFormat::toFormattedString()
+ * to format output by PHPExcel\Writer_HTML and PHPExcel\Writer_PDF
*
* @param string $pValue Character for thousands separator
*/
@@ -729,8 +731,8 @@ class PHPExcel_Shared_String
}
/**
- * Set the currency code. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
- * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
+ * Set the currency code. Only used by PHPExcel\Style_NumberFormat::toFormattedString()
+ * to format output by PHPExcel\Writer_HTML and PHPExcel\Writer_PDF
*
* @param string $pValue Character for currency code
*/
diff --git a/Classes/PHPExcel/Shared/TimeZone.php b/Classes/PHPExcel/Shared/TimeZone.php
index 9f1ba4a..cfea9c2 100644
--- a/Classes/PHPExcel/Shared/TimeZone.php
+++ b/Classes/PHPExcel/Shared/TimeZone.php
@@ -20,21 +20,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Shared_TimeZone
+ * PHPExcel\Shared_TimeZone
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Shared_TimeZone
+class Shared_TimeZone
{
/*
* Default Timezone used for date/time conversions
@@ -112,12 +114,12 @@ class PHPExcel_Shared_TimeZone
* @param string $timezone The timezone for finding the adjustment to UST
* @param integer $timestamp PHP date/time value
* @return integer Number of seconds for timezone adjustment
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
public static function getTimeZoneAdjustment($timezone, $timestamp) {
if ($timezone !== NULL) {
if (!self::_validateTimezone($timezone)) {
- throw new PHPExcel_Exception("Invalid timezone " . $timezone);
+ throw new Exception("Invalid timezone " . $timezone);
}
} else {
$timezone = self::$_timezone;
diff --git a/Classes/PHPExcel/Shared/XMLWriter.php b/Classes/PHPExcel/Shared/XMLWriter.php
index dfbcef8..1e5a752 100644
--- a/Classes/PHPExcel/Shared/XMLWriter.php
+++ b/Classes/PHPExcel/Shared/XMLWriter.php
@@ -19,29 +19,27 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @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##
*/
-if (!defined('DATE_W3C')) {
+
+namespace PHPExcel;
+
+ if (!defined('DATE_W3C')) {
define('DATE_W3C', 'Y-m-d\TH:i:sP');
}
-if (!defined('DEBUGMODE_ENABLED')) {
- define('DEBUGMODE_ENABLED', false);
-}
-
-
/**
- * PHPExcel_Shared_XMLWriter
+ * PHPExcel\Shared_XMLWriter
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Shared_XMLWriter extends XMLWriter {
+class Shared_XMLWriter extends \XMLWriter {
/** Temporary storage method */
const STORAGE_MEMORY = 1;
const STORAGE_DISK = 2;
@@ -54,7 +52,7 @@ class PHPExcel_Shared_XMLWriter extends XMLWriter {
private $_tempFileName = '';
/**
- * Create a new PHPExcel_Shared_XMLWriter instance
+ * Create a new PHPExcel\Shared_XMLWriter instance
*
* @param int $pTemporaryStorage Temporary storage location
* @param string $pTemporaryStorageFolder Temporary storage folder
@@ -66,7 +64,7 @@ class PHPExcel_Shared_XMLWriter extends XMLWriter {
} else {
// Create temporary filename
if ($pTemporaryStorageFolder === NULL)
- $pTemporaryStorageFolder = PHPExcel_Shared_File::sys_get_temp_dir();
+ $pTemporaryStorageFolder = Shared_File::sys_get_temp_dir();
$this->_tempFileName = @tempnam($pTemporaryStorageFolder, 'xml');
// Open storage
@@ -75,11 +73,6 @@ class PHPExcel_Shared_XMLWriter extends XMLWriter {
$this->openMemory();
}
}
-
- // Set default values
- if (DEBUGMODE_ENABLED) {
- $this->setIndent(true);
- }
}
/**
diff --git a/Classes/PHPExcel/Shared/ZipArchive.php b/Classes/PHPExcel/Shared/ZipArchive.php
index 50e2240..7fc26f3 100644
--- a/Classes/PHPExcel/Shared/ZipArchive.php
+++ b/Classes/PHPExcel/Shared/ZipArchive.php
@@ -19,26 +19,29 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Shared_ZipArchive
+ * @package PHPExcel\Shared_ZipArchive
* @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##
*/
-if (!defined('PCLZIP_TEMPORARY_DIR')) {
- define('PCLZIP_TEMPORARY_DIR', PHPExcel_Shared_File::sys_get_temp_dir());
+
+namespace PHPExcel;
+
+ if (!defined('PCLZIP_TEMPORARY_DIR')) {
+ define('PCLZIP_TEMPORARY_DIR', Shared_File::sys_get_temp_dir());
}
require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/PCLZip/pclzip.lib.php';
/**
- * PHPExcel_Shared_ZipArchive
+ * PHPExcel\Shared_ZipArchive
*
* @category PHPExcel
- * @package PHPExcel_Shared_ZipArchive
+ * @package PHPExcel\Shared_ZipArchive
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Shared_ZipArchive
+class Shared_ZipArchive
{
/** constants */
@@ -69,7 +72,7 @@ class PHPExcel_Shared_ZipArchive
*/
public function open($fileName)
{
- $this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
+ $this->_tempDir = Shared_File::sys_get_temp_dir();
$this->_zip = new PclZip($fileName);
@@ -105,7 +108,7 @@ class PHPExcel_Shared_ZipArchive
PCLZIP_OPT_ADD_PATH, $filenameParts["dirname"]
);
if ($res == 0) {
- throw new PHPExcel_Writer_Exception("Error zipping files : " . $this->_zip->errorInfo(true));
+ throw new Writer_Exception("Error zipping files : " . $this->_zip->errorInfo(true));
}
unlink($this->_tempDir.'/'.$filenameParts["basename"]);
diff --git a/Classes/PHPExcel/Shared/ZipStreamWrapper.php b/Classes/PHPExcel/Shared/ZipStreamWrapper.php
index cc401ce..1ce89e1 100644
--- a/Classes/PHPExcel/Shared/ZipStreamWrapper.php
+++ b/Classes/PHPExcel/Shared/ZipStreamWrapper.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Shared_ZipStreamWrapper
+ * PHPExcel\Shared_ZipStreamWrapper
*
* @category PHPExcel
- * @package PHPExcel_Shared
+ * @package PHPExcel\Shared
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Shared_ZipStreamWrapper {
+class Shared_ZipStreamWrapper {
/**
* Internal ZipAcrhive
*
@@ -82,7 +84,7 @@ class PHPExcel_Shared_ZipStreamWrapper {
public function stream_open($path, $mode, $options, &$opened_path) {
// Check for mode
if ($mode{0} != 'r') {
- throw new PHPExcel_Reader_Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.');
+ throw new Reader_Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.');
}
$pos = strrpos($path, '#');
diff --git a/Classes/PHPExcel/Style.php b/Classes/PHPExcel/Style.php
index 7669b69..788f362 100644
--- a/Classes/PHPExcel/Style.php
+++ b/Classes/PHPExcel/Style.php
@@ -19,68 +19,70 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Style
+ * @package PHPExcel\Style
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Style
+ * PHPExcel\Style
*
* @category PHPExcel
- * @package PHPExcel_Style
+ * @package PHPExcel\Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style extends Style_Supervisor implements IComparable
{
/**
* Font
*
- * @var PHPExcel_Style_Font
+ * @var PHPExcel\Style_Font
*/
protected $_font;
/**
* Fill
*
- * @var PHPExcel_Style_Fill
+ * @var PHPExcel\Style_Fill
*/
protected $_fill;
/**
* Borders
*
- * @var PHPExcel_Style_Borders
+ * @var PHPExcel\Style_Borders
*/
protected $_borders;
/**
* Alignment
*
- * @var PHPExcel_Style_Alignment
+ * @var PHPExcel\Style_Alignment
*/
protected $_alignment;
/**
* Number Format
*
- * @var PHPExcel_Style_NumberFormat
+ * @var PHPExcel\Style_NumberFormat
*/
protected $_numberFormat;
/**
* Conditional styles
*
- * @var PHPExcel_Style_Conditional[]
+ * @var PHPExcel\Style_Conditional[]
*/
protected $_conditionalStyles;
/**
* Protection
*
- * @var PHPExcel_Style_Protection
+ * @var PHPExcel\Style_Protection
*/
protected $_protection;
@@ -92,7 +94,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
protected $_index;
/**
- * Create a new PHPExcel_Style
+ * Create a new PHPExcel\Style
*
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what
@@ -108,12 +110,12 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
// Initialise values
$this->_conditionalStyles = array();
- $this->_font = new PHPExcel_Style_Font($isSupervisor, $isConditional);
- $this->_fill = new PHPExcel_Style_Fill($isSupervisor, $isConditional);
- $this->_borders = new PHPExcel_Style_Borders($isSupervisor, $isConditional);
- $this->_alignment = new PHPExcel_Style_Alignment($isSupervisor, $isConditional);
- $this->_numberFormat = new PHPExcel_Style_NumberFormat($isSupervisor, $isConditional);
- $this->_protection = new PHPExcel_Style_Protection($isSupervisor, $isConditional);
+ $this->_font = new Style_Font($isSupervisor, $isConditional);
+ $this->_fill = new Style_Fill($isSupervisor, $isConditional);
+ $this->_borders = new Style_Borders($isSupervisor, $isConditional);
+ $this->_alignment = new Style_Alignment($isSupervisor, $isConditional);
+ $this->_numberFormat = new Style_NumberFormat($isSupervisor, $isConditional);
+ $this->_protection = new Style_Protection($isSupervisor, $isConditional);
// bind parent if we are a supervisor
if ($isSupervisor) {
@@ -130,7 +132,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor
*
- * @return PHPExcel_Style
+ * @return PHPExcel\Style
*/
public function getSharedComponent()
{
@@ -166,7 +168,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* 'name' => 'Arial',
* 'bold' => true,
* 'italic' => false,
- * 'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
+ * 'underline' => PHPExcel\Style_Font::UNDERLINE_DOUBLE,
* 'strike' => false,
* 'color' => array(
* 'rgb' => '808080'
@@ -174,13 +176,13 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* ),
* 'borders' => array(
* 'bottom' => array(
- * 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+ * 'style' => PHPExcel\Style_Border::BORDER_DASHDOT,
* 'color' => array(
* 'rgb' => '808080'
* )
* ),
* 'top' => array(
- * 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
+ * 'style' => PHPExcel\Style_Border::BORDER_DASHDOT,
* 'color' => array(
* 'rgb' => '808080'
* )
@@ -192,8 +194,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*
* @param array $pStyles Array containing style information
* @param boolean $pAdvanced Advanced mode for setting borders.
- * @throws PHPExcel_Exception
- * @return PHPExcel_Style
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Style
*/
public function applyFromArray($pStyles = null, $pAdvanced = true)
{
@@ -214,12 +216,12 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
}
// Calculate range outer borders
- $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
- $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB);
+ $rangeStart = Cell::coordinateFromString($rangeA);
+ $rangeEnd = Cell::coordinateFromString($rangeB);
// Translate column into index
- $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
- $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
+ $rangeStart[0] = Cell::columnIndexFromString($rangeStart[0]) - 1;
+ $rangeEnd[0] = Cell::columnIndexFromString($rangeEnd[0]) - 1;
// Make sure we can loop upwards on rows and columns
if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -273,13 +275,13 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
for ($x = 1; $x <= $xMax; ++$x) {
// start column index for region
$colStart = ($x == 3) ?
- PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0])
- : PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $x - 1);
+ Cell::stringFromColumnIndex($rangeEnd[0])
+ : Cell::stringFromColumnIndex($rangeStart[0] + $x - 1);
// end column index for region
$colEnd = ($x == 1) ?
- PHPExcel_Cell::stringFromColumnIndex($rangeStart[0])
- : PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] - $xMax + $x);
+ Cell::stringFromColumnIndex($rangeStart[0])
+ : Cell::stringFromColumnIndex($rangeEnd[0] - $xMax + $x);
for ($y = 1; $y <= $yMax; ++$y) {
@@ -465,7 +467,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
}
}
} else {
- throw new PHPExcel_Exception("Invalid style array passed.");
+ throw new Exception("Invalid style array passed.");
}
return $this;
}
@@ -473,7 +475,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Get Fill
*
- * @return PHPExcel_Style_Fill
+ * @return PHPExcel\Style_Fill
*/
public function getFill()
{
@@ -483,7 +485,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Get Font
*
- * @return PHPExcel_Style_Font
+ * @return PHPExcel\Style_Font
*/
public function getFont()
{
@@ -493,10 +495,10 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Set font
*
- * @param PHPExcel_Style_Font $font
- * @return PHPExcel_Style
+ * @param PHPExcel\Style_Font $font
+ * @return PHPExcel\Style
*/
- public function setFont(PHPExcel_Style_Font $font)
+ public function setFont(Style_Font $font)
{
$this->_font = $font;
return $this;
@@ -505,7 +507,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Get Borders
*
- * @return PHPExcel_Style_Borders
+ * @return PHPExcel\Style_Borders
*/
public function getBorders()
{
@@ -515,7 +517,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Get Alignment
*
- * @return PHPExcel_Style_Alignment
+ * @return PHPExcel\Style_Alignment
*/
public function getAlignment()
{
@@ -525,7 +527,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Get Number Format
*
- * @return PHPExcel_Style_NumberFormat
+ * @return PHPExcel\Style_NumberFormat
*/
public function getNumberFormat()
{
@@ -535,7 +537,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Get Conditional Styles. Only used on supervisor.
*
- * @return PHPExcel_Style_Conditional[]
+ * @return PHPExcel\Style_Conditional[]
*/
public function getConditionalStyles()
{
@@ -545,8 +547,8 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Set Conditional Styles. Only used on supervisor.
*
- * @param PHPExcel_Style_Conditional[] $pValue Array of condtional styles
- * @return PHPExcel_Style
+ * @param PHPExcel\Style_Conditional[] $pValue Array of condtional styles
+ * @return PHPExcel\Style
*/
public function setConditionalStyles($pValue = null)
{
@@ -559,7 +561,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
/**
* Get Protection
*
- * @return PHPExcel_Style_Protection
+ * @return PHPExcel\Style_Protection
*/
public function getProtection()
{
diff --git a/Classes/PHPExcel/Style/Alignment.php b/Classes/PHPExcel/Style/Alignment.php
index 5bf2fa6..754425c 100644
--- a/Classes/PHPExcel/Style/Alignment.php
+++ b/Classes/PHPExcel/Style/Alignment.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Style
+ * @package PHPExcel\Style
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Style_Alignment
+ * PHPExcel\Style_Alignment
*
* @category PHPExcel
- * @package PHPExcel_Style
+ * @package PHPExcel\Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style_Alignment extends Style_Supervisor implements IComparable
{
/* Horizontal alignment styles */
const HORIZONTAL_GENERAL = 'general';
@@ -54,14 +56,14 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
*
* @var string
*/
- protected $_horizontal = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+ protected $_horizontal = Style_Alignment::HORIZONTAL_GENERAL;
/**
* Vertical
*
* @var string
*/
- protected $_vertical = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
+ protected $_vertical = Style_Alignment::VERTICAL_BOTTOM;
/**
* Text rotation
@@ -92,7 +94,7 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
protected $_indent = 0;
/**
- * Create a new PHPExcel_Style_Alignment
+ * Create a new PHPExcel\Style_Alignment
*
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what
@@ -117,7 +119,7 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
* Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor
*
- * @return PHPExcel_Style_Alignment
+ * @return PHPExcel\Style_Alignment
*/
public function getSharedComponent()
{
@@ -141,8 +143,8 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
*
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getAlignment()->applyFromArray(
* array(
- * 'horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
- * 'vertical' => PHPExcel_Style_Alignment::VERTICAL_CENTER,
+ * 'horizontal' => PHPExcel\Style_Alignment::HORIZONTAL_CENTER,
+ * 'vertical' => PHPExcel\Style_Alignment::VERTICAL_CENTER,
* 'rotation' => 0,
* 'wrap' => TRUE
* )
@@ -150,8 +152,8 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
*
*
* @param array $pStyles Array containing style information
- * @throws PHPExcel_Exception
- * @return PHPExcel_Style_Alignment
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Style_Alignment
*/
public function applyFromArray($pStyles = NULL) {
if (is_array($pStyles)) {
@@ -179,7 +181,7 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
}
}
} else {
- throw new PHPExcel_Exception("Invalid style array passed.");
+ throw new Exception("Invalid style array passed.");
}
return $this;
}
@@ -200,11 +202,11 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
* Set Horizontal
*
* @param string $pValue
- * @return PHPExcel_Style_Alignment
+ * @return PHPExcel\Style_Alignment
*/
- public function setHorizontal($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) {
+ public function setHorizontal($pValue = Style_Alignment::HORIZONTAL_GENERAL) {
if ($pValue == '') {
- $pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+ $pValue = Style_Alignment::HORIZONTAL_GENERAL;
}
if ($this->_isSupervisor) {
@@ -233,11 +235,11 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
* Set Vertical
*
* @param string $pValue
- * @return PHPExcel_Style_Alignment
+ * @return PHPExcel\Style_Alignment
*/
- public function setVertical($pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM) {
+ public function setVertical($pValue = Style_Alignment::VERTICAL_BOTTOM) {
if ($pValue == '') {
- $pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
+ $pValue = Style_Alignment::VERTICAL_BOTTOM;
}
if ($this->_isSupervisor) {
@@ -265,8 +267,8 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
* Set TextRotation
*
* @param int $pValue
- * @throws PHPExcel_Exception
- * @return PHPExcel_Style_Alignment
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Style_Alignment
*/
public function setTextRotation($pValue = 0) {
// Excel2007 value 255 => PHPExcel value -165
@@ -283,7 +285,7 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
$this->_textRotation = $pValue;
}
} else {
- throw new PHPExcel_Exception("Text rotation should be a value between -90 and 90.");
+ throw new Exception("Text rotation should be a value between -90 and 90.");
}
return $this;
@@ -305,7 +307,7 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
* Set Wrap Text
*
* @param boolean $pValue
- * @return PHPExcel_Style_Alignment
+ * @return PHPExcel\Style_Alignment
*/
public function setWrapText($pValue = FALSE) {
if ($pValue == '') {
@@ -336,7 +338,7 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
* Set Shrink to fit
*
* @param boolean $pValue
- * @return PHPExcel_Style_Alignment
+ * @return PHPExcel\Style_Alignment
*/
public function setShrinkToFit($pValue = FALSE) {
if ($pValue == '') {
@@ -367,7 +369,7 @@ class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPE
* Set indent
*
* @param int $pValue
- * @return PHPExcel_Style_Alignment
+ * @return PHPExcel\Style_Alignment
*/
public function setIndent($pValue = 0) {
if ($pValue > 0) {
diff --git a/Classes/PHPExcel/Style/Border.php b/Classes/PHPExcel/Style/Border.php
index b75f82c..fb469b5 100644
--- a/Classes/PHPExcel/Style/Border.php
+++ b/Classes/PHPExcel/Style/Border.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Style_Border
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style_Border extends Style_Supervisor implements IComparable
{
/* Border style */
const BORDER_NONE = 'none';
@@ -56,7 +58,7 @@ class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExce
*
* @var string
*/
- protected $_borderStyle = PHPExcel_Style_Border::BORDER_NONE;
+ protected $_borderStyle = Style_Border::BORDER_NONE;
/**
* Border color
@@ -88,7 +90,7 @@ class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExce
parent::__construct($isSupervisor);
// Initialise values
- $this->_color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+ $this->_color = new Style_Color(Style_Color::COLOR_BLACK, $isSupervisor);
// bind parent if we are a supervisor
if ($isSupervisor) {
@@ -125,7 +127,7 @@ class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExce
case '_inside':
case '_outline':
case '_vertical':
- throw new PHPExcel_Exception('Cannot get shared component for a pseudo-border.');
+ throw new Exception('Cannot get shared component for a pseudo-border.');
break;
case '_bottom':
return $this->_parent->getSharedComponent()->getBottom(); break;
diff --git a/Classes/PHPExcel/Style/Borders.php b/Classes/PHPExcel/Style/Borders.php
index ccb1be8..01f4709 100644
--- a/Classes/PHPExcel/Style/Borders.php
+++ b/Classes/PHPExcel/Style/Borders.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Style_Borders
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style_Borders extends Style_Supervisor implements IComparable
{
/* Diagonal directions */
const DIAGONAL_NONE = 0;
@@ -134,21 +136,21 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
parent::__construct($isSupervisor);
// Initialise values
- $this->_left = new PHPExcel_Style_Border($isSupervisor, $isConditional);
- $this->_right = new PHPExcel_Style_Border($isSupervisor, $isConditional);
- $this->_top = new PHPExcel_Style_Border($isSupervisor, $isConditional);
- $this->_bottom = new PHPExcel_Style_Border($isSupervisor, $isConditional);
- $this->_diagonal = new PHPExcel_Style_Border($isSupervisor, $isConditional);
- $this->_diagonalDirection = PHPExcel_Style_Borders::DIAGONAL_NONE;
+ $this->_left = new Style_Border($isSupervisor, $isConditional);
+ $this->_right = new Style_Border($isSupervisor, $isConditional);
+ $this->_top = new Style_Border($isSupervisor, $isConditional);
+ $this->_bottom = new Style_Border($isSupervisor, $isConditional);
+ $this->_diagonal = new Style_Border($isSupervisor, $isConditional);
+ $this->_diagonalDirection = Style_Borders::DIAGONAL_NONE;
// Specially for supervisor
if ($isSupervisor) {
// Initialize pseudo-borders
- $this->_allBorders = new PHPExcel_Style_Border(TRUE);
- $this->_outline = new PHPExcel_Style_Border(TRUE);
- $this->_inside = new PHPExcel_Style_Border(TRUE);
- $this->_vertical = new PHPExcel_Style_Border(TRUE);
- $this->_horizontal = new PHPExcel_Style_Border(TRUE);
+ $this->_allBorders = new Style_Border(TRUE);
+ $this->_outline = new Style_Border(TRUE);
+ $this->_inside = new Style_Border(TRUE);
+ $this->_vertical = new Style_Border(TRUE);
+ $this->_horizontal = new Style_Border(TRUE);
// bind parent if we are a supervisor
$this->_left->bindParent($this, '_left');
@@ -388,9 +390,9 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* @param int $pValue
* @return PHPExcel_Style_Borders
*/
- public function setDiagonalDirection($pValue = PHPExcel_Style_Borders::DIAGONAL_NONE) {
+ public function setDiagonalDirection($pValue = Style_Borders::DIAGONAL_NONE) {
if ($pValue == '') {
- $pValue = PHPExcel_Style_Borders::DIAGONAL_NONE;
+ $pValue = Style_Borders::DIAGONAL_NONE;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('diagonaldirection' => $pValue));
diff --git a/Classes/PHPExcel/Style/Color.php b/Classes/PHPExcel/Style/Color.php
index 6248862..5226bdb 100644
--- a/Classes/PHPExcel/Style/Color.php
+++ b/Classes/PHPExcel/Style/Color.php
@@ -26,14 +26,16 @@
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Style_Color
+ * PHPExcel\Style_Color
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style_Color extends Style_Supervisor implements IComparable
{
/* Colors */
const COLOR_BLACK = 'FF000000';
diff --git a/Classes/PHPExcel/Style/Conditional.php b/Classes/PHPExcel/Style/Conditional.php
index 1d3f950..1194c43 100644
--- a/Classes/PHPExcel/Style/Conditional.php
+++ b/Classes/PHPExcel/Style/Conditional.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Style_Conditional
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_Conditional implements PHPExcel_IComparable
+class Style_Conditional implements IComparable
{
/* Condition types */
const CONDITION_NONE = 'none';
@@ -96,11 +98,11 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
public function __construct()
{
// Initialise values
- $this->_conditionType = PHPExcel_Style_Conditional::CONDITION_NONE;
- $this->_operatorType = PHPExcel_Style_Conditional::OPERATOR_NONE;
+ $this->_conditionType = Style_Conditional::CONDITION_NONE;
+ $this->_operatorType = Style_Conditional::OPERATOR_NONE;
$this->_text = null;
$this->_condition = array();
- $this->_style = new PHPExcel_Style(FALSE, TRUE);
+ $this->_style = new Style(FALSE, TRUE);
}
/**
@@ -118,7 +120,7 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* @param string $pValue PHPExcel_Style_Conditional condition type
* @return PHPExcel_Style_Conditional
*/
- public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE) {
+ public function setConditionType($pValue = Style_Conditional::CONDITION_NONE) {
$this->_conditionType = $pValue;
return $this;
}
@@ -138,7 +140,7 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* @param string $pValue PHPExcel_Style_Conditional operator type
* @return PHPExcel_Style_Conditional
*/
- public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE) {
+ public function setOperatorType($pValue = Style_Conditional::OPERATOR_NONE) {
$this->_operatorType = $pValue;
return $this;
}
@@ -241,7 +243,7 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* @throws PHPExcel_Exception
* @return PHPExcel_Style_Conditional
*/
- public function setStyle(PHPExcel_Style $pValue = null) {
+ public function setStyle(Style $pValue = null) {
$this->_style = $pValue;
return $this;
}
diff --git a/Classes/PHPExcel/Style/Fill.php b/Classes/PHPExcel/Style/Fill.php
index 8f4eaf3..ac81e77 100644
--- a/Classes/PHPExcel/Style/Fill.php
+++ b/Classes/PHPExcel/Style/Fill.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Style_Fill
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_Fill extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style_Fill extends Style_Supervisor implements IComparable
{
/* Fill types */
const FILL_NONE = 'none';
@@ -63,7 +65,7 @@ class PHPExcel_Style_Fill extends PHPExcel_Style_Supervisor implements PHPExcel_
*
* @var string
*/
- protected $_fillType = PHPExcel_Style_Fill::FILL_NONE;
+ protected $_fillType = Style_Fill::FILL_NONE;
/**
* Rotation
@@ -105,8 +107,8 @@ class PHPExcel_Style_Fill extends PHPExcel_Style_Supervisor implements PHPExcel_
if ($isConditional) {
$this->_fillType = NULL;
}
- $this->_startColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor, $isConditional);
- $this->_endColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
+ $this->_startColor = new Style_Color(Style_Color::COLOR_WHITE, $isSupervisor, $isConditional);
+ $this->_endColor = new Style_Color(Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
// bind parent if we are a supervisor
if ($isSupervisor) {
@@ -204,7 +206,7 @@ class PHPExcel_Style_Fill extends PHPExcel_Style_Supervisor implements PHPExcel_
* @param string $pValue PHPExcel_Style_Fill fill type
* @return PHPExcel_Style_Fill
*/
- public function setFillType($pValue = PHPExcel_Style_Fill::FILL_NONE) {
+ public function setFillType($pValue = Style_Fill::FILL_NONE) {
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('type' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
diff --git a/Classes/PHPExcel/Style/Font.php b/Classes/PHPExcel/Style/Font.php
index 6a00a15..db90ca6 100644
--- a/Classes/PHPExcel/Style/Font.php
+++ b/Classes/PHPExcel/Style/Font.php
@@ -26,14 +26,16 @@
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Style_Font
+ * PHPExcel\Style\Font
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_Font extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style_Font extends Style_Supervisor implements IComparable
{
/* Underline types */
const UNDERLINE_NONE = 'none';
@@ -130,9 +132,9 @@ class PHPExcel_Style_Font extends PHPExcel_Style_Supervisor implements PHPExcel_
$this->_subScript = NULL;
$this->_underline = NULL;
$this->_strikethrough = NULL;
- $this->_color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
+ $this->_color = new Style_Color(Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
} else {
- $this->_color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+ $this->_color = new Style_Color(Style_Color::COLOR_BLACK, $isSupervisor);
}
// bind parent if we are a supervisor
if ($isSupervisor) {
diff --git a/Classes/PHPExcel/Style/NumberFormat.php b/Classes/PHPExcel/Style/NumberFormat.php
index 80347bf..589277c 100644
--- a/Classes/PHPExcel/Style/NumberFormat.php
+++ b/Classes/PHPExcel/Style/NumberFormat.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Style_NumberFormat
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_NumberFormat extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style_NumberFormat extends Style_Supervisor implements IComparable
{
/* Pre-defined formats */
const FORMAT_GENERAL = 'General';
@@ -94,7 +96,7 @@ class PHPExcel_Style_NumberFormat extends PHPExcel_Style_Supervisor implements P
*
* @var string
*/
- protected $_formatCode = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+ protected $_formatCode = Style_NumberFormat::FORMAT_GENERAL;
/**
* Built-in format Code
@@ -199,10 +201,10 @@ class PHPExcel_Style_NumberFormat extends PHPExcel_Style_Supervisor implements P
* @param string $pValue
* @return PHPExcel_Style_NumberFormat
*/
- public function setFormatCode($pValue = PHPExcel_Style_NumberFormat::FORMAT_GENERAL)
+ public function setFormatCode($pValue = Style_NumberFormat::FORMAT_GENERAL)
{
if ($pValue == '') {
- $pValue = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
+ $pValue = Style_NumberFormat::FORMAT_GENERAL;
}
if ($this->_isSupervisor) {
$styleArray = $this->getStyleArray(array('code' => $pValue));
diff --git a/Classes/PHPExcel/Style/Protection.php b/Classes/PHPExcel/Style/Protection.php
index a8f65ce..f11d3d8 100644
--- a/Classes/PHPExcel/Style/Protection.php
+++ b/Classes/PHPExcel/Style/Protection.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Style_Protection
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
+class Style_Protection extends Style_Supervisor implements IComparable
{
/** Protection styles */
const PROTECTION_INHERIT = 'inherit';
@@ -127,7 +129,7 @@ class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHP
}
}
} else {
- throw new PHPExcel_Exception("Invalid style array passed.");
+ throw new Exception("Invalid style array passed.");
}
return $this;
}
diff --git a/Classes/PHPExcel/Style/Supervisor.php b/Classes/PHPExcel/Style/Supervisor.php
index d0fa06b..360ade2 100644
--- a/Classes/PHPExcel/Style/Supervisor.php
+++ b/Classes/PHPExcel/Style/Supervisor.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Style
+ * @package PHPExcel\Style
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Style_Supervisor
+ * PHPExcel\Style\Supervisor
*
* @category PHPExcel
- * @package PHPExcel_Style
+ * @package PHPExcel\Style
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-abstract class PHPExcel_Style_Supervisor
+abstract class Style_Supervisor
{
/**
* Supervisor?
diff --git a/Classes/PHPExcel.php b/Classes/PHPExcel/Workbook.php
similarity index 82%
rename from Classes/PHPExcel.php
rename to Classes/PHPExcel/Workbook.php
index 7bd0243..4cec695 100644
--- a/Classes/PHPExcel.php
+++ b/Classes/PHPExcel/Workbook.php
@@ -25,14 +25,8 @@
* @version ##VERSION##, ##DATE##
*/
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
- define('PHPEXCEL_ROOT', dirname(__FILE__) . '/');
- require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
+namespace PHPExcel;
+
/**
* PHPExcel
*
@@ -40,7 +34,7 @@ if (!defined('PHPEXCEL_ROOT')) {
* @package PHPExcel
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel
+class Workbook
{
/**
* Unique ID
@@ -52,28 +46,28 @@ class PHPExcel
/**
* Document properties
*
- * @var PHPExcel_DocumentProperties
+ * @var PHPExcel\DocumentProperties
*/
private $_properties;
/**
* Document security
*
- * @var PHPExcel_DocumentSecurity
+ * @var PHPExcel\DocumentSecurity
*/
private $_security;
/**
* Collection of Worksheet objects
*
- * @var PHPExcel_Worksheet[]
+ * @var PHPExcel\Worksheet[]
*/
private $_workSheetCollection = array();
/**
* Calculation Engine
*
- * @var PHPExcel_Calculation
+ * @var PHPExcel\Calculation
*/
private $_calculationEngine = NULL;
@@ -87,28 +81,28 @@ class PHPExcel
/**
* Named ranges
*
- * @var PHPExcel_NamedRange[]
+ * @var PHPExcel\NamedRange[]
*/
private $_namedRanges = array();
/**
* CellXf supervisor
*
- * @var PHPExcel_Style
+ * @var PHPExcel\Style
*/
private $_cellXfSupervisor;
/**
* CellXf collection
*
- * @var PHPExcel_Style[]
+ * @var PHPExcel\Style[]
*/
private $_cellXfCollection = array();
/**
* CellStyleXf collection
*
- * @var PHPExcel_Style[]
+ * @var PHPExcel\Style[]
*/
private $_cellStyleXfCollection = array();
@@ -118,29 +112,29 @@ class PHPExcel
public function __construct()
{
$this->_uniqueID = uniqid();
- $this->_calculationEngine = PHPExcel_Calculation::getInstance($this);
+ $this->_calculationEngine = Calculation::getInstance($this);
// Initialise worksheet collection and add one worksheet
$this->_workSheetCollection = array();
- $this->_workSheetCollection[] = new PHPExcel_Worksheet($this);
+ $this->_workSheetCollection[] = new Worksheet($this);
$this->_activeSheetIndex = 0;
// Create document properties
- $this->_properties = new PHPExcel_DocumentProperties();
+ $this->_properties = new DocumentProperties();
// Create document security
- $this->_security = new PHPExcel_DocumentSecurity();
+ $this->_security = new DocumentSecurity();
// Set named ranges
$this->_namedRanges = array();
// Create the cellXf supervisor
- $this->_cellXfSupervisor = new PHPExcel_Style(true);
+ $this->_cellXfSupervisor = new Style(true);
$this->_cellXfSupervisor->bindParent($this);
// Create the default style
- $this->addCellXf(new PHPExcel_Style);
- $this->addCellStyleXf(new PHPExcel_Style);
+ $this->addCellXf(new Style);
+ $this->addCellStyleXf(new Style);
}
/**
@@ -148,7 +142,7 @@ class PHPExcel
*
*/
public function __destruct() {
- PHPExcel_Calculation::unsetInstance($this);
+ Calculation::unsetInstance($this);
$this->disconnectWorksheets();
} // function __destruct()
@@ -171,7 +165,7 @@ class PHPExcel
/**
* Return the calculation engine for this worksheet
*
- * @return PHPExcel_Calculation
+ * @return PHPExcel\Calculation
*/
public function getCalculationEngine()
{
@@ -181,7 +175,7 @@ class PHPExcel
/**
* Get properties
*
- * @return PHPExcel_DocumentProperties
+ * @return PHPExcel\DocumentProperties
*/
public function getProperties()
{
@@ -191,9 +185,9 @@ class PHPExcel
/**
* Set properties
*
- * @param PHPExcel_DocumentProperties $pValue
+ * @param PHPExcel\DocumentProperties $pValue
*/
- public function setProperties(PHPExcel_DocumentProperties $pValue)
+ public function setProperties(DocumentProperties $pValue)
{
$this->_properties = $pValue;
}
@@ -201,7 +195,7 @@ class PHPExcel
/**
* Get security
*
- * @return PHPExcel_DocumentSecurity
+ * @return PHPExcel\DocumentSecurity
*/
public function getSecurity()
{
@@ -211,9 +205,9 @@ class PHPExcel
/**
* Set security
*
- * @param PHPExcel_DocumentSecurity $pValue
+ * @param PHPExcel\DocumentSecurity $pValue
*/
- public function setSecurity(PHPExcel_DocumentSecurity $pValue)
+ public function setSecurity(DocumentSecurity $pValue)
{
$this->_security = $pValue;
}
@@ -221,7 +215,7 @@ class PHPExcel
/**
* Get active sheet
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function getActiveSheet()
{
@@ -232,12 +226,12 @@ class PHPExcel
* Create sheet and add it to this workbook
*
* @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
- * @return PHPExcel_Worksheet
- * @throws PHPExcel_Exception
+ * @return PHPExcel\Worksheet
+ * @throws PHPExcel\Exception
*/
public function createSheet($iSheetIndex = NULL)
{
- $newSheet = new PHPExcel_Worksheet($this);
+ $newSheet = new Worksheet($this);
$this->addSheet($newSheet, $iSheetIndex);
return $newSheet;
}
@@ -256,15 +250,15 @@ class PHPExcel
/**
* Add sheet
*
- * @param PHPExcel_Worksheet $pSheet
+ * @param PHPExcel\Worksheet $pSheet
* @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
- * @return PHPExcel_Worksheet
- * @throws PHPExcel_Exception
+ * @return PHPExcel\Worksheet
+ * @throws PHPExcel\Exception
*/
- public function addSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = NULL)
+ public function addSheet(Worksheet $pSheet, $iSheetIndex = NULL)
{
if ($this->sheetNameExists($pSheet->getTitle())) {
- throw new PHPExcel_Exception(
+ throw new Exception(
"Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first."
);
}
@@ -295,7 +289,7 @@ class PHPExcel
* Remove sheet by index
*
* @param int $pIndex Active sheet index
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
public function removeSheetByIndex($pIndex = 0)
{
@@ -303,7 +297,7 @@ class PHPExcel
$numSheets = count($this->_workSheetCollection);
if ($pIndex > $numSheets - 1) {
- throw new PHPExcel_Exception(
+ throw new Exception(
"You tried to remove a sheet by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
);
} else {
@@ -321,8 +315,8 @@ class PHPExcel
* Get sheet by index
*
* @param int $pIndex Sheet index
- * @return PHPExcel_Worksheet
- * @throws PHPExcel_Exception
+ * @return PHPExcel\Worksheet
+ * @throws PHPExcel\Exception
*/
public function getSheet($pIndex = 0)
{
@@ -330,7 +324,7 @@ class PHPExcel
$numSheets = count($this->_workSheetCollection);
if ($pIndex > $numSheets - 1) {
- throw new PHPExcel_Exception(
+ throw new Exception(
"Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}."
);
} else {
@@ -341,7 +335,7 @@ class PHPExcel
/**
* Get all sheets
*
- * @return PHPExcel_Worksheet[]
+ * @return PHPExcel\Worksheet[]
*/
public function getAllSheets()
{
@@ -352,7 +346,7 @@ class PHPExcel
* Get sheet by name
*
* @param string $pName Sheet name
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function getSheetByName($pName = '')
{
@@ -369,11 +363,11 @@ class PHPExcel
/**
* Get index for sheet
*
- * @param PHPExcel_Worksheet $pSheet
+ * @param PHPExcel\Worksheet $pSheet
* @return Sheet index
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
- public function getIndex(PHPExcel_Worksheet $pSheet)
+ public function getIndex(Worksheet $pSheet)
{
foreach ($this->_workSheetCollection as $key => $value) {
if ($value->getHashCode() == $pSheet->getHashCode()) {
@@ -381,7 +375,7 @@ class PHPExcel
}
}
- throw new PHPExcel_Exception("Sheet does not exist.");
+ throw new Exception("Sheet does not exist.");
}
/**
@@ -390,7 +384,7 @@ class PHPExcel
* @param string $sheetName Sheet name to modify index for
* @param int $newIndex New index for the sheet
* @return New sheet index
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
public function setIndexByName($sheetName, $newIndex)
{
@@ -433,15 +427,15 @@ class PHPExcel
* Set active sheet index
*
* @param int $pIndex Active sheet index
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function setActiveSheetIndex($pIndex = 0)
{
$numSheets = count($this->_workSheetCollection);
if ($pIndex > $numSheets - 1) {
- throw new PHPExcel_Exception(
+ throw new Exception(
"You tried to set a sheet active by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
);
} else {
@@ -454,17 +448,17 @@ class PHPExcel
* Set active sheet index by name
*
* @param string $pValue Sheet title
- * @return PHPExcel_Worksheet
- * @throws PHPExcel_Exception
+ * @return PHPExcel\Worksheet
+ * @throws PHPExcel\Exception
*/
public function setActiveSheetIndexByName($pValue = '')
{
- if (($worksheet = $this->getSheetByName($pValue)) instanceof PHPExcel_Worksheet) {
+ if (($worksheet = $this->getSheetByName($pValue)) instanceof Worksheet) {
$this->setActiveSheetIndex($this->getIndex($worksheet));
return $worksheet;
}
- throw new PHPExcel_Exception('Workbook does not contain sheet:' . $pValue);
+ throw new Exception('Workbook does not contain sheet:' . $pValue);
}
/**
@@ -486,14 +480,14 @@ class PHPExcel
/**
* Add external sheet
*
- * @param PHPExcel_Worksheet $pSheet External sheet to add
+ * @param PHPExcel\Worksheet $pSheet External sheet to add
* @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
- public function addExternalSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = null) {
+ public function addExternalSheet(Worksheet $pSheet, $iSheetIndex = null) {
if ($this->sheetNameExists($pSheet->getTitle())) {
- throw new PHPExcel_Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
+ throw new Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
}
// count how many cellXfs there are in this workbook currently, we will need this below
@@ -519,7 +513,7 @@ class PHPExcel
/**
* Get named ranges
*
- * @return PHPExcel_NamedRange[]
+ * @return PHPExcel\NamedRange[]
*/
public function getNamedRanges() {
return $this->_namedRanges;
@@ -528,10 +522,10 @@ class PHPExcel
/**
* Add named range
*
- * @param PHPExcel_NamedRange $namedRange
- * @return PHPExcel
+ * @param PHPExcel\NamedRange $namedRange
+ * @return Workbook
*/
- public function addNamedRange(PHPExcel_NamedRange $namedRange) {
+ public function addNamedRange(NamedRange $namedRange) {
if ($namedRange->getScope() == null) {
// global scope
$this->_namedRanges[$namedRange->getName()] = $namedRange;
@@ -546,10 +540,10 @@ class PHPExcel
* Get named range
*
* @param string $namedRange
- * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
- * @return PHPExcel_NamedRange|null
+ * @param PHPExcel\Worksheet|null $pSheet Scope. Use null for global scope
+ * @return PHPExcel\NamedRange|null
*/
- public function getNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null) {
+ public function getNamedRange($namedRange, Worksheet $pSheet = null) {
$returnValue = null;
if ($namedRange != '' && ($namedRange !== NULL)) {
@@ -571,10 +565,10 @@ class PHPExcel
* Remove named range
*
* @param string $namedRange
- * @param PHPExcel_Worksheet|null $pSheet Scope: use null for global scope.
+ * @param PHPExcel\Worksheet|null $pSheet Scope: use null for global scope.
* @return PHPExcel
*/
- public function removeNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null) {
+ public function removeNamedRange($namedRange, Worksheet $pSheet = null) {
if ($pSheet === NULL) {
if (isset($this->_namedRanges[$namedRange])) {
unset($this->_namedRanges[$namedRange]);
@@ -590,10 +584,10 @@ class PHPExcel
/**
* Get worksheet iterator
*
- * @return PHPExcel_WorksheetIterator
+ * @return PHPExcel\WorksheetIterator
*/
public function getWorksheetIterator() {
- return new PHPExcel_WorksheetIterator($this);
+ return new WorksheetIterator($this);
}
/**
@@ -627,7 +621,7 @@ class PHPExcel
/**
* Get the workbook collection of cellXfs
*
- * @return PHPExcel_Style[]
+ * @return PHPExcel\Style[]
*/
public function getCellXfCollection()
{
@@ -638,7 +632,7 @@ class PHPExcel
* Get cellXf by index
*
* @param int $pIndex
- * @return PHPExcel_Style
+ * @return PHPExcel\Style
*/
public function getCellXfByIndex($pIndex = 0)
{
@@ -649,7 +643,7 @@ class PHPExcel
* Get cellXf by hash code
*
* @param string $pValue
- * @return PHPExcel_Style|false
+ * @return PHPExcel\Style|false
*/
public function getCellXfByHashCode($pValue = '')
{
@@ -664,7 +658,7 @@ class PHPExcel
/**
* Check if style exists in style collection
*
- * @param PHPExcel_Style $pCellStyle
+ * @param PHPExcel\Style $pCellStyle
* @return boolean
*/
public function cellXfExists($pCellStyle = null)
@@ -675,23 +669,23 @@ class PHPExcel
/**
* Get default style
*
- * @return PHPExcel_Style
- * @throws PHPExcel_Exception
+ * @return PHPExcel\Style
+ * @throws PHPExcel\Exception
*/
public function getDefaultStyle()
{
if (isset($this->_cellXfCollection[0])) {
return $this->_cellXfCollection[0];
}
- throw new PHPExcel_Exception('No default style found for this workbook');
+ throw new Exception('No default style found for this workbook');
}
/**
* Add a cellXf to the workbook
*
- * @param PHPExcel_Style $style
+ * @param PHPExcel\Style $style
*/
- public function addCellXf(PHPExcel_Style $style)
+ public function addCellXf(Style $style)
{
$this->_cellXfCollection[] = $style;
$style->setIndex(count($this->_cellXfCollection) - 1);
@@ -701,12 +695,12 @@ class PHPExcel
* Remove cellXf by index. It is ensured that all cells get their xf index updated.
*
* @param int $pIndex Index to cellXf
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
public function removeCellXfByIndex($pIndex = 0)
{
if ($pIndex > count($this->_cellXfCollection) - 1) {
- throw new PHPExcel_Exception("CellXf index is out of bounds.");
+ throw new Exception("CellXf index is out of bounds.");
} else {
// first remove the cellXf
array_splice($this->_cellXfCollection, $pIndex, 1);
@@ -731,7 +725,7 @@ class PHPExcel
/**
* Get the cellXf supervisor
*
- * @return PHPExcel_Style
+ * @return PHPExcel\Style
*/
public function getCellXfSupervisor()
{
@@ -741,7 +735,7 @@ class PHPExcel
/**
* Get the workbook collection of cellStyleXfs
*
- * @return PHPExcel_Style[]
+ * @return PHPExcel\Style[]
*/
public function getCellStyleXfCollection()
{
@@ -752,7 +746,7 @@ class PHPExcel
* Get cellStyleXf by index
*
* @param int $pIndex
- * @return PHPExcel_Style
+ * @return PHPExcel\Style
*/
public function getCellStyleXfByIndex($pIndex = 0)
{
@@ -763,7 +757,7 @@ class PHPExcel
* Get cellStyleXf by hash code
*
* @param string $pValue
- * @return PHPExcel_Style|false
+ * @return PHPExcel\Style|false
*/
public function getCellStyleXfByHashCode($pValue = '')
{
@@ -778,9 +772,9 @@ class PHPExcel
/**
* Add a cellStyleXf to the workbook
*
- * @param PHPExcel_Style $pStyle
+ * @param PHPExcel\Style $pStyle
*/
- public function addCellStyleXf(PHPExcel_Style $pStyle)
+ public function addCellStyleXf(Style $pStyle)
{
$this->_cellStyleXfCollection[] = $pStyle;
$pStyle->setIndex(count($this->_cellStyleXfCollection) - 1);
@@ -790,12 +784,12 @@ class PHPExcel
* Remove cellStyleXf by index
*
* @param int $pIndex
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
public function removeCellStyleXfByIndex($pIndex = 0)
{
if ($pIndex > count($this->_cellStyleXfCollection) - 1) {
- throw new PHPExcel_Exception("CellStyleXf index is out of bounds.");
+ throw new Exception("CellStyleXf index is out of bounds.");
} else {
array_splice($this->_cellStyleXfCollection, $pIndex, 1);
}
@@ -854,7 +848,7 @@ class PHPExcel
// make sure there is always at least one cellXf (there should be)
if (empty($this->_cellXfCollection)) {
- $this->_cellXfCollection[] = new PHPExcel_Style();
+ $this->_cellXfCollection[] = new Style();
}
// update the xfIndex for all cells, row dimensions, column dimensions
diff --git a/Classes/PHPExcel/Worksheet.php b/Classes/PHPExcel/Worksheet.php
index 4c7b239..20c43f0 100644
--- a/Classes/PHPExcel/Worksheet.php
+++ b/Classes/PHPExcel/Worksheet.php
@@ -19,21 +19,23 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet
+ * PHPExcel\Worksheet
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet implements PHPExcel_IComparable
+class Worksheet implements IComparable
{
/* Break types */
const BREAK_NONE = 0;
@@ -62,49 +64,49 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Cacheable collection of cells
*
- * @var PHPExcel_CachedObjectStorage_xxx
+ * @var PHPExcel\CachedObjectStorage_xxx
*/
private $_cellCollection = null;
/**
* Collection of row dimensions
*
- * @var PHPExcel_Worksheet_RowDimension[]
+ * @var PHPExcel\Worksheet_RowDimension[]
*/
private $_rowDimensions = array();
/**
* Default row dimension
*
- * @var PHPExcel_Worksheet_RowDimension
+ * @var PHPExcel\Worksheet_RowDimension
*/
private $_defaultRowDimension = null;
/**
* Collection of column dimensions
*
- * @var PHPExcel_Worksheet_ColumnDimension[]
+ * @var PHPExcel\Worksheet_ColumnDimension[]
*/
private $_columnDimensions = array();
/**
* Default column dimension
*
- * @var PHPExcel_Worksheet_ColumnDimension
+ * @var PHPExcel\Worksheet_ColumnDimension
*/
private $_defaultColumnDimension = null;
/**
* Collection of drawings
*
- * @var PHPExcel_Worksheet_BaseDrawing[]
+ * @var PHPExcel\Worksheet_BaseDrawing[]
*/
private $_drawingCollection = null;
/**
* Collection of Chart objects
*
- * @var PHPExcel_Chart[]
+ * @var PHPExcel\Chart[]
*/
private $_chartCollection = array();
@@ -125,42 +127,42 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Page setup
*
- * @var PHPExcel_Worksheet_PageSetup
+ * @var PHPExcel\Worksheet_PageSetup
*/
private $_pageSetup;
/**
* Page margins
*
- * @var PHPExcel_Worksheet_PageMargins
+ * @var PHPExcel\Worksheet_PageMargins
*/
private $_pageMargins;
/**
* Page header/footer
*
- * @var PHPExcel_Worksheet_HeaderFooter
+ * @var PHPExcel\Worksheet_HeaderFooter
*/
private $_headerFooter;
/**
* Sheet view
*
- * @var PHPExcel_Worksheet_SheetView
+ * @var PHPExcel\Worksheet_SheetView
*/
private $_sheetView;
/**
* Protection
*
- * @var PHPExcel_Worksheet_Protection
+ * @var PHPExcel\Worksheet_Protection
*/
private $_protection;
/**
* Collection of styles
*
- * @var PHPExcel_Style[]
+ * @var PHPExcel\Style[]
*/
private $_styles = array();
@@ -202,7 +204,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Autofilter Range and selection
*
- * @var PHPExcel_Worksheet_AutoFilter
+ * @var PHPExcel\Worksheet_AutoFilter
*/
private $_autoFilter = NULL;
@@ -251,7 +253,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Collection of comments
*
- * @var PHPExcel_Comment[]
+ * @var PHPExcel\Comment[]
*/
private $_comments = array();
@@ -307,7 +309,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Tab color
*
- * @var PHPExcel_Style_Color
+ * @var PHPExcel\Style_Color
*/
private $_tabColor;
@@ -331,48 +333,48 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param PHPExcel $pParent
* @param string $pTitle
*/
- public function __construct(PHPExcel $pParent = null, $pTitle = 'Worksheet')
+ public function __construct(Workbook $pParent = null, $pTitle = 'Worksheet')
{
// Set parent and title
$this->_parent = $pParent;
$this->setTitle($pTitle, FALSE);
- $this->setSheetState(PHPExcel_Worksheet::SHEETSTATE_VISIBLE);
+ $this->setSheetState(Worksheet::SHEETSTATE_VISIBLE);
- $this->_cellCollection = PHPExcel_CachedObjectStorageFactory::getInstance($this);
+ $this->_cellCollection = CachedObjectStorageFactory::getInstance($this);
// Set page setup
- $this->_pageSetup = new PHPExcel_Worksheet_PageSetup();
+ $this->_pageSetup = new Worksheet_PageSetup();
// Set page margins
- $this->_pageMargins = new PHPExcel_Worksheet_PageMargins();
+ $this->_pageMargins = new Worksheet_PageMargins();
// Set page header/footer
- $this->_headerFooter = new PHPExcel_Worksheet_HeaderFooter();
+ $this->_headerFooter = new Worksheet_HeaderFooter();
// Set sheet view
- $this->_sheetView = new PHPExcel_Worksheet_SheetView();
+ $this->_sheetView = new Worksheet_SheetView();
// Drawing collection
- $this->_drawingCollection = new ArrayObject();
+ $this->_drawingCollection = new \ArrayObject();
// Chart collection
- $this->_chartCollection = new ArrayObject();
+ $this->_chartCollection = new \ArrayObject();
// Protection
- $this->_protection = new PHPExcel_Worksheet_Protection();
+ $this->_protection = new Worksheet_Protection();
// Default row dimension
- $this->_defaultRowDimension = new PHPExcel_Worksheet_RowDimension(NULL);
+ $this->_defaultRowDimension = new Worksheet_RowDimension(NULL);
// Default column dimension
- $this->_defaultColumnDimension = new PHPExcel_Worksheet_ColumnDimension(NULL);
+ $this->_defaultColumnDimension = new Worksheet_ColumnDimension(NULL);
- $this->_autoFilter = new PHPExcel_Worksheet_AutoFilter(NULL, $this);
+ $this->_autoFilter = new Worksheet_AutoFilter(NULL, $this);
}
/**
- * Disconnect all cells from this PHPExcel_Worksheet object,
+ * Disconnect all cells from this PHPExcel\Worksheet object,
* typically so that the worksheet object can be unset
*
*/
@@ -390,7 +392,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
*/
function __destruct() {
- PHPExcel_Calculation::getInstance($this->_parent)
+ Calculation::getInstance($this->_parent)
->clearCalculationCacheForWorksheet($this->_title);
$this->disconnectCells();
@@ -399,7 +401,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Return the cache controller for the cell collection
*
- * @return PHPExcel_CachedObjectStorage_xxx
+ * @return PHPExcel\CachedObjectStorage_xxx
*/
public function getCellCacheController() {
return $this->_cellCollection;
@@ -421,18 +423,18 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param string $pValue The string to check
* @return string The valid string
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
private static function _checkSheetTitle($pValue)
{
// Some of the printable ASCII characters are invalid: * : / \ ? [ ]
if (str_replace(self::$_invalidCharacters, '', $pValue) !== $pValue) {
- throw new PHPExcel_Exception('Invalid character found in sheet title');
+ throw new Exception('Invalid character found in sheet title');
}
// Maximum 31 characters allowed for sheet title
- if (PHPExcel_Shared_String::CountCharacters($pValue) > 31) {
- throw new PHPExcel_Exception('Maximum 31 characters allowed in sheet title.');
+ if (Shared_String::CountCharacters($pValue) > 31) {
+ throw new Exception('Maximum 31 characters allowed in sheet title.');
}
return $pValue;
@@ -442,7 +444,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get collection of cells
*
* @param boolean $pSorted Also sort the cell collection?
- * @return PHPExcel_Cell[]
+ * @return PHPExcel\Cell[]
*/
public function getCellCollection($pSorted = true)
{
@@ -459,7 +461,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Sort collection of cells
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function sortCellCollection()
{
@@ -472,7 +474,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get collection of row dimensions
*
- * @return PHPExcel_Worksheet_RowDimension[]
+ * @return PHPExcel\Worksheet_RowDimension[]
*/
public function getRowDimensions()
{
@@ -482,7 +484,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get default row dimension
*
- * @return PHPExcel_Worksheet_RowDimension
+ * @return PHPExcel\Worksheet_RowDimension
*/
public function getDefaultRowDimension()
{
@@ -492,7 +494,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get collection of column dimensions
*
- * @return PHPExcel_Worksheet_ColumnDimension[]
+ * @return PHPExcel\Worksheet_ColumnDimension[]
*/
public function getColumnDimensions()
{
@@ -502,7 +504,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get default column dimension
*
- * @return PHPExcel_Worksheet_ColumnDimension
+ * @return PHPExcel\Worksheet_ColumnDimension
*/
public function getDefaultColumnDimension()
{
@@ -512,7 +514,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get collection of drawings
*
- * @return PHPExcel_Worksheet_BaseDrawing[]
+ * @return PHPExcel\Worksheet_BaseDrawing[]
*/
public function getDrawingCollection()
{
@@ -522,7 +524,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get collection of charts
*
- * @return PHPExcel_Chart[]
+ * @return PHPExcel\Chart[]
*/
public function getChartCollection()
{
@@ -532,11 +534,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Add chart
*
- * @param PHPExcel_Chart $pChart
+ * @param PHPExcel\Chart $pChart
* @param int|null $iChartIndex Index where chart should go (0,1,..., or null for last)
- * @return PHPExcel_Chart
+ * @return PHPExcel\Chart
*/
- public function addChart(PHPExcel_Chart $pChart = null, $iChartIndex = null)
+ public function addChart(Chart $pChart = null, $iChartIndex = null)
{
$pChart->setWorksheet($this);
if (is_null($iChartIndex)) {
@@ -563,8 +565,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get a chart by its index position
*
* @param string $index Chart index position
- * @return false|PHPExcel_Chart
- * @throws PHPExcel_Exception
+ * @return false|PHPExcel\Chart
+ * @throws PHPExcel\Exception
*/
public function getChartByIndex($index = null)
{
@@ -586,7 +588,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Return an array of the names of charts on this worksheet
*
* @return string[] The names of charts
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
public function getChartNames()
{
@@ -601,8 +603,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get a chart by name
*
* @param string $chartName Chart name
- * @return false|PHPExcel_Chart
- * @throws PHPExcel_Exception
+ * @return false|PHPExcel\Chart
+ * @throws PHPExcel\Exception
*/
public function getChartByName($chartName = '')
{
@@ -621,7 +623,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Refresh column dimensions
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function refreshColumnDimensions()
{
@@ -640,7 +642,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Refresh row dimensions
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function refreshRowDimensions()
{
@@ -682,7 +684,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Calculate widths for auto-size columns
*
* @param boolean $calculateMergeCells Calculate merge cell width
- * @return PHPExcel_Worksheet;
+ * @return PHPExcel\Worksheet;
*/
public function calculateColumnWidths($calculateMergeCells = false)
{
@@ -700,7 +702,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// build list of cells references that participate in a merge
$isMergeCell = array();
foreach ($this->getMergeCells() as $cells) {
- foreach (PHPExcel_Cell::extractAllCellReferencesInRange($cells) as $cellReference) {
+ foreach (Cell::extractAllCellReferencesInRange($cells) as $cellReference) {
$isMergeCell[$cellReference] = true;
}
}
@@ -713,14 +715,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (!isset($isMergeCell[$this->_cellCollection->getCurrentAddress()])) {
// Calculated value
// To formatted string
- $cellValue = PHPExcel_Style_NumberFormat::toFormattedString(
+ $cellValue = Style_NumberFormat::toFormattedString(
$cell->getCalculatedValue(),
$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode()
);
$autoSizes[$this->_cellCollection->getCurrentColumn()] = max(
(float) $autoSizes[$this->_cellCollection->getCurrentColumn()],
- (float)PHPExcel_Shared_Font::calculateColumnWidth(
+ (float) Shared_Font::calculateColumnWidth(
$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont(),
$cellValue,
$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getAlignment()->getTextRotation(),
@@ -744,7 +746,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get parent
*
- * @return PHPExcel
+ * @return PHPExcel\Workbook
*/
public function getParent() {
return $this->_parent;
@@ -753,10 +755,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Re-bind parent
*
- * @param PHPExcel $parent
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Workbook $parent
+ * @return PHPExcel\Worksheet
*/
- public function rebindParent(PHPExcel $parent) {
+ public function rebindParent(Workbook $parent) {
$namedRanges = $this->_parent->getNamedRanges();
foreach ($namedRanges as $namedRange) {
$parent->addNamedRange($namedRange);
@@ -789,7 +791,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* This should be left as the default true, unless you are
* certain that no formula cells on any worksheet contain
* references to this worksheet
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function setTitle($pValue = 'Worksheet', $updateFormulaCellReferences = true)
{
@@ -809,19 +811,19 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if ($this->_parent->sheetNameExists($pValue)) {
// Use name, but append with lowest possible integer
- if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
- $pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
+ if (Shared_String::CountCharacters($pValue) > 29) {
+ $pValue = Shared_String::Substring($pValue,0,29);
}
$i = 1;
while ($this->_parent->sheetNameExists($pValue . ' ' . $i)) {
++$i;
if ($i == 10) {
- if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
- $pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
+ if (Shared_String::CountCharacters($pValue) > 28) {
+ $pValue = Shared_String::Substring($pValue,0,28);
}
} elseif ($i == 100) {
- if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
- $pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
+ if (Shared_String::CountCharacters($pValue) > 27) {
+ $pValue = Shared_String::Substring($pValue,0,27);
}
}
}
@@ -838,10 +840,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if ($this->_parent) {
// New title
$newTitle = $this->getTitle();
- PHPExcel_Calculation::getInstance($this->_parent)
+ Calculation::getInstance($this->_parent)
->renameCalculationCacheForWorksheet($oldTitle, $newTitle);
if ($updateFormulaCellReferences)
- PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->_parent, $oldTitle, $newTitle);
+ ReferenceHelper::getInstance()->updateNamedFormulas($this->_parent, $oldTitle, $newTitle);
}
return $this;
@@ -860,9 +862,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set sheet state
*
* @param string $value Sheet state (visible, hidden, veryHidden)
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
- public function setSheetState($value = PHPExcel_Worksheet::SHEETSTATE_VISIBLE) {
+ public function setSheetState($value = Worksheet::SHEETSTATE_VISIBLE) {
$this->_sheetState = $value;
return $this;
}
@@ -870,7 +872,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get page setup
*
- * @return PHPExcel_Worksheet_PageSetup
+ * @return PHPExcel\Worksheet_PageSetup
*/
public function getPageSetup()
{
@@ -880,10 +882,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Set page setup
*
- * @param PHPExcel_Worksheet_PageSetup $pValue
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Worksheet_PageSetup $pValue
+ * @return PHPExcel\Worksheet
*/
- public function setPageSetup(PHPExcel_Worksheet_PageSetup $pValue)
+ public function setPageSetup(Worksheet_PageSetup $pValue)
{
$this->_pageSetup = $pValue;
return $this;
@@ -892,7 +894,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get page margins
*
- * @return PHPExcel_Worksheet_PageMargins
+ * @return PHPExcel\Worksheet_PageMargins
*/
public function getPageMargins()
{
@@ -902,10 +904,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Set page margins
*
- * @param PHPExcel_Worksheet_PageMargins $pValue
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Worksheet_PageMargins $pValue
+ * @return PHPExcel\Worksheet
*/
- public function setPageMargins(PHPExcel_Worksheet_PageMargins $pValue)
+ public function setPageMargins(Worksheet_PageMargins $pValue)
{
$this->_pageMargins = $pValue;
return $this;
@@ -914,7 +916,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get page header/footer
*
- * @return PHPExcel_Worksheet_HeaderFooter
+ * @return PHPExcel\Worksheet_HeaderFooter
*/
public function getHeaderFooter()
{
@@ -924,10 +926,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Set page header/footer
*
- * @param PHPExcel_Worksheet_HeaderFooter $pValue
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Worksheet_HeaderFooter $pValue
+ * @return PHPExcel\Worksheet
*/
- public function setHeaderFooter(PHPExcel_Worksheet_HeaderFooter $pValue)
+ public function setHeaderFooter(Worksheet_HeaderFooter $pValue)
{
$this->_headerFooter = $pValue;
return $this;
@@ -936,7 +938,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get sheet view
*
- * @return PHPExcel_Worksheet_SheetView
+ * @return PHPExcel\Worksheet_SheetView
*/
public function getSheetView()
{
@@ -946,10 +948,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Set sheet view
*
- * @param PHPExcel_Worksheet_SheetView $pValue
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Worksheet_SheetView $pValue
+ * @return PHPExcel\Worksheet
*/
- public function setSheetView(PHPExcel_Worksheet_SheetView $pValue)
+ public function setSheetView(Worksheet_SheetView $pValue)
{
$this->_sheetView = $pValue;
return $this;
@@ -958,7 +960,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get Protection
*
- * @return PHPExcel_Worksheet_Protection
+ * @return PHPExcel\Worksheet_Protection
*/
public function getProtection()
{
@@ -968,10 +970,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Set Protection
*
- * @param PHPExcel_Worksheet_Protection $pValue
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Worksheet_Protection $pValue
+ * @return PHPExcel\Worksheet
*/
- public function setProtection(PHPExcel_Worksheet_Protection $pValue)
+ public function setProtection(Worksheet_Protection $pValue)
{
$this->_protection = $pValue;
$this->_dirty = true;
@@ -1035,7 +1037,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param string $pCoordinate Coordinate of the cell
* @param mixed $pValue Value of the cell
* @param bool $returnCell Return the worksheet (false, default) or the cell (true)
- * @return PHPExcel_Worksheet|PHPExcel_Cell Depending on the last parameter being specified
+ * @return PHPExcel\Worksheet|PHPExcel\Cell Depending on the last parameter being specified
*/
public function setCellValue($pCoordinate = 'A1', $pValue = null, $returnCell = false)
{
@@ -1046,11 +1048,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Set a cell value by using numeric cell coordinates
*
- * @param string $pColumn Numeric column coordinate of the cell (A = 0)
- * @param string $pRow Numeric row coordinate of the cell
- * @param mixed $pValue Value of the cell
- * @param bool $returnCell Return the worksheet (false, default) or the cell (true)
- * @return PHPExcel_Worksheet|PHPExcel_Cell Depending on the last parameter being specified
+ * @param string $pColumn Numeric column coordinate of the cell (A = 0)
+ * @param string $pRow Numeric row coordinate of the cell
+ * @param mixed $pValue Value of the cell
+ * @param bool $returnCell Return the worksheet (false, default) or the cell (true)
+ * @return PHPExcel\Worksheet|PHPExcel\Cell Depending on the last parameter being specified
*/
public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $returnCell = false)
{
@@ -1065,9 +1067,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param mixed $pValue Value of the cell
* @param string $pDataType Explicit data type
* @param bool $returnCell Return the worksheet (false, default) or the cell (true)
- * @return PHPExcel_Worksheet|PHPExcel_Cell Depending on the last parameter being specified
+ * @return PHPExcel\Worksheet|PHPExcel\Cell Depending on the last parameter being specified
*/
- public function setCellValueExplicit($pCoordinate = 'A1', $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
+ public function setCellValueExplicit($pCoordinate = 'A1', $pValue = null, $pDataType = Cell_DataType::TYPE_STRING, $returnCell = false)
{
// Set value
$cell = $this->getCell($pCoordinate)->setValueExplicit($pValue, $pDataType);
@@ -1082,9 +1084,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param mixed $pValue Value of the cell
* @param string $pDataType Explicit data type
* @param bool $returnCell Return the worksheet (false, default) or the cell (true)
- * @return PHPExcel_Worksheet|PHPExcel_Cell Depending on the last parameter being specified
+ * @return PHPExcel\Worksheet|PHPExcel\Cell Depending on the last parameter being specified
*/
- public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
+ public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = Cell_DataType::TYPE_STRING, $returnCell = false)
{
$cell = $this->getCellByColumnAndRow($pColumn, $pRow)->setValueExplicit($pValue, $pDataType);
return ($returnCell) ? $cell : $this;
@@ -1094,8 +1096,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get cell at a specific coordinate
*
* @param string $pCoordinate Coordinate of the cell
- * @throws PHPExcel_Exception
- * @return PHPExcel_Cell Cell that was found
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Cell Cell that was found
*/
public function getCell($pCoordinate = 'A1')
{
@@ -1106,14 +1108,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// Worksheet reference?
if (strpos($pCoordinate, '!') !== false) {
- $worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
+ $worksheetReference = Worksheet::extractSheetTitle($pCoordinate, true);
return $this->_parent->getSheetByName($worksheetReference[0])->getCell($worksheetReference[1]);
}
// Named range?
- if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
- (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
- $namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
+ if ((!preg_match('/^'.Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
+ (preg_match('/^'.Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
+ $namedRange = NamedRange::resolveRange($pCoordinate, $this);
if ($namedRange !== NULL) {
$pCoordinate = $namedRange->getRange();
return $namedRange->getWorksheet()->getCell($pCoordinate);
@@ -1124,9 +1126,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$pCoordinate = strtoupper($pCoordinate);
if (strpos($pCoordinate, ':') !== false || strpos($pCoordinate, ',') !== false) {
- throw new PHPExcel_Exception('Cell coordinate can not be a range of cells.');
+ throw new Exception('Cell coordinate can not be a range of cells.');
} elseif (strpos($pCoordinate, '$') !== false) {
- throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
+ throw new Exception('Cell coordinate must not be absolute.');
}
// Create new cell object
@@ -1138,11 +1140,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param string $pColumn Numeric column coordinate of the cell
* @param string $pRow Numeric row coordinate of the cell
- * @return PHPExcel_Cell Cell that was found
+ * @return PHPExcel\Cell Cell that was found
*/
public function getCellByColumnAndRow($pColumn = 0, $pRow = 1)
{
- $columnLetter = PHPExcel_Cell::stringFromColumnIndex($pColumn);
+ $columnLetter = Cell::stringFromColumnIndex($pColumn);
$coordinate = $columnLetter . $pRow;
if ($this->_cellCollection->isDataSet($coordinate)) {
@@ -1156,23 +1158,23 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Create a new cell at the specified coordinate
*
* @param string $pCoordinate Coordinate of the cell
- * @return PHPExcel_Cell Cell that was created
+ * @return PHPExcel\Cell Cell that was created
*/
private function _createNewCell($pCoordinate)
{
$cell = $this->_cellCollection->addCacheData(
$pCoordinate,
- new PHPExcel_Cell(
+ new Cell(
NULL,
- PHPExcel_Cell_DataType::TYPE_NULL,
+ Cell_DataType::TYPE_NULL,
$this
)
);
$this->_cellCollectionIsSorted = false;
// Coordinates
- $aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
- if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0]))
+ $aCoordinates = Cell::coordinateFromString($pCoordinate);
+ if (Cell::columnIndexFromString($this->_cachedHighestColumn) < Cell::columnIndexFromString($aCoordinates[0]))
$this->_cachedHighestColumn = $aCoordinates[0];
$this->_cachedHighestRow = max($this->_cachedHighestRow, $aCoordinates[1]);
@@ -1196,28 +1198,28 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Does the cell at a specific coordinate exist?
*
* @param string $pCoordinate Coordinate of the cell
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
* @return boolean
*/
public function cellExists($pCoordinate = 'A1')
{
// Worksheet reference?
if (strpos($pCoordinate, '!') !== false) {
- $worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
+ $worksheetReference = self::extractSheetTitle($pCoordinate, true);
return $this->_parent->getSheetByName($worksheetReference[0])->cellExists($worksheetReference[1]);
}
// Named range?
- if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
- (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
- $namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
+ if ((!preg_match('/^'.Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
+ (preg_match('/^'.Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
+ $namedRange = NamedRange::resolveRange($pCoordinate, $this);
if ($namedRange !== NULL) {
$pCoordinate = $namedRange->getRange();
if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
if (!$namedRange->getLocalOnly()) {
return $namedRange->getWorksheet()->cellExists($pCoordinate);
} else {
- throw new PHPExcel_Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
+ throw new Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
}
}
}
@@ -1228,12 +1230,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$pCoordinate = strtoupper($pCoordinate);
if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
- throw new PHPExcel_Exception('Cell coordinate can not be a range of cells.');
+ throw new Exception('Cell coordinate can not be a range of cells.');
} elseif (strpos($pCoordinate,'$') !== false) {
- throw new PHPExcel_Exception('Cell coordinate must not be absolute.');
+ throw new Exception('Cell coordinate must not be absolute.');
} else {
// Coordinates
- $aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
+ $aCoordinates = Cell::coordinateFromString($pCoordinate);
// Cell exists?
return $this->_cellCollection->isDataSet($pCoordinate);
@@ -1249,14 +1251,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*/
public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1)
{
- return $this->cellExists(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+ return $this->cellExists(Cell::stringFromColumnIndex($pColumn) . $pRow);
}
/**
* Get row dimension at a specific row
*
* @param int $pRow Numeric index of the row
- * @return PHPExcel_Worksheet_RowDimension
+ * @return PHPExcel\Worksheet_RowDimension
*/
public function getRowDimension($pRow = 1, $create = TRUE)
{
@@ -1267,7 +1269,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (!isset($this->_rowDimensions[$pRow])) {
if (!$create)
return NULL;
- $this->_rowDimensions[$pRow] = new PHPExcel_Worksheet_RowDimension($pRow);
+ $this->_rowDimensions[$pRow] = new Worksheet_RowDimension($pRow);
$this->_cachedHighestRow = max($this->_cachedHighestRow,$pRow);
}
@@ -1278,7 +1280,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get column dimension at a specific column
*
* @param string $pColumn String index of the column
- * @return PHPExcel_Worksheet_ColumnDimension
+ * @return PHPExcel\Worksheet_ColumnDimension
*/
public function getColumnDimension($pColumn = 'A', $create = TRUE)
{
@@ -1289,9 +1291,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (!isset($this->_columnDimensions[$pColumn])) {
if (!$create)
return NULL;
- $this->_columnDimensions[$pColumn] = new PHPExcel_Worksheet_ColumnDimension($pColumn);
+ $this->_columnDimensions[$pColumn] = new Worksheet_ColumnDimension($pColumn);
- if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn))
+ if (Cell::columnIndexFromString($this->_cachedHighestColumn) < Cell::columnIndexFromString($pColumn))
$this->_cachedHighestColumn = $pColumn;
}
return $this->_columnDimensions[$pColumn];
@@ -1301,17 +1303,17 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get column dimension at a specific column by using numeric cell coordinates
*
* @param string $pColumn Numeric column coordinate of the cell
- * @return PHPExcel_Worksheet_ColumnDimension
+ * @return PHPExcel\Worksheet_ColumnDimension
*/
public function getColumnDimensionByColumn($pColumn = 0)
{
- return $this->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($pColumn));
+ return $this->getColumnDimension(Cell::stringFromColumnIndex($pColumn));
}
/**
* Get styles
*
- * @return PHPExcel_Style[]
+ * @return PHPExcel\Style[]
*/
public function getStyles()
{
@@ -1322,8 +1324,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get default style of workbook.
*
* @deprecated
- * @return PHPExcel_Style
- * @throws PHPExcel_Exception
+ * @return PHPExcel\Style
+ * @throws PHPExcel\Exception
*/
public function getDefaultStyle()
{
@@ -1331,14 +1333,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
/**
- * Set default style - should only be used by PHPExcel_IReader implementations!
+ * Set default style - should only be used by PHPExcel\IReader implementations!
*
* @deprecated
- * @param PHPExcel_Style $pValue
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Style $pValue
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
- public function setDefaultStyle(PHPExcel_Style $pValue)
+ public function setDefaultStyle(Style $pValue)
{
$this->_parent->getDefaultStyle()->applyFromArray(array(
'font' => array(
@@ -1353,8 +1355,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get style for cell
*
* @param string $pCellCoordinate Cell coordinate to get style for
- * @return PHPExcel_Style
- * @throws PHPExcel_Exception
+ * @return PHPExcel\Style
+ * @throws PHPExcel\Exception
*/
public function getStyle($pCellCoordinate = 'A1')
{
@@ -1371,7 +1373,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get conditional styles for a cell
*
* @param string $pCoordinate
- * @return PHPExcel_Style_Conditional[]
+ * @return PHPExcel\Style_Conditional[]
*/
public function getConditionalStyles($pCoordinate = 'A1')
{
@@ -1399,7 +1401,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Removes conditional styles for a cell
*
* @param string $pCoordinate
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function removeConditionalStyles($pCoordinate = 'A1')
{
@@ -1421,8 +1423,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set conditional styles
*
* @param $pCoordinate string E.g. 'A1'
- * @param $pValue PHPExcel_Style_Conditional[]
- * @return PHPExcel_Worksheet
+ * @param $pValue PHPExcel\Style_Conditional[]
+ * @return PHPExcel\Worksheet
*/
public function setConditionalStyles($pCoordinate = 'A1', $pValue)
{
@@ -1435,11 +1437,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pColumn Numeric column coordinate of the cell
* @param int $pRow Numeric row coordinate of the cell
- * @return PHPExcel_Style
+ * @return PHPExcel\Style
*/
public function getStyleByColumnAndRow($pColumn = 0, $pRow = 1)
{
- return $this->getStyle(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+ return $this->getStyle(Cell::stringFromColumnIndex($pColumn) . $pRow);
}
/**
@@ -1448,12 +1450,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Please note that this will overwrite existing cell styles for cells in range!
*
* @deprecated
- * @param PHPExcel_Style $pSharedCellStyle Cell style to share
+ * @param PHPExcel\Style $pSharedCellStyle Cell style to share
* @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
- public function setSharedStyle(PHPExcel_Style $pSharedCellStyle = null, $pRange = '')
+ public function setSharedStyle(Style $pSharedCellStyle = null, $pRange = '')
{
$this->duplicateStyle($pSharedCellStyle, $pRange);
return $this;
@@ -1464,12 +1466,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* Please note that this will overwrite existing cell styles for cells in range!
*
- * @param PHPExcel_Style $pCellStyle Cell style to duplicate
+ * @param PHPExcel\Style $pCellStyle Cell style to duplicate
* @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
- public function duplicateStyle(PHPExcel_Style $pCellStyle = null, $pRange = '')
+ public function duplicateStyle(Style $pCellStyle = null, $pRange = '')
{
// make sure we have a real style and not supervisor
$style = $pCellStyle->getIsSupervisor() ? $pCellStyle->getSharedComponent() : $pCellStyle;
@@ -1499,12 +1501,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
// Calculate range outer borders
- $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
- $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB);
+ $rangeStart = Cell::coordinateFromString($rangeA);
+ $rangeEnd = Cell::coordinateFromString($rangeB);
// Translate column into index
- $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
- $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
+ $rangeStart[0] = Cell::columnIndexFromString($rangeStart[0]) - 1;
+ $rangeEnd[0] = Cell::columnIndexFromString($rangeEnd[0]) - 1;
// Make sure we can loop upwards on rows and columns
if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -1516,7 +1518,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// Loop through cells and apply styles
for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
- $this->getCell(PHPExcel_Cell::stringFromColumnIndex($col) . $row)->setXfIndex($xfIndex);
+ $this->getCell(Cell::stringFromColumnIndex($col) . $row)->setXfIndex($xfIndex);
}
}
@@ -1528,16 +1530,16 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* Please note that this will overwrite existing cell styles for cells in range!
*
- * @param array of PHPExcel_Style_Conditional $pCellStyle Cell style to duplicate
+ * @param array of PHPExcel\Style_Conditional $pCellStyle Cell style to duplicate
* @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function duplicateConditionalStyle(array $pCellStyle = null, $pRange = '')
{
foreach($pCellStyle as $cellStyle) {
- if (!($cellStyle instanceof PHPExcel_Style_Conditional)) {
- throw new PHPExcel_Exception('Style is not a conditional style');
+ if (!($cellStyle instanceof Style_Conditional)) {
+ throw new Exception('Style is not a conditional style');
}
}
@@ -1555,12 +1557,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
// Calculate range outer borders
- $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
- $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB);
+ $rangeStart = Cell::coordinateFromString($rangeA);
+ $rangeEnd = Cell::coordinateFromString($rangeB);
// Translate column into index
- $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
- $rangeEnd[0] = PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
+ $rangeStart[0] = Cell::columnIndexFromString($rangeStart[0]) - 1;
+ $rangeEnd[0] = Cell::columnIndexFromString($rangeEnd[0]) - 1;
// Make sure we can loop upwards on rows and columns
if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
@@ -1572,7 +1574,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// Loop through cells and apply styles
for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
- $this->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($col) . $row, $pCellStyle);
+ $this->setConditionalStyles(Cell::stringFromColumnIndex($col) . $row, $pCellStyle);
}
}
@@ -1590,8 +1592,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param array $pStyles Array containing style information
* @param string $pRange Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
* @param boolean $pAdvanced Advanced mode for setting borders.
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function duplicateStyleArray($pStyles = null, $pRange = '', $pAdvanced = true)
{
@@ -1603,17 +1605,17 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set break on a cell
*
* @param string $pCell Cell coordinate (e.g. A1)
- * @param int $pBreak Break type (type of PHPExcel_Worksheet::BREAK_*)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @param int $pBreak Break type (type of PHPExcel\Worksheet::BREAK_*)
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
- public function setBreak($pCell = 'A1', $pBreak = PHPExcel_Worksheet::BREAK_NONE)
+ public function setBreak($pCell = 'A1', $pBreak = self::BREAK_NONE)
{
// Uppercase coordinate
$pCell = strtoupper($pCell);
if ($pCell != '') {
- if ($pBreak == PHPExcel_Worksheet::BREAK_NONE) {
+ if ($pBreak == self::BREAK_NONE) {
if (isset($this->_breaks[$pCell])) {
unset($this->_breaks[$pCell]);
}
@@ -1621,7 +1623,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$this->_breaks[$pCell] = $pBreak;
}
} else {
- throw new PHPExcel_Exception('No cell coordinate specified.');
+ throw new Exception('No cell coordinate specified.');
}
return $this;
@@ -1632,12 +1634,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param integer $pColumn Numeric column coordinate of the cell
* @param integer $pRow Numeric row coordinate of the cell
- * @param integer $pBreak Break type (type of PHPExcel_Worksheet::BREAK_*)
- * @return PHPExcel_Worksheet
+ * @param integer $pBreak Break type (type of PHPExcel\Worksheet::BREAK_*)
+ * @return PHPExcel\Worksheet
*/
- public function setBreakByColumnAndRow($pColumn = 0, $pRow = 1, $pBreak = PHPExcel_Worksheet::BREAK_NONE)
+ public function setBreakByColumnAndRow($pColumn = 0, $pRow = 1, $pBreak = Worksheet::BREAK_NONE)
{
- return $this->setBreak(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow, $pBreak);
+ return $this->setBreak(Cell::stringFromColumnIndex($pColumn) . $pRow, $pBreak);
}
/**
@@ -1654,8 +1656,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set merge on a cell range
*
* @param string $pRange Cell range (e.g. A1:E1)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function mergeCells($pRange = 'A1:A1')
{
@@ -1668,22 +1670,22 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// make sure cells are created
// get the cells in the range
- $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
+ $aReferences = Cell::extractAllCellReferencesInRange($pRange);
// create upper left cell if it does not already exist
$upperLeft = $aReferences[0];
if (!$this->cellExists($upperLeft)) {
- $this->getCell($upperLeft)->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
+ $this->getCell($upperLeft)->setValueExplicit(null, Cell_DataType::TYPE_NULL);
}
// create or blank out the rest of the cells in the range
$count = count($aReferences);
for ($i = 1; $i < $count; $i++) {
- $this->getCell($aReferences[$i])->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
+ $this->getCell($aReferences[$i])->setValueExplicit(null, Cell_DataType::TYPE_NULL);
}
} else {
- throw new PHPExcel_Exception('Merge must be set on a range of cells.');
+ throw new Exception('Merge must be set on a range of cells.');
}
return $this;
@@ -1696,12 +1698,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow1 Numeric row coordinate of the first cell
* @param int $pColumn2 Numeric column coordinate of the last cell
* @param int $pRow2 Numeric row coordinate of the last cell
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function mergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
{
- $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+ $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2;
return $this->mergeCells($cellRange);
}
@@ -1709,8 +1711,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Remove merge on a cell range
*
* @param string $pRange Cell range (e.g. A1:E1)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function unmergeCells($pRange = 'A1:A1')
{
@@ -1721,10 +1723,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (isset($this->_mergeCells[$pRange])) {
unset($this->_mergeCells[$pRange]);
} else {
- throw new PHPExcel_Exception('Cell range ' . $pRange . ' not known as merged.');
+ throw new Exception('Cell range ' . $pRange . ' not known as merged.');
}
} else {
- throw new PHPExcel_Exception('Merge can only be removed from a range of cells.');
+ throw new Exception('Merge can only be removed from a range of cells.');
}
return $this;
@@ -1737,12 +1739,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow1 Numeric row coordinate of the first cell
* @param int $pColumn2 Numeric column coordinate of the last cell
* @param int $pRow2 Numeric row coordinate of the last cell
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function unmergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
{
- $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+ $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2;
return $this->unmergeCells($cellRange);
}
@@ -1775,8 +1777,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1)
* @param string $pPassword Password to unlock the protection
* @param boolean $pAlreadyHashed If the password has already been hashed, set this to true
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function protectCells($pRange = 'A1', $pPassword = '', $pAlreadyHashed = false)
{
@@ -1784,7 +1786,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$pRange = strtoupper($pRange);
if (!$pAlreadyHashed) {
- $pPassword = PHPExcel_Shared_PasswordHasher::hashPassword($pPassword);
+ $pPassword = Shared_PasswordHasher::hashPassword($pPassword);
}
$this->_protectedCells[$pRange] = $pPassword;
@@ -1800,12 +1802,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow2 Numeric row coordinate of the last cell
* @param string $pPassword Password to unlock the protection
* @param boolean $pAlreadyHashed If the password has already been hashed, set this to true
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function protectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
{
- $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+ $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2;
return $this->protectCells($cellRange, $pPassword, $pAlreadyHashed);
}
@@ -1813,8 +1815,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Remove protection on a cell range
*
* @param string $pRange Cell (e.g. A1) or cell range (e.g. A1:E1)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function unprotectCells($pRange = 'A1')
{
@@ -1824,7 +1826,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (isset($this->_protectedCells[$pRange])) {
unset($this->_protectedCells[$pRange]);
} else {
- throw new PHPExcel_Exception('Cell range ' . $pRange . ' not known as protected.');
+ throw new Exception('Cell range ' . $pRange . ' not known as protected.');
}
return $this;
}
@@ -1838,12 +1840,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param int $pRow2 Numeric row coordinate of the last cell
* @param string $pPassword Password to unlock the protection
* @param boolean $pAlreadyHashed If the password has already been hashed, set this to true
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function unprotectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
{
- $cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
+ $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2;
return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed);
}
@@ -1860,7 +1862,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get Autofilter
*
- * @return PHPExcel_Worksheet_AutoFilter
+ * @return PHPExcel\Worksheet_AutoFilter
*/
public function getAutoFilter()
{
@@ -1870,16 +1872,16 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Set AutoFilter
*
- * @param PHPExcel_Worksheet_AutoFilter|string $pValue
+ * @param PHPExcel\Worksheet_AutoFilter|string $pValue
* A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function setAutoFilter($pValue)
{
if (is_string($pValue)) {
$this->_autoFilter->setRange($pValue);
- } elseif(is_object($pValue) && ($pValue instanceof PHPExcel_Worksheet_AutoFilter)) {
+ } elseif(is_object($pValue) && ($pValue instanceof Worksheet_AutoFilter)) {
$this->_autoFilter = $pValue;
}
return $this;
@@ -1892,22 +1894,22 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param integer $pRow1 Numeric row coordinate of the first cell
* @param integer $pColumn2 Numeric column coordinate of the second cell
* @param integer $pRow2 Numeric row coordinate of the second cell
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function setAutoFilterByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
{
return $this->setAutoFilter(
- PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1
+ Cell::stringFromColumnIndex($pColumn1) . $pRow1
. ':' .
- PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2
+ Cell::stringFromColumnIndex($pColumn2) . $pRow2
);
}
/**
* Remove autofilter
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function removeAutoFilter()
{
@@ -1934,8 +1936,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* B1 will freeze the columns to the left of cell B1 (i.e column A)
* B2 will freeze the rows above and to the left of cell A2
* (i.e row 1 and column A)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function freezePane($pCell = '')
{
@@ -1945,7 +1947,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if (strpos($pCell,':') === false && strpos($pCell,',') === false) {
$this->_freezePane = $pCell;
} else {
- throw new PHPExcel_Exception('Freeze pane can not be set on a range of cells.');
+ throw new Exception('Freeze pane can not be set on a range of cells.');
}
return $this;
}
@@ -1955,18 +1957,18 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pColumn Numeric column coordinate of the cell
* @param int $pRow Numeric row coordinate of the cell
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function freezePaneByColumnAndRow($pColumn = 0, $pRow = 1)
{
- return $this->freezePane(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+ return $this->freezePane(Cell::stringFromColumnIndex($pColumn) . $pRow);
}
/**
* Unfreeze Pane
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function unfreezePane()
{
@@ -1978,15 +1980,15 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pBefore Insert before this one
* @param int $pNumRows Number of rows to insert
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function insertNewRowBefore($pBefore = 1, $pNumRows = 1) {
if ($pBefore >= 1) {
- $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
+ $objReferenceHelper = ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
} else {
- throw new PHPExcel_Exception("Rows can only be inserted before at least row 1.");
+ throw new Exception("Rows can only be inserted before at least row 1.");
}
return $this;
}
@@ -1996,15 +1998,15 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pBefore Insert before this one
* @param int $pNumCols Number of columns to insert
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1) {
if (!is_numeric($pBefore)) {
- $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
+ $objReferenceHelper = ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
} else {
- throw new PHPExcel_Exception("Column references should not be numeric.");
+ throw new Exception("Column references should not be numeric.");
}
return $this;
}
@@ -2014,14 +2016,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pBefore Insert before this one (numeric column coordinate of the cell)
* @param int $pNumCols Number of columns to insert
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function insertNewColumnBeforeByIndex($pBefore = 0, $pNumCols = 1) {
if ($pBefore >= 0) {
- return $this->insertNewColumnBefore(PHPExcel_Cell::stringFromColumnIndex($pBefore), $pNumCols);
+ return $this->insertNewColumnBefore(Cell::stringFromColumnIndex($pBefore), $pNumCols);
} else {
- throw new PHPExcel_Exception("Columns can only be inserted before at least column A (0).");
+ throw new Exception("Columns can only be inserted before at least column A (0).");
}
}
@@ -2030,15 +2032,15 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pRow Remove starting with this one
* @param int $pNumRows Number of rows to remove
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function removeRow($pRow = 1, $pNumRows = 1) {
if ($pRow >= 1) {
- $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
+ $objReferenceHelper = ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
} else {
- throw new PHPExcel_Exception("Rows to be deleted should at least start from row 1.");
+ throw new Exception("Rows to be deleted should at least start from row 1.");
}
return $this;
}
@@ -2048,16 +2050,16 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pColumn Remove starting with this one
* @param int $pNumCols Number of columns to remove
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function removeColumn($pColumn = 'A', $pNumCols = 1) {
if (!is_numeric($pColumn)) {
- $pColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($pColumn) - 1 + $pNumCols);
- $objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
+ $pColumn = Cell::stringFromColumnIndex(Cell::columnIndexFromString($pColumn) - 1 + $pNumCols);
+ $objReferenceHelper = ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
} else {
- throw new PHPExcel_Exception("Column references should not be numeric.");
+ throw new Exception("Column references should not be numeric.");
}
return $this;
}
@@ -2067,14 +2069,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pColumn Remove starting with this one (numeric column coordinate of the cell)
* @param int $pNumCols Number of columns to remove
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function removeColumnByIndex($pColumn = 0, $pNumCols = 1) {
if ($pColumn >= 0) {
- return $this->removeColumn(PHPExcel_Cell::stringFromColumnIndex($pColumn), $pNumCols);
+ return $this->removeColumn(Cell::stringFromColumnIndex($pColumn), $pNumCols);
} else {
- throw new PHPExcel_Exception("Columns to be deleted should at least start from column 0");
+ throw new Exception("Columns to be deleted should at least start from column 0");
}
}
@@ -2091,7 +2093,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set show gridlines
*
* @param boolean $pValue Show gridlines (true/false)
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function setShowGridlines($pValue = false) {
$this->_showGridlines = $pValue;
@@ -2111,7 +2113,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set print gridlines
*
* @param boolean $pValue Print gridlines (true/false)
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function setPrintGridlines($pValue = false) {
$this->_printGridlines = $pValue;
@@ -2131,7 +2133,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set show row and column headers
*
* @param boolean $pValue Show row and column headers (true/false)
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function setShowRowColHeaders($pValue = false) {
$this->_showRowColHeaders = $pValue;
@@ -2151,7 +2153,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set show summary below
*
* @param boolean $pValue Show summary below (true/false)
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function setShowSummaryBelow($pValue = true) {
$this->_showSummaryBelow = $pValue;
@@ -2171,7 +2173,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set show summary right
*
* @param boolean $pValue Show summary right (true/false)
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function setShowSummaryRight($pValue = true) {
$this->_showSummaryRight = $pValue;
@@ -2181,7 +2183,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get comments
*
- * @return PHPExcel_Comment[]
+ * @return PHPExcel\Comment[]
*/
public function getComments()
{
@@ -2191,8 +2193,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Set comments array for the entire sheet.
*
- * @param array of PHPExcel_Comment
- * @return PHPExcel_Worksheet
+ * @param array of PHPExcel\Comment
+ * @return PHPExcel\Worksheet
*/
public function setComments($pValue = array())
{
@@ -2205,8 +2207,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get comment for cell
*
* @param string $pCellCoordinate Cell coordinate to get comment for
- * @return PHPExcel_Comment
- * @throws PHPExcel_Exception
+ * @return PHPExcel\Comment
+ * @throws PHPExcel\Exception
*/
public function getComment($pCellCoordinate = 'A1')
{
@@ -2214,18 +2216,18 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$pCellCoordinate = strtoupper($pCellCoordinate);
if (strpos($pCellCoordinate,':') !== false || strpos($pCellCoordinate,',') !== false) {
- throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells.');
+ throw new Exception('Cell coordinate string can not be a range of cells.');
} else if (strpos($pCellCoordinate,'$') !== false) {
- throw new PHPExcel_Exception('Cell coordinate string must not be absolute.');
+ throw new Exception('Cell coordinate string must not be absolute.');
} else if ($pCellCoordinate == '') {
- throw new PHPExcel_Exception('Cell coordinate can not be zero-length string.');
+ throw new Exception('Cell coordinate can not be zero-length string.');
} else {
// Check if we already have a comment for this cell.
// If not, create a new comment.
if (isset($this->_comments[$pCellCoordinate])) {
return $this->_comments[$pCellCoordinate];
} else {
- $newComment = new PHPExcel_Comment();
+ $newComment = new Comment();
$this->_comments[$pCellCoordinate] = $newComment;
return $newComment;
}
@@ -2237,11 +2239,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pColumn Numeric column coordinate of the cell
* @param int $pRow Numeric row coordinate of the cell
- * @return PHPExcel_Comment
+ * @return PHPExcel\Comment
*/
public function getCommentByColumnAndRow($pColumn = 0, $pRow = 1)
{
- return $this->getComment(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+ return $this->getComment(PHPExcel\Cell::stringFromColumnIndex($pColumn) . $pRow);
}
/**
@@ -2279,7 +2281,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Selected cell
*
* @param string $pCoordinate Cell (i.e. A1)
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function setSelectedCell($pCoordinate = 'A1')
{
@@ -2290,8 +2292,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Select a range of cells.
*
* @param string $pCoordinate Cell range, examples: 'A1', 'B2:G5', 'A:C', '3:6'
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function setSelectedCells($pCoordinate = 'A1')
{
@@ -2311,7 +2313,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$pCoordinate = preg_replace('/^([0-9]+):([0-9]+)$/', 'A${1}:XFD${2}', $pCoordinate);
if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
- list($first, ) = PHPExcel_Cell::splitRange($pCoordinate);
+ list($first, ) = Cell::splitRange($pCoordinate);
$this->_activeCell = $first[0];
} else {
$this->_activeCell = $pCoordinate;
@@ -2325,12 +2327,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*
* @param int $pColumn Numeric column coordinate of the cell
* @param int $pRow Numeric row coordinate of the cell
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function setSelectedCellByColumnAndRow($pColumn = 0, $pRow = 1)
{
- return $this->setSelectedCells(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
+ return $this->setSelectedCells(Cell::stringFromColumnIndex($pColumn) . $pRow);
}
/**
@@ -2346,7 +2348,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set right-to-left
*
* @param boolean $value Right-to-left true/false
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function setRightToLeft($value = false) {
$this->_rightToLeft = $value;
@@ -2360,8 +2362,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param mixed $nullValue Value in source array that stands for blank cell
* @param string $startCell Insert array starting from this cell address as the top left coordinate
* @param boolean $strictNullComparison Apply strict comparison when testing for null values in the array
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet
*/
public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false) {
if (is_array($source)) {
@@ -2371,7 +2373,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
// start coordinate
- list ($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($startCell);
+ list ($startColumn, $startRow) = Cell::coordinateFromString($startCell);
// Loop through $source
foreach ($source as $rowData) {
@@ -2393,7 +2395,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
++$startRow;
}
} else {
- throw new PHPExcel_Exception("Parameter \$source should be an array.");
+ throw new Exception("Parameter \$source should be an array.");
}
return $this;
}
@@ -2413,10 +2415,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// Returnvalue
$returnValue = array();
// Identify the range that we need to extract from the worksheet
- list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
- $minCol = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] -1);
+ list($rangeStart, $rangeEnd) = Cell::rangeBoundaries($pRange);
+ $minCol = Cell::stringFromColumnIndex($rangeStart[0] -1);
$minRow = $rangeStart[1];
- $maxCol = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] -1);
+ $maxCol = Cell::stringFromColumnIndex($rangeEnd[0] -1);
$maxRow = $rangeEnd[1];
$maxCol++;
@@ -2434,7 +2436,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// Cell exists
$cell = $this->_cellCollection->getCacheData($col.$row);
if ($cell->getValue() !== null) {
- if ($cell->getValue() instanceof PHPExcel_RichText) {
+ if ($cell->getValue() instanceof RichText) {
$returnValue[$rRef][$cRef] = $cell->getValue()->getPlainText();
} else {
if ($calculateFormulas) {
@@ -2446,11 +2448,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if ($formatData) {
$style = $this->_parent->getCellXfByIndex($cell->getXfIndex());
- $returnValue[$rRef][$cRef] = PHPExcel_Style_NumberFormat::toFormattedString(
+ $returnValue[$rRef][$cRef] = Style_NumberFormat::toFormattedString(
$returnValue[$rRef][$cRef],
($style->getNumberFormat()) ?
$style->getNumberFormat()->getFormatCode() :
- PHPExcel_Style_NumberFormat::FORMAT_GENERAL
+ Style_NumberFormat::FORMAT_GENERAL
);
}
} else {
@@ -2479,10 +2481,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* @param boolean $returnCellRef False - Return a simple array of rows and columns indexed by number counting from zero
* True - Return rows and columns indexed by their actual row and column IDs
* @return array
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
*/
public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
- $namedRange = PHPExcel_NamedRange::resolveRange($pNamedRange, $this);
+ $namedRange = NamedRange::resolveRange($pNamedRange, $this);
if ($namedRange !== NULL) {
$pWorkSheet = $namedRange->getWorksheet();
$pCellRange = $namedRange->getRange();
@@ -2491,7 +2493,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
$nullValue, $calculateFormulas, $formatData, $returnCellRef);
}
- throw new PHPExcel_Exception('Named Range '.$pNamedRange.' does not exist.');
+ throw new Exception('Named Range '.$pNamedRange.' does not exist.');
}
@@ -2521,16 +2523,16 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Get row iterator
*
* @param integer $startRow The row number at which to start iterating
- * @return PHPExcel_Worksheet_RowIterator
+ * @return PHPExcel\Worksheet_RowIterator
*/
public function getRowIterator($startRow = 1) {
- return new PHPExcel_Worksheet_RowIterator($this,$startRow);
+ return new Worksheet_RowIterator($this,$startRow);
}
/**
* Run PHPExcel garabage collector.
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function garbageCollect() {
// Flush cache
@@ -2547,11 +2549,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
// Lookup highest column and highest row if cells are cleaned
$colRow = $this->_cellCollection->getHighestRowAndColumn();
$highestRow = $colRow['row'];
- $highestColumn = PHPExcel_Cell::columnIndexFromString($colRow['column']);
+ $highestColumn = Cell::columnIndexFromString($colRow['column']);
// Loop through column dimensions
foreach ($this->_columnDimensions as $dimension) {
- $highestColumn = max($highestColumn,PHPExcel_Cell::columnIndexFromString($dimension->getColumnIndex()));
+ $highestColumn = max($highestColumn,Cell::columnIndexFromString($dimension->getColumnIndex()));
}
// Loop through row dimensions
@@ -2563,7 +2565,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
if ($highestColumn < 0) {
$this->_cachedHighestColumn = 'A';
} else {
- $this->_cachedHighestColumn = PHPExcel_Cell::stringFromColumnIndex(--$highestColumn);
+ $this->_cachedHighestColumn = Cell::stringFromColumnIndex(--$highestColumn);
}
$this->_cachedHighestRow = $highestRow;
@@ -2626,7 +2628,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
// else create hyperlink
- $this->_hyperlinkCollection[$pCellCoordinate] = new PHPExcel_Cell_Hyperlink();
+ $this->_hyperlinkCollection[$pCellCoordinate] = new Cell_Hyperlink();
return $this->_hyperlinkCollection[$pCellCoordinate];
}
@@ -2634,10 +2636,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set hyperlnk
*
* @param string $pCellCoordinate Cell coordinate to insert hyperlink
- * @param PHPExcel_Cell_Hyperlink $pHyperlink
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Cell_Hyperlink $pHyperlink
+ * @return PHPExcel\Worksheet
*/
- public function setHyperlink($pCellCoordinate = 'A1', PHPExcel_Cell_Hyperlink $pHyperlink = null)
+ public function setHyperlink($pCellCoordinate = 'A1', Cell_Hyperlink $pHyperlink = null)
{
if ($pHyperlink === null) {
unset($this->_hyperlinkCollection[$pCellCoordinate]);
@@ -2661,7 +2663,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get collection of hyperlinks
*
- * @return PHPExcel_Cell_Hyperlink[]
+ * @return PHPExcel\Cell_Hyperlink[]
*/
public function getHyperlinkCollection()
{
@@ -2681,7 +2683,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
}
// else create data validation
- $this->_dataValidationCollection[$pCellCoordinate] = new PHPExcel_Cell_DataValidation();
+ $this->_dataValidationCollection[$pCellCoordinate] = new Cell_DataValidation();
return $this->_dataValidationCollection[$pCellCoordinate];
}
@@ -2689,10 +2691,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
* Set data validation
*
* @param string $pCellCoordinate Cell coordinate to insert data validation
- * @param PHPExcel_Cell_DataValidation $pDataValidation
- * @return PHPExcel_Worksheet
+ * @param PHPExcel\Cell_DataValidation $pDataValidation
+ * @return PHPExcel\Worksheet
*/
- public function setDataValidation($pCellCoordinate = 'A1', PHPExcel_Cell_DataValidation $pDataValidation = null)
+ public function setDataValidation($pCellCoordinate = 'A1', Cell_DataValidation $pDataValidation = null)
{
if ($pDataValidation === null) {
unset($this->_dataValidationCollection[$pCellCoordinate]);
@@ -2716,7 +2718,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get collection of data validations
*
- * @return PHPExcel_Cell_DataValidation[]
+ * @return PHPExcel\Cell_DataValidation[]
*/
public function getDataValidationCollection()
{
@@ -2732,15 +2734,15 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
public function shrinkRangeToFit($range) {
$maxCol = $this->getHighestColumn();
$maxRow = $this->getHighestRow();
- $maxCol = PHPExcel_Cell::columnIndexFromString($maxCol);
+ $maxCol = Cell::columnIndexFromString($maxCol);
$rangeBlocks = explode(' ',$range);
foreach ($rangeBlocks as &$rangeSet) {
- $rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($rangeSet);
+ $rangeBoundaries = Cell::getRangeBoundaries($rangeSet);
- if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[0][0]) > $maxCol) { $rangeBoundaries[0][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol); }
+ if (Cell::columnIndexFromString($rangeBoundaries[0][0]) > $maxCol) { $rangeBoundaries[0][0] = Cell::stringFromColumnIndex($maxCol); }
if ($rangeBoundaries[0][1] > $maxRow) { $rangeBoundaries[0][1] = $maxRow; }
- if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[1][0]) > $maxCol) { $rangeBoundaries[1][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol); }
+ if (Cell::columnIndexFromString($rangeBoundaries[1][0]) > $maxCol) { $rangeBoundaries[1][0] = Cell::stringFromColumnIndex($maxCol); }
if ($rangeBoundaries[1][1] > $maxRow) { $rangeBoundaries[1][1] = $maxRow; }
$rangeSet = $rangeBoundaries[0][0].$rangeBoundaries[0][1].':'.$rangeBoundaries[1][0].$rangeBoundaries[1][1];
}
@@ -2753,12 +2755,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Get tab color
*
- * @return PHPExcel_Style_Color
+ * @return PHPExcel\Style_Color
*/
public function getTabColor()
{
if ($this->_tabColor === NULL)
- $this->_tabColor = new PHPExcel_Style_Color();
+ $this->_tabColor = new Style_Color();
return $this->_tabColor;
}
@@ -2766,7 +2768,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Reset tab color
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function resetTabColor()
{
@@ -2789,7 +2791,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
/**
* Copy worksheet (!= clone!)
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function copy() {
$copied = clone $this;
@@ -2814,7 +2816,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
} elseif ($key == '_drawingCollection') {
$newCollection = clone $this->_drawingCollection;
$this->_drawingCollection = $newCollection;
- } elseif (($key == '_autoFilter') && ($this->_autoFilter instanceof PHPExcel_Worksheet_AutoFilter)) {
+ } elseif (($key == '_autoFilter') && ($this->_autoFilter instanceof Worksheet_AutoFilter)) {
$newAutoFilter = clone $this->_autoFilter;
$this->_autoFilter = $newAutoFilter;
$this->_autoFilter->setParent($this);
diff --git a/Classes/PHPExcel/Worksheet/AutoFilter.php b/Classes/PHPExcel/Worksheet/AutoFilter.php
index 3872d0e..522677c 100644
--- a/Classes/PHPExcel/Worksheet/AutoFilter.php
+++ b/Classes/PHPExcel/Worksheet/AutoFilter.php
@@ -19,26 +19,28 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_AutoFilter
+ * PHPExcel\Worksheet_AutoFilter
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_AutoFilter
+class Worksheet_AutoFilter
{
/**
* Autofilter Worksheet
*
- * @var PHPExcel_Worksheet
+ * @var PHPExcel\Worksheet
*/
private $_workSheet = NULL;
@@ -54,18 +56,18 @@ class PHPExcel_Worksheet_AutoFilter
/**
* Autofilter Column Ruleset
*
- * @var array of PHPExcel_Worksheet_AutoFilter_Column
+ * @var array of PHPExcel\Worksheet_AutoFilter_Column
*/
private $_columns = array();
/**
- * Create a new PHPExcel_Worksheet_AutoFilter
+ * Create a new PHPExcel\Worksheet_AutoFilter
*
* @param string $pRange Cell range (i.e. A1:E10)
- * @param PHPExcel_Worksheet $pSheet
+ * @param PHPExcel\Worksheet $pSheet
*/
- public function __construct($pRange = '', PHPExcel_Worksheet $pSheet = NULL)
+ public function __construct($pRange = '', Worksheet $pSheet = NULL)
{
$this->_range = $pRange;
$this->_workSheet = $pSheet;
@@ -74,7 +76,7 @@ class PHPExcel_Worksheet_AutoFilter
/**
* Get AutoFilter Parent Worksheet
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function getParent() {
return $this->_workSheet;
@@ -83,10 +85,10 @@ class PHPExcel_Worksheet_AutoFilter
/**
* Set AutoFilter Parent Worksheet
*
- * @param PHPExcel_Worksheet $pSheet
- * @return PHPExcel_Worksheet_AutoFilter
+ * @param PHPExcel\Worksheet $pSheet
+ * @return PHPExcel\Worksheet_AutoFilter
*/
- public function setParent(PHPExcel_Worksheet $pSheet = NULL) {
+ public function setParent(Worksheet $pSheet = NULL) {
$this->_workSheet = $pSheet;
return $this;
@@ -105,8 +107,8 @@ class PHPExcel_Worksheet_AutoFilter
* Set AutoFilter Range
*
* @param string $pRange Cell range (i.e. A1:E10)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter
*/
public function setRange($pRange = '') {
// Uppercase coordinate
@@ -120,7 +122,7 @@ class PHPExcel_Worksheet_AutoFilter
} elseif(empty($pRange)) {
$this->_range = '';
} else {
- throw new PHPExcel_Exception('Autofilter must be set on a range of cells.');
+ throw new Exception('Autofilter must be set on a range of cells.');
}
if (empty($pRange)) {
@@ -128,9 +130,9 @@ class PHPExcel_Worksheet_AutoFilter
$this->_columns = array();
} else {
// Discard any column rules that are no longer valid within this range
- list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
+ list($rangeStart,$rangeEnd) = Cell::rangeBoundaries($this->_range);
foreach($this->_columns as $key => $value) {
- $colIndex = PHPExcel_Cell::columnIndexFromString($key);
+ $colIndex = Cell::columnIndexFromString($key);
if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
unset($this->_columns[$key]);
}
@@ -143,8 +145,8 @@ class PHPExcel_Worksheet_AutoFilter
/**
* Get all AutoFilter Columns
*
- * @throws PHPExcel_Exception
- * @return array of PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return array of PHPExcel\Worksheet_AutoFilter_Column
*/
public function getColumns() {
return $this->_columns;
@@ -154,18 +156,18 @@ class PHPExcel_Worksheet_AutoFilter
* Validate that the specified column is in the AutoFilter range
*
* @param string $column Column name (e.g. A)
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
* @return integer The column offset within the autofilter range
*/
public function testColumnInRange($column) {
if (empty($this->_range)) {
- throw new PHPExcel_Exception("No autofilter range is defined.");
+ throw new Exception("No autofilter range is defined.");
}
- $columnIndex = PHPExcel_Cell::columnIndexFromString($column);
- list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
+ $columnIndex = Cell::columnIndexFromString($column);
+ list($rangeStart,$rangeEnd) = Cell::rangeBoundaries($this->_range);
if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
- throw new PHPExcel_Exception("Column is outside of current autofilter range.");
+ throw new Exception("Column is outside of current autofilter range.");
}
return $columnIndex - $rangeStart[0];
@@ -175,7 +177,7 @@ class PHPExcel_Worksheet_AutoFilter
* Get a specified AutoFilter Column Offset within the defined AutoFilter range
*
* @param string $pColumn Column name (e.g. A)
- * @throws PHPExcel_Exception
+ * @throws PHPExcel\Exception
* @return integer The offset of the specified column within the autofilter range
*/
public function getColumnOffset($pColumn) {
@@ -186,14 +188,14 @@ class PHPExcel_Worksheet_AutoFilter
* Get a specified AutoFilter Column
*
* @param string $pColumn Column name (e.g. A)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function getColumn($pColumn) {
$this->testColumnInRange($pColumn);
if (!isset($this->_columns[$pColumn])) {
- $this->_columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
+ $this->_columns[$pColumn] = new Worksheet_AutoFilter_Column($pColumn, $this);
}
return $this->_columns[$pColumn];
@@ -203,12 +205,12 @@ class PHPExcel_Worksheet_AutoFilter
* Get a specified AutoFilter Column by it's offset
*
* @param integer $pColumnOffset Column offset within range (starting from 0)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function getColumnByOffset($pColumnOffset = 0) {
- list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
- $pColumn = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $pColumnOffset - 1);
+ list($rangeStart,$rangeEnd) = Cell::rangeBoundaries($this->_range);
+ $pColumn = Cell::stringFromColumnIndex($rangeStart[0] + $pColumnOffset - 1);
return $this->getColumn($pColumn);
}
@@ -216,25 +218,25 @@ class PHPExcel_Worksheet_AutoFilter
/**
* Set AutoFilter
*
- * @param PHPExcel_Worksheet_AutoFilter_Column|string $pColumn
+ * @param PHPExcel\Worksheet_AutoFilter_Column|string $pColumn
* A simple string containing a Column ID like 'A' is permitted
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter
*/
public function setColumn($pColumn)
{
if ((is_string($pColumn)) && (!empty($pColumn))) {
$column = $pColumn;
- } elseif(is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
+ } elseif(is_object($pColumn) && ($pColumn instanceof Worksheet_AutoFilter_Column)) {
$column = $pColumn->getColumnIndex();
} else {
- throw new PHPExcel_Exception("Column is not within the autofilter range.");
+ throw new Exception("Column is not within the autofilter range.");
}
$this->testColumnInRange($column);
if (is_string($pColumn)) {
- $this->_columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
- } elseif(is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
+ $this->_columns[$pColumn] = new Worksheet_AutoFilter_Column($pColumn, $this);
+ } elseif(is_object($pColumn) && ($pColumn instanceof Worksheet_AutoFilter_Column)) {
$pColumn->setParent($this);
$this->_columns[$column] = $pColumn;
}
@@ -247,8 +249,8 @@ class PHPExcel_Worksheet_AutoFilter
* Clear a specified AutoFilter Column
*
* @param string $pColumn Column name (e.g. A)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter
*/
public function clearColumn($pColumn) {
$this->testColumnInRange($pColumn);
@@ -269,7 +271,7 @@ class PHPExcel_Worksheet_AutoFilter
*
* @param string $fromColumn Column name (e.g. A)
* @param string $toColumn Column name (e.g. B)
- * @return PHPExcel_Worksheet_AutoFilter
+ * @return PHPExcel\Worksheet_AutoFilter
*/
public function shiftColumn($fromColumn=NULL,$toColumn=NULL) {
$fromColumn = strtoupper($fromColumn);
@@ -322,7 +324,7 @@ class PHPExcel_Worksheet_AutoFilter
}
if (is_numeric($cellValue)) {
- $dateValue = PHPExcel_Shared_Date::ExcelToPHP($cellValue);
+ $dateValue = Shared_Date::ExcelToPHP($cellValue);
if ($cellValue < 1) {
// Just the time part
$dtVal = date('His',$dateValue);
@@ -365,36 +367,36 @@ class PHPExcel_Worksheet_AutoFilter
return FALSE;
}
}
- $returnVal = ($join == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
+ $returnVal = ($join == Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
foreach($dataSet as $rule) {
if (is_numeric($rule['value'])) {
// Numeric values are tested using the appropriate operator
switch ($rule['operator']) {
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
$retVal = ($cellValue == $rule['value']);
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
$retVal = ($cellValue != $rule['value']);
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN :
$retVal = ($cellValue > $rule['value']);
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL :
$retVal = ($cellValue >= $rule['value']);
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN :
$retVal = ($cellValue < $rule['value']);
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL :
$retVal = ($cellValue <= $rule['value']);
break;
}
} elseif($rule['value'] == '') {
switch ($rule['operator']) {
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
$retVal = (($cellValue == '') || ($cellValue === NULL));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
$retVal = (($cellValue != '') && ($cellValue !== NULL));
break;
default :
@@ -407,14 +409,14 @@ class PHPExcel_Worksheet_AutoFilter
}
// If there are multiple conditions, then we need to test both using the appropriate join operator
switch ($join) {
- case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR :
+ case Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR :
$returnVal = $returnVal || $retVal;
// Break as soon as we have a TRUE match for OR joins,
// to avoid unnecessary additional code execution
if ($returnVal)
return $returnVal;
break;
- case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND :
+ case Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND :
$returnVal = $returnVal && $retVal;
break;
}
@@ -438,7 +440,7 @@ class PHPExcel_Worksheet_AutoFilter
}
if (is_numeric($cellValue)) {
- $dateValue = date('m',PHPExcel_Shared_Date::ExcelToPHP($cellValue));
+ $dateValue = date('m',Shared_Date::ExcelToPHP($cellValue));
if (in_array($dateValue,$monthSet)) {
return TRUE;
}
@@ -460,95 +462,95 @@ class PHPExcel_Worksheet_AutoFilter
* Convert a dynamic rule daterange to a custom filter range expression for ease of calculation
*
* @param string $dynamicRuleType
- * @param PHPExcel_Worksheet_AutoFilter_Column &$filterColumn
+ * @param PHPExcel\Worksheet_AutoFilter_Column &$filterColumn
* @return mixed[]
*/
private function _dynamicFilterDateRange($dynamicRuleType, &$filterColumn)
{
- $rDateType = PHPExcel_Calculation_Functions::getReturnDateType();
- PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC);
+ $rDateType = Calculation_Functions::getReturnDateType();
+ Calculation_Functions::setReturnDateType(Calculation_Functions::RETURNDATE_PHP_NUMERIC);
$val = $maxVal = NULL;
$ruleValues = array();
- $baseDate = PHPExcel_Calculation_DateTime::DATENOW();
+ $baseDate = Calculation_DateTime::DATENOW();
// Calculate start/end dates for the required date range based on current date
switch ($dynamicRuleType) {
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
$baseDate = strtotime('-7 days',$baseDate);
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
$baseDate = strtotime('-7 days',$baseDate);
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
$baseDate = strtotime('-1 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
$baseDate = strtotime('+1 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
$baseDate = strtotime('-3 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
$baseDate = strtotime('+3 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
$baseDate = strtotime('-1 year',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
$baseDate = strtotime('+1 year',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
break;
}
switch ($dynamicRuleType) {
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
- $maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
- $val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate);
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
+ $maxVal = (int) Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
+ $val = (int) Shared_Date::PHPToExcel($baseDate);
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE :
- $maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
- $val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE :
+ $maxVal = (int) Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
+ $val = (int) Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
- $maxVal = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,31,12,date('Y',$baseDate)));
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
+ $maxVal = (int) Shared_Date::PHPToExcel(gmmktime(0,0,0,31,12,date('Y',$baseDate)));
++$maxVal;
- $val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
+ $val = (int) Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
$thisMonth = date('m',$baseDate);
$thisQuarter = floor(--$thisMonth / 3);
- $maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),(1+$thisQuarter)*3,date('Y',$baseDate)));
+ $maxVal = (int) Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),(1+$thisQuarter)*3,date('Y',$baseDate)));
++$maxVal;
- $val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1+$thisQuarter*3,date('Y',$baseDate)));
+ $val = (int) Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1+$thisQuarter*3,date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
- $maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),date('m',$baseDate),date('Y',$baseDate)));
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
+ $maxVal = (int) Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),date('m',$baseDate),date('Y',$baseDate)));
++$maxVal;
- $val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
+ $val = (int) Shared_Date::PHPToExcel(gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
$dayOfWeek = date('w',$baseDate);
- $val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate) - $dayOfWeek;
+ $val = (int) Shared_Date::PHPToExcel($baseDate) - $dayOfWeek;
$maxVal = $val + 7;
break;
}
switch ($dynamicRuleType) {
// Adjust Today dates for Yesterday and Tomorrow
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
--$maxVal;
--$val;
break;
- case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
+ case Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
++$maxVal;
++$val;
break;
@@ -561,30 +563,30 @@ class PHPExcel_Worksheet_AutoFilter
);
// Set the rules for identifying rows for hide/show
- $ruleValues[] = array( 'operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
+ $ruleValues[] = array( 'operator' => Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
'value' => $val
);
- $ruleValues[] = array( 'operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN,
+ $ruleValues[] = array( 'operator' => Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN,
'value' => $maxVal
);
- PHPExcel_Calculation_Functions::setReturnDateType($rDateType);
+ Calculation_Functions::setReturnDateType($rDateType);
return array(
'method' => '_filterTestInCustomDataSet',
'arguments' => array( 'filterRules' => $ruleValues,
- 'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND
+ 'join' => Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND
)
);
}
private function _calculateTopTenValue($columnID,$startRow,$endRow,$ruleType,$ruleValue) {
$range = $columnID.$startRow.':'.$columnID.$endRow;
- $dataValues = PHPExcel_Calculation_Functions::flattenArray(
+ $dataValues = Calculation_Functions::flattenArray(
$this->_workSheet->rangeToArray($range,NULL,TRUE,FALSE)
);
$dataValues = array_filter($dataValues);
- if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
+ if ($ruleType == Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
rsort($dataValues);
} else {
sort($dataValues);
@@ -596,12 +598,12 @@ class PHPExcel_Worksheet_AutoFilter
/**
* Apply the AutoFilter rules to the AutoFilter Range
*
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter
*/
public function showHideRows()
{
- list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
+ list($rangeStart,$rangeEnd) = Cell::rangeBoundaries($this->_range);
// The heading row should always be visible
// echo 'AutoFilter Heading Row ',$rangeStart[1],' is always SHOWN',PHP_EOL;
@@ -611,7 +613,7 @@ class PHPExcel_Worksheet_AutoFilter
foreach($this->_columns as $columnID => $filterColumn) {
$rules = $filterColumn->getRules();
switch ($filterColumn->getFilterType()) {
- case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER :
+ case Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER :
$ruleValues = array();
// Build a list of the filter value selections
foreach($rules as $rule) {
@@ -623,7 +625,7 @@ class PHPExcel_Worksheet_AutoFilter
$ruleDataSet = array_filter($ruleValues);
if (count($ruleValues) != count($ruleDataSet))
$blanks = TRUE;
- if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER) {
+ if ($ruleType == Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER) {
// Filter on absolute values
$columnFilterTests[$columnID] = array(
'method' => '_filterTestInSimpleDataSet',
@@ -636,24 +638,24 @@ class PHPExcel_Worksheet_AutoFilter
$arguments = array();
foreach($ruleDataSet as $ruleValue) {
$date = $time = '';
- if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
- ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== ''))
- $date .= sprintf('%04d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
- if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
- ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != ''))
- $date .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
- if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
- ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== ''))
- $date .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
- if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
- ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== ''))
- $time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
- if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
- ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== ''))
- $time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
- if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
- ($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== ''))
- $time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
+ if ((isset($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
+ ($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== ''))
+ $date .= sprintf('%04d',$ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
+ if ((isset($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
+ ($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != ''))
+ $date .= sprintf('%02d',$ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
+ if ((isset($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
+ ($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== ''))
+ $date .= sprintf('%02d',$ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
+ if ((isset($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
+ ($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== ''))
+ $time .= sprintf('%02d',$ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
+ if ((isset($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
+ ($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== ''))
+ $time .= sprintf('%02d',$ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
+ if ((isset($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
+ ($ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== ''))
+ $time .= sprintf('%02d',$ruleValue[Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
$dateTime = $date . $time;
$arguments['date'][] = $date;
$arguments['time'][] = $time;
@@ -671,7 +673,7 @@ class PHPExcel_Worksheet_AutoFilter
);
}
break;
- case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER :
+ case Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER :
$customRuleForBlanks = FALSE;
$ruleValues = array();
// Build a list of the filter value selections
@@ -700,28 +702,28 @@ class PHPExcel_Worksheet_AutoFilter
)
);
break;
- case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER :
+ case Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER :
$ruleValues = array();
foreach($rules as $rule) {
// We should only ever have one Dynamic Filter Rule anyway
$dynamicRuleType = $rule->getGrouping();
- if (($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
- ($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
+ if (($dynamicRuleType == Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
+ ($dynamicRuleType == Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
// Number (Average) based
// Calculate the average
$averageFormula = '=AVERAGE('.$columnID.($rangeStart[1]+1).':'.$columnID.$rangeEnd[1].')';
- $average = PHPExcel_Calculation::getInstance()->calculateFormula($averageFormula,NULL,$this->_workSheet->getCell('A1'));
+ $average = Calculation::getInstance()->calculateFormula($averageFormula,NULL,$this->_workSheet->getCell('A1'));
// Set above/below rule based on greaterThan or LessTan
- $operator = ($dynamicRuleType === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
- ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
- : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
+ $operator = ($dynamicRuleType === Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
+ ? Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
+ : Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
$ruleValues[] = array( 'operator' => $operator,
'value' => $average
);
$columnFilterTests[$columnID] = array(
'method' => '_filterTestInCustomDataSet',
'arguments' => array( 'filterRules' => $ruleValues,
- 'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
+ 'join' => Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
)
);
} else {
@@ -750,7 +752,7 @@ class PHPExcel_Worksheet_AutoFilter
}
}
break;
- case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER :
+ case Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER :
$ruleValues = array();
$dataRowCount = $rangeEnd[1] - $rangeStart[1];
foreach($rules as $rule) {
@@ -759,7 +761,7 @@ class PHPExcel_Worksheet_AutoFilter
$ruleValue = $rule->getValue();
$ruleOperator = $rule->getOperator();
}
- if ($ruleOperator === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
+ if ($ruleOperator === Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
$ruleValue = floor($ruleValue * ($dataRowCount / 100));
}
if ($ruleValue < 1) $ruleValue = 1;
@@ -767,16 +769,16 @@ class PHPExcel_Worksheet_AutoFilter
$maxVal = $this->_calculateTopTenValue($columnID,$rangeStart[1]+1,$rangeEnd[1],$toptenRuleType,$ruleValue);
- $operator = ($toptenRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
- ? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
- : PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
+ $operator = ($toptenRuleType == Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
+ ? Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
+ : Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
$ruleValues[] = array( 'operator' => $operator,
'value' => $maxVal
);
$columnFilterTests[$columnID] = array(
'method' => '_filterTestInCustomDataSet',
'arguments' => array( 'filterRules' => $ruleValues,
- 'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
+ 'join' => Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
)
);
$filterColumn->setAttributes(
@@ -800,7 +802,7 @@ class PHPExcel_Worksheet_AutoFilter
// Execute the filter test
$result = $result &&
call_user_func_array(
- array('PHPExcel_Worksheet_AutoFilter',$columnFilterTest['method']),
+ array(__NAMESPACE__ . '\Worksheet_AutoFilter',$columnFilterTest['method']),
array(
$cellValue,
$columnFilterTest['arguments']
@@ -834,7 +836,7 @@ class PHPExcel_Worksheet_AutoFilter
$this->{$key} = clone $value;
}
} elseif ((is_array($value)) && ($key == '_columns')) {
- // The columns array of PHPExcel_Worksheet_AutoFilter objects
+ // The columns array of PHPExcel\Worksheet_AutoFilter objects
$this->{$key} = array();
foreach ($value as $k => $v) {
$this->{$key}[$k] = clone $v;
diff --git a/Classes/PHPExcel/Worksheet/AutoFilter/Column.php b/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
index e43a333..b8e4b2a 100644
--- a/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
+++ b/Classes/PHPExcel/Worksheet/AutoFilter/Column.php
@@ -19,21 +19,23 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_AutoFilter_Column
+ * PHPExcel\Worksheet_AutoFilter_Column
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_AutoFilter_Column
+class Worksheet_AutoFilter_Column
{
const AUTOFILTER_FILTERTYPE_FILTER = 'filters';
const AUTOFILTER_FILTERTYPE_CUSTOMFILTER = 'customFilters';
@@ -77,7 +79,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
* Autofilter
*
- * @var PHPExcel_Worksheet_AutoFilter
+ * @var PHPExcel\Worksheet_AutoFilter
*/
private $_parent = NULL;
@@ -109,7 +111,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
* Autofilter Column Rules
*
- * @var array of PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @var array of PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
private $_ruleset = array();
@@ -123,12 +125,12 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
- * Create a new PHPExcel_Worksheet_AutoFilter_Column
+ * Create a new PHPExcel\Worksheet_AutoFilter_Column
*
* @param string $pColumn Column (e.g. A)
- * @param PHPExcel_Worksheet_AutoFilter $pParent Autofilter for this column
+ * @param PHPExcel\Worksheet_AutoFilter $pParent Autofilter for this column
*/
- public function __construct($pColumn, PHPExcel_Worksheet_AutoFilter $pParent = NULL)
+ public function __construct($pColumn, Worksheet_AutoFilter $pParent = NULL)
{
$this->_columnIndex = $pColumn;
$this->_parent = $pParent;
@@ -147,8 +149,8 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Set AutoFilter Column Index
*
* @param string $pColumn Column (e.g. A)
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function setColumnIndex($pColumn) {
// Uppercase coordinate
@@ -165,7 +167,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
* Get this Column's AutoFilter Parent
*
- * @return PHPExcel_Worksheet_AutoFilter
+ * @return PHPExcel\Worksheet_AutoFilter
*/
public function getParent() {
return $this->_parent;
@@ -174,10 +176,10 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
* Set this Column's AutoFilter Parent
*
- * @param PHPExcel_Worksheet_AutoFilter
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @param PHPExcel\Worksheet_AutoFilter
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
- public function setParent(PHPExcel_Worksheet_AutoFilter $pParent = NULL) {
+ public function setParent(PHPExcel\Worksheet_AutoFilter $pParent = NULL) {
$this->_parent = $pParent;
return $this;
@@ -196,12 +198,12 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Set AutoFilter Type
*
* @param string $pFilterType
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function setFilterType($pFilterType = self::AUTOFILTER_FILTERTYPE_FILTER) {
if (!in_array($pFilterType,self::$_filterTypes)) {
- throw new PHPExcel_Exception('Invalid filter type for column AutoFilter.');
+ throw new Exception('Invalid filter type for column AutoFilter.');
}
$this->_filterType = $pFilterType;
@@ -222,14 +224,14 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Set AutoFilter Multiple Rules And/Or
*
* @param string $pJoin And/Or
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function setJoin($pJoin = self::AUTOFILTER_COLUMN_JOIN_OR) {
// Lowercase And/Or
$pJoin = strtolower($pJoin);
if (!in_array($pJoin,self::$_ruleJoins)) {
- throw new PHPExcel_Exception('Invalid rule connection for column AutoFilter.');
+ throw new Exception('Invalid rule connection for column AutoFilter.');
}
$this->_join = $pJoin;
@@ -241,8 +243,8 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Set AutoFilter Attributes
*
* @param string[] $pAttributes
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function setAttributes($pAttributes = array()) {
$this->_attributes = $pAttributes;
@@ -255,8 +257,8 @@ class PHPExcel_Worksheet_AutoFilter_Column
*
* @param string $pName Attribute Name
* @param string $pValue Attribute Value
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function setAttribute($pName, $pValue) {
$this->_attributes[$pName] = $pValue;
@@ -288,8 +290,8 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
* Get all AutoFilter Column Rules
*
- * @throws PHPExcel_Exception
- * @return array of PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @throws PHPExcel\Exception
+ * @return array of PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
public function getRules() {
return $this->_ruleset;
@@ -299,11 +301,11 @@ class PHPExcel_Worksheet_AutoFilter_Column
* Get a specified AutoFilter Column Rule
*
* @param integer $pIndex Rule index in the ruleset array
- * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @return PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
public function getRule($pIndex) {
if (!isset($this->_ruleset[$pIndex])) {
- $this->_ruleset[$pIndex] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
+ $this->_ruleset[$pIndex] = new Worksheet_AutoFilter_Column_Rule($this);
}
return $this->_ruleset[$pIndex];
}
@@ -311,10 +313,10 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
* Create a new AutoFilter Column Rule in the ruleset
*
- * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @return PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
public function createRule() {
- $this->_ruleset[] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
+ $this->_ruleset[] = new Worksheet_AutoFilter_Column_Rule($this);
return end($this->_ruleset);
}
@@ -322,11 +324,11 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
* Add a new AutoFilter Column Rule to the ruleset
*
- * @param PHPExcel_Worksheet_AutoFilter_Column_Rule $pRule
+ * @param PHPExcel\Worksheet_AutoFilter_Column_Rule $pRule
* @param boolean $returnRule Flag indicating whether the rule object or the column object should be returned
- * @return PHPExcel_Worksheet_AutoFilter_Column|PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @return PHPExcel\Worksheet_AutoFilter_Column|PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
- public function addRule(PHPExcel_Worksheet_AutoFilter_Column_Rule $pRule, $returnRule=TRUE) {
+ public function addRule(Worksheet_AutoFilter_Column_Rule $pRule, $returnRule=TRUE) {
$pRule->setParent($this);
$this->_ruleset[] = $pRule;
@@ -338,7 +340,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
* If the number of rules is reduced to 1, then we reset And/Or logic to Or
*
* @param integer $pIndex Rule index in the ruleset array
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function deleteRule($pIndex) {
if (isset($this->_ruleset[$pIndex])) {
@@ -355,7 +357,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
/**
* Delete all AutoFilter Column Rules
*
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function clearRules() {
$this->_ruleset = array();
@@ -378,7 +380,7 @@ class PHPExcel_Worksheet_AutoFilter_Column
$this->$key = clone $value;
}
} elseif ((is_array($value)) && ($key == '_ruleset')) {
- // The columns array of PHPExcel_Worksheet_AutoFilter objects
+ // The columns array of PHPExcel\Worksheet_AutoFilter objects
$this->$key = array();
foreach ($value as $k => $v) {
$this->$key[$k] = clone $v;
diff --git a/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php b/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
index 1b8c03e..391993e 100644
--- a/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
+++ b/Classes/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
@@ -19,21 +19,23 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * PHPExcel\Worksheet_AutoFilter_Column_Rule
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_AutoFilter_Column_Rule
+class Worksheet_AutoFilter_Column_Rule
{
const AUTOFILTER_RULETYPE_FILTER = 'filter';
const AUTOFILTER_RULETYPE_DATEGROUP = 'dateGroupItem';
@@ -232,7 +234,7 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
/**
* Autofilter Column
*
- * @var PHPExcel_Worksheet_AutoFilter_Column
+ * @var PHPExcel\Worksheet_AutoFilter_Column
*/
private $_parent = NULL;
@@ -268,11 +270,11 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
/**
- * Create a new PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * Create a new PHPExcel\Worksheet_AutoFilter_Column_Rule
*
- * @param PHPExcel_Worksheet_AutoFilter_Column $pParent
+ * @param PHPExcel\Worksheet_AutoFilter_Column $pParent
*/
- public function __construct(PHPExcel_Worksheet_AutoFilter_Column $pParent = NULL)
+ public function __construct(Worksheet_AutoFilter_Column $pParent = NULL)
{
$this->_parent = $pParent;
}
@@ -290,12 +292,12 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* Set AutoFilter Rule Type
*
* @param string $pRuleType
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function setRuleType($pRuleType = self::AUTOFILTER_RULETYPE_FILTER) {
if (!in_array($pRuleType,self::$_ruleTypes)) {
- throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
+ throw new Exception('Invalid rule type for column AutoFilter Rule.');
}
$this->_ruleType = $pRuleType;
@@ -316,8 +318,8 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* Set AutoFilter Rule Value
*
* @param string|string[] $pValue
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
public function setValue($pValue = '') {
if (is_array($pValue)) {
@@ -333,7 +335,7 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
}
}
if (count($pValue) == 0) {
- throw new PHPExcel_Exception('Invalid rule value for column AutoFilter Rule.');
+ throw new Exception('Invalid rule value for column AutoFilter Rule.');
}
// Set the dateTime grouping that we've anticipated
$this->setGrouping(self::$_dateTimeGroups[$grouping]);
@@ -356,15 +358,15 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* Set AutoFilter Rule Operator
*
* @param string $pOperator
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
public function setOperator($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL) {
if (empty($pOperator))
$pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
if ((!in_array($pOperator,self::$_operators)) &&
(!in_array($pOperator,self::$_topTenValue))) {
- throw new PHPExcel_Exception('Invalid operator for column AutoFilter Rule.');
+ throw new Exception('Invalid operator for column AutoFilter Rule.');
}
$this->_operator = $pOperator;
@@ -384,15 +386,15 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* Set AutoFilter Rule Grouping
*
* @param string $pGrouping
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
public function setGrouping($pGrouping = NULL) {
if (($pGrouping !== NULL) &&
(!in_array($pGrouping,self::$_dateTimeGroups)) &&
(!in_array($pGrouping,self::$_dynamicTypes)) &&
(!in_array($pGrouping,self::$_topTenType))) {
- throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
+ throw new Exception('Invalid rule type for column AutoFilter Rule.');
}
$this->_grouping = $pGrouping;
@@ -406,8 +408,8 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
* @param string $pOperator
* @param string|string[] $pValue
* @param string $pGrouping
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
public function setRule($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL, $pValue = '', $pGrouping = NULL) {
$this->setOperator($pOperator);
@@ -424,7 +426,7 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
/**
* Get this Rule's AutoFilter Column Parent
*
- * @return PHPExcel_Worksheet_AutoFilter_Column
+ * @return PHPExcel\Worksheet_AutoFilter_Column
*/
public function getParent() {
return $this->_parent;
@@ -433,10 +435,10 @@ class PHPExcel_Worksheet_AutoFilter_Column_Rule
/**
* Set this Rule's AutoFilter Column Parent
*
- * @param PHPExcel_Worksheet_AutoFilter_Column
- * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+ * @param PHPExcel\Worksheet_AutoFilter_Column
+ * @return PHPExcel\Worksheet_AutoFilter_Column_Rule
*/
- public function setParent(PHPExcel_Worksheet_AutoFilter_Column $pParent = NULL) {
+ public function setParent(Worksheet_AutoFilter_Column $pParent = NULL) {
$this->_parent = $pParent;
return $this;
diff --git a/Classes/PHPExcel/Worksheet/BaseDrawing.php b/Classes/PHPExcel/Worksheet/BaseDrawing.php
index 392c4d5..ba83143 100644
--- a/Classes/PHPExcel/Worksheet/BaseDrawing.php
+++ b/Classes/PHPExcel/Worksheet/BaseDrawing.php
@@ -19,21 +19,23 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_BaseDrawing
+ * PHPExcel\Worksheet_BaseDrawing
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
+class Worksheet_BaseDrawing implements IComparable
{
/**
* Image counter
@@ -66,7 +68,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
/**
* Worksheet
*
- * @var PHPExcel_Worksheet
+ * @var PHPExcel\Worksheet
*/
protected $_worksheet;
@@ -122,12 +124,12 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
/**
* Shadow
*
- * @var PHPExcel_Worksheet_Drawing_Shadow
+ * @var PHPExcel\Worksheet_Drawing_Shadow
*/
protected $_shadow;
/**
- * Create a new PHPExcel_Worksheet_BaseDrawing
+ * Create a new PHPExcel\Worksheet_BaseDrawing
*/
public function __construct()
{
@@ -142,7 +144,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
$this->_height = 0;
$this->_resizeProportional = true;
$this->_rotation = 0;
- $this->_shadow = new PHPExcel_Worksheet_Drawing_Shadow();
+ $this->_shadow = new Worksheet_Drawing_Shadow();
// Set image index
self::$_imageCounter++;
@@ -171,7 +173,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set Name
*
* @param string $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setName($pValue = '') {
$this->_name = $pValue;
@@ -191,7 +193,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set Description
*
* @param string $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setDescription($pValue = '') {
$this->_description = $pValue;
@@ -201,7 +203,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
/**
* Get Worksheet
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function getWorksheet() {
return $this->_worksheet;
@@ -210,20 +212,20 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
/**
* Set Worksheet
*
- * @param PHPExcel_Worksheet $pValue
+ * @param PHPExcel\Worksheet $pValue
* @param bool $pOverrideOld If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
- public function setWorksheet(PHPExcel_Worksheet $pValue = null, $pOverrideOld = false) {
+ public function setWorksheet(Worksheet $pValue = null, $pOverrideOld = false) {
if (is_null($this->_worksheet)) {
- // Add drawing to PHPExcel_Worksheet
+ // Add drawing to PHPExcel\Worksheet
$this->_worksheet = $pValue;
$this->_worksheet->getCell($this->_coordinates);
$this->_worksheet->getDrawingCollection()->append($this);
} else {
if ($pOverrideOld) {
- // Remove drawing from old PHPExcel_Worksheet
+ // Remove drawing from old PHPExcel\Worksheet
$iterator = $this->_worksheet->getDrawingCollection()->getIterator();
while ($iterator->valid()) {
@@ -234,10 +236,10 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
}
}
- // Set new PHPExcel_Worksheet
+ // Set new PHPExcel\Worksheet
$this->setWorksheet($pValue);
} else {
- throw new PHPExcel_Exception("A PHPExcel_Worksheet has already been assigned. Drawings can only exist on one PHPExcel_Worksheet.");
+ throw new Exception("A PHPExcel\Worksheet has already been assigned. Drawings can only exist on one PHPExcel\Worksheet.");
}
}
return $this;
@@ -256,7 +258,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set Coordinates
*
* @param string $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setCoordinates($pValue = 'A1') {
$this->_coordinates = $pValue;
@@ -276,7 +278,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set OffsetX
*
* @param int $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setOffsetX($pValue = 0) {
$this->_offsetX = $pValue;
@@ -296,7 +298,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set OffsetY
*
* @param int $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setOffsetY($pValue = 0) {
$this->_offsetY = $pValue;
@@ -316,7 +318,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set Width
*
* @param int $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setWidth($pValue = 0) {
// Resize proportional?
@@ -344,7 +346,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set Height
*
* @param int $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setHeight($pValue = 0) {
// Resize proportional?
@@ -370,7 +372,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* @author Vincent@luo MSN:kele_100@hotmail.com
* @param int $width
* @param int $height
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setWidthAndHeight($width = 0, $height = 0) {
$xratio = $width / $this->_width;
@@ -400,7 +402,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set ResizeProportional
*
* @param boolean $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setResizeProportional($pValue = true) {
$this->_resizeProportional = $pValue;
@@ -420,7 +422,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
* Set Rotation
*
* @param int $pValue
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
public function setRotation($pValue = 0) {
$this->_rotation = $pValue;
@@ -430,7 +432,7 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
/**
* Get Shadow
*
- * @return PHPExcel_Worksheet_Drawing_Shadow
+ * @return PHPExcel\Worksheet_Drawing_Shadow
*/
public function getShadow() {
return $this->_shadow;
@@ -439,11 +441,11 @@ class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
/**
* Set Shadow
*
- * @param PHPExcel_Worksheet_Drawing_Shadow $pValue
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_BaseDrawing
+ * @param PHPExcel\Worksheet_Drawing_Shadow $pValue
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_BaseDrawing
*/
- public function setShadow(PHPExcel_Worksheet_Drawing_Shadow $pValue = null) {
+ public function setShadow(Worksheet_Drawing_Shadow $pValue = null) {
$this->_shadow = $pValue;
return $this;
}
diff --git a/Classes/PHPExcel/Worksheet/CellIterator.php b/Classes/PHPExcel/Worksheet/CellIterator.php
index f349d2a..a64bf94 100644
--- a/Classes/PHPExcel/Worksheet/CellIterator.php
+++ b/Classes/PHPExcel/Worksheet/CellIterator.php
@@ -19,28 +19,30 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_CellIterator
+ * PHPExcel\Worksheet_CellIterator
*
- * Used to iterate rows in a PHPExcel_Worksheet
+ * Used to iterate rows in a PHPExcel\Worksheet
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_CellIterator implements Iterator
+class Worksheet_CellIterator implements \Iterator
{
/**
- * PHPExcel_Worksheet to iterate
+ * PHPExcel\Worksheet to iterate
*
- * @var PHPExcel_Worksheet
+ * @var PHPExcel\Worksheet
*/
private $_subject;
@@ -68,10 +70,10 @@ class PHPExcel_Worksheet_CellIterator implements Iterator
/**
* Create a new cell iterator
*
- * @param PHPExcel_Worksheet $subject
+ * @param PHPExcel\Worksheet $subject
* @param int $rowIndex
*/
- public function __construct(PHPExcel_Worksheet $subject = null, $rowIndex = 1) {
+ public function __construct(Worksheet $subject = null, $rowIndex = 1) {
// Set subject and row index
$this->_subject = $subject;
$this->_rowIndex = $rowIndex;
@@ -92,9 +94,9 @@ class PHPExcel_Worksheet_CellIterator implements Iterator
}
/**
- * Current PHPExcel_Cell
+ * Current PHPExcel\Cell
*
- * @return PHPExcel_Cell
+ * @return PHPExcel\Cell
*/
public function current() {
return $this->_subject->getCellByColumnAndRow($this->_position, $this->_rowIndex);
@@ -117,7 +119,7 @@ class PHPExcel_Worksheet_CellIterator implements Iterator
}
/**
- * Are there any more PHPExcel_Cell instances available?
+ * Are there any more PHPExcel\Cell instances available?
*
* @return boolean
*/
@@ -125,7 +127,7 @@ class PHPExcel_Worksheet_CellIterator implements Iterator
// columnIndexFromString() returns an index based at one,
// treat it as a count when comparing it to the base zero
// position.
- $columnCount = PHPExcel_Cell::columnIndexFromString($this->_subject->getHighestColumn());
+ $columnCount = Cell::columnIndexFromString($this->_subject->getHighestColumn());
if ($this->_onlyExistingCells) {
// If we aren't looking at an existing cell, either
diff --git a/Classes/PHPExcel/Worksheet/ColumnDimension.php b/Classes/PHPExcel/Worksheet/ColumnDimension.php
index dddb287..cc39681 100644
--- a/Classes/PHPExcel/Worksheet/ColumnDimension.php
+++ b/Classes/PHPExcel/Worksheet/ColumnDimension.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Worksheet_ColumnDimension
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_ColumnDimension
+class Worksheet_ColumnDimension
{
/**
* Column index
diff --git a/Classes/PHPExcel/Worksheet/Drawing.php b/Classes/PHPExcel/Worksheet/Drawing.php
index d3efa6a..cdcc22f 100644
--- a/Classes/PHPExcel/Worksheet/Drawing.php
+++ b/Classes/PHPExcel/Worksheet/Drawing.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Worksheet_Drawing
+ * @package PHPExcel\Worksheet_Drawing
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_Drawing
+ * PHPExcel\Worksheet_Drawing
*
* @category PHPExcel
- * @package PHPExcel_Worksheet_Drawing
+ * @package PHPExcel\Worksheet_Drawing
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
+class Worksheet_Drawing extends Worksheet_BaseDrawing implements IComparable
{
/**
* Path
@@ -43,7 +45,7 @@ class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implemen
private $_path;
/**
- * Create a new PHPExcel_Worksheet_Drawing
+ * Create a new PHPExcel\Worksheet_Drawing
*/
public function __construct()
{
@@ -98,8 +100,8 @@ class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implemen
*
* @param string $pValue File path
* @param boolean $pVerifyFile Verify file
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_Drawing
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_Drawing
*/
public function setPath($pValue = '', $pVerifyFile = true) {
if ($pVerifyFile) {
@@ -111,7 +113,7 @@ class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implemen
list($this->_width, $this->_height) = getimagesize($pValue);
}
} else {
- throw new PHPExcel_Exception("File $pValue not found!");
+ throw new Exception("File $pValue not found!");
}
} else {
$this->_path = $pValue;
diff --git a/Classes/PHPExcel/Worksheet/Drawing/Shadow.php b/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
index 646b064..d63455d 100644
--- a/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
+++ b/Classes/PHPExcel/Worksheet/Drawing/Shadow.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Worksheet_Drawing
+ * @package PHPExcel\Worksheet_Drawing
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_Drawing_Shadow
+ * PHPExcel\Worksheet_Drawing_Shadow
*
* @category PHPExcel
- * @package PHPExcel_Worksheet_Drawing
+ * @package PHPExcel\Worksheet_Drawing
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
+class Worksheet_Drawing_Shadow implements IComparable
{
/* Shadow alignment */
const SHADOW_BOTTOM = 'b';
@@ -87,7 +89,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
/**
* Color
*
- * @var PHPExcel_Style_Color
+ * @var PHPExcel\Style_Color
*/
private $_color;
@@ -99,7 +101,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
private $_alpha;
/**
- * Create a new PHPExcel_Worksheet_Drawing_Shadow
+ * Create a new PHPExcel\Worksheet_Drawing_Shadow
*/
public function __construct()
{
@@ -108,8 +110,8 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
$this->_blurRadius = 6;
$this->_distance = 2;
$this->_direction = 0;
- $this->_alignment = PHPExcel_Worksheet_Drawing_Shadow::SHADOW_BOTTOM_RIGHT;
- $this->_color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK);
+ $this->_alignment = Worksheet_Drawing_Shadow::SHADOW_BOTTOM_RIGHT;
+ $this->_color = new Style_Color(Style_Color::COLOR_BLACK);
$this->_alpha = 50;
}
@@ -126,7 +128,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
* Set Visible
*
* @param boolean $pValue
- * @return PHPExcel_Worksheet_Drawing_Shadow
+ * @return PHPExcel\Worksheet_Drawing_Shadow
*/
public function setVisible($pValue = false) {
$this->_visible = $pValue;
@@ -146,7 +148,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
* Set Blur radius
*
* @param int $pValue
- * @return PHPExcel_Worksheet_Drawing_Shadow
+ * @return PHPExcel\Worksheet_Drawing_Shadow
*/
public function setBlurRadius($pValue = 6) {
$this->_blurRadius = $pValue;
@@ -166,7 +168,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
* Set Shadow distance
*
* @param int $pValue
- * @return PHPExcel_Worksheet_Drawing_Shadow
+ * @return PHPExcel\Worksheet_Drawing_Shadow
*/
public function setDistance($pValue = 2) {
$this->_distance = $pValue;
@@ -186,7 +188,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
* Set Shadow direction (in degrees)
*
* @param int $pValue
- * @return PHPExcel_Worksheet_Drawing_Shadow
+ * @return PHPExcel\Worksheet_Drawing_Shadow
*/
public function setDirection($pValue = 0) {
$this->_direction = $pValue;
@@ -206,7 +208,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
* Set Shadow alignment
*
* @param int $pValue
- * @return PHPExcel_Worksheet_Drawing_Shadow
+ * @return PHPExcel\Worksheet_Drawing_Shadow
*/
public function setAlignment($pValue = 0) {
$this->_alignment = $pValue;
@@ -216,7 +218,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
/**
* Get Color
*
- * @return PHPExcel_Style_Color
+ * @return PHPExcel\Style_Color
*/
public function getColor() {
return $this->_color;
@@ -225,11 +227,11 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
/**
* Set Color
*
- * @param PHPExcel_Style_Color $pValue
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_Drawing_Shadow
+ * @param PHPExcel\Style_Color $pValue
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_Drawing_Shadow
*/
- public function setColor(PHPExcel_Style_Color $pValue = null) {
+ public function setColor(Style_Color $pValue = null) {
$this->_color = $pValue;
return $this;
}
@@ -247,7 +249,7 @@ class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
* Set Alpha
*
* @param int $pValue
- * @return PHPExcel_Worksheet_Drawing_Shadow
+ * @return PHPExcel\Worksheet_Drawing_Shadow
*/
public function setAlpha($pValue = 0) {
$this->_alpha = $pValue;
diff --git a/Classes/PHPExcel/Worksheet/HeaderFooter.php b/Classes/PHPExcel/Worksheet/HeaderFooter.php
index 88c35da..b4e8013 100644
--- a/Classes/PHPExcel/Worksheet/HeaderFooter.php
+++ b/Classes/PHPExcel/Worksheet/HeaderFooter.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Worksheet_HeaderFooter
*
@@ -93,7 +95,7 @@
* @package PHPExcel_Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_HeaderFooter
+class Worksheet_HeaderFooter
{
/* Header/footer image location */
const IMAGE_HEADER_LEFT = 'LH';
diff --git a/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php b/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
index 7dd03a0..b006dae 100644
--- a/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
+++ b/Classes/PHPExcel/Worksheet/HeaderFooterDrawing.php
@@ -19,21 +19,23 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_HeaderFooterDrawing
+ * PHPExcel\Worksheet_HeaderFooterDrawing
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing implements PHPExcel_IComparable
+class Worksheet_HeaderFooterDrawing extends Worksheet_Drawing implements IComparable
{
/**
* Path
@@ -85,7 +87,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
protected $_resizeProportional;
/**
- * Create a new PHPExcel_Worksheet_HeaderFooterDrawing
+ * Create a new PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function __construct()
{
@@ -112,7 +114,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
* Set Name
*
* @param string $pValue
- * @return PHPExcel_Worksheet_HeaderFooterDrawing
+ * @return PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function setName($pValue = '') {
$this->_name = $pValue;
@@ -132,7 +134,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
* Set OffsetX
*
* @param int $pValue
- * @return PHPExcel_Worksheet_HeaderFooterDrawing
+ * @return PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function setOffsetX($pValue = 0) {
$this->_offsetX = $pValue;
@@ -152,7 +154,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
* Set OffsetY
*
* @param int $pValue
- * @return PHPExcel_Worksheet_HeaderFooterDrawing
+ * @return PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function setOffsetY($pValue = 0) {
$this->_offsetY = $pValue;
@@ -172,7 +174,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
* Set Width
*
* @param int $pValue
- * @return PHPExcel_Worksheet_HeaderFooterDrawing
+ * @return PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function setWidth($pValue = 0) {
// Resize proportional?
@@ -200,7 +202,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
* Set Height
*
* @param int $pValue
- * @return PHPExcel_Worksheet_HeaderFooterDrawing
+ * @return PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function setHeight($pValue = 0) {
// Resize proportional?
@@ -226,7 +228,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
* @author Vincent@luo MSN:kele_100@hotmail.com
* @param int $width
* @param int $height
- * @return PHPExcel_Worksheet_HeaderFooterDrawing
+ * @return PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function setWidthAndHeight($width = 0, $height = 0) {
$xratio = $width / $this->_width;
@@ -256,7 +258,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
* Set ResizeProportional
*
* @param boolean $pValue
- * @return PHPExcel_Worksheet_HeaderFooterDrawing
+ * @return PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function setResizeProportional($pValue = true) {
$this->_resizeProportional = $pValue;
@@ -296,8 +298,8 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
*
* @param string $pValue File path
* @param boolean $pVerifyFile Verify file
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_HeaderFooterDrawing
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_HeaderFooterDrawing
*/
public function setPath($pValue = '', $pVerifyFile = true) {
if ($pVerifyFile) {
@@ -309,7 +311,7 @@ class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing
list($this->_width, $this->_height) = getimagesize($pValue);
}
} else {
- throw new PHPExcel_Exception("File $pValue not found!");
+ throw new Exception("File $pValue not found!");
}
} else {
$this->_path = $pValue;
diff --git a/Classes/PHPExcel/Worksheet/MemoryDrawing.php b/Classes/PHPExcel/Worksheet/MemoryDrawing.php
index 753a135..3d871e3 100644
--- a/Classes/PHPExcel/Worksheet/MemoryDrawing.php
+++ b/Classes/PHPExcel/Worksheet/MemoryDrawing.php
@@ -19,21 +19,23 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_MemoryDrawing
+ * PHPExcel\Worksheet_MemoryDrawing
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
+class Worksheet_MemoryDrawing extends Worksheet_BaseDrawing implements IComparable
{
/* Rendering functions */
const RENDERING_DEFAULT = 'imagepng';
@@ -76,7 +78,7 @@ class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing im
private $_uniqueName;
/**
- * Create a new PHPExcel_Worksheet_MemoryDrawing
+ * Create a new PHPExcel\Worksheet_MemoryDrawing
*/
public function __construct()
{
@@ -103,7 +105,7 @@ class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing im
* Set image resource
*
* @param $value resource
- * @return PHPExcel_Worksheet_MemoryDrawing
+ * @return PHPExcel\Worksheet_MemoryDrawing
*/
public function setImageResource($value = null) {
$this->_imageResource = $value;
@@ -129,9 +131,9 @@ class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing im
* Set rendering function
*
* @param string $value
- * @return PHPExcel_Worksheet_MemoryDrawing
+ * @return PHPExcel\Worksheet_MemoryDrawing
*/
- public function setRenderingFunction($value = PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT) {
+ public function setRenderingFunction($value = Worksheet_MemoryDrawing::RENDERING_DEFAULT) {
$this->_renderingFunction = $value;
return $this;
}
@@ -149,9 +151,9 @@ class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing im
* Set mime type
*
* @param string $value
- * @return PHPExcel_Worksheet_MemoryDrawing
+ * @return PHPExcel\Worksheet_MemoryDrawing
*/
- public function setMimeType($value = PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_DEFAULT) {
+ public function setMimeType($value = Worksheet_MemoryDrawing::MIMETYPE_DEFAULT) {
$this->_mimeType = $value;
return $this;
}
diff --git a/Classes/PHPExcel/Worksheet/PageMargins.php b/Classes/PHPExcel/Worksheet/PageMargins.php
index 8fc4cbe..80d10da 100644
--- a/Classes/PHPExcel/Worksheet/PageMargins.php
+++ b/Classes/PHPExcel/Worksheet/PageMargins.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Worksheet_PageMargins
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_PageMargins
+class Worksheet_PageMargins
{
/**
* Left
diff --git a/Classes/PHPExcel/Worksheet/PageSetup.php b/Classes/PHPExcel/Worksheet/PageSetup.php
index e822754..1a242fb 100644
--- a/Classes/PHPExcel/Worksheet/PageSetup.php
+++ b/Classes/PHPExcel/Worksheet/PageSetup.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Worksheet_PageSetup
*
@@ -104,7 +106,7 @@
* @package PHPExcel_Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_PageSetup
+class Worksheet_PageSetup
{
/* Paper size */
const PAPERSIZE_LETTER = 1;
@@ -189,14 +191,14 @@ class PHPExcel_Worksheet_PageSetup
*
* @var int
*/
- private $_paperSize = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER;
+ private $_paperSize = Worksheet_PageSetup::PAPERSIZE_LETTER;
/**
* Orientation
*
* @var string
*/
- private $_orientation = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT;
+ private $_orientation = Worksheet_PageSetup::ORIENTATION_DEFAULT;
/**
* Scale (Print Scale)
diff --git a/Classes/PHPExcel/Worksheet/Protection.php b/Classes/PHPExcel/Worksheet/Protection.php
index e968c11..c1f7046 100644
--- a/Classes/PHPExcel/Worksheet/Protection.php
+++ b/Classes/PHPExcel/Worksheet/Protection.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Worksheet_Protection
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_Protection
+class Worksheet_Protection
{
/**
* Sheet
diff --git a/Classes/PHPExcel/Worksheet/Row.php b/Classes/PHPExcel/Worksheet/Row.php
index 07025e8..81e0f2b 100644
--- a/Classes/PHPExcel/Worksheet/Row.php
+++ b/Classes/PHPExcel/Worksheet/Row.php
@@ -19,28 +19,30 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_Row
+ * PHPExcel\Worksheet_Row
*
- * Represents a row in PHPExcel_Worksheet, used by PHPExcel_Worksheet_RowIterator
+ * Represents a row in PHPExcel\Worksheet, used by PHPExcel\Worksheet_RowIterator
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_Row
+class Worksheet_Row
{
/**
- * PHPExcel_Worksheet
+ * PHPExcel\Worksheet
*
- * @var PHPExcel_Worksheet
+ * @var PHPExcel\Worksheet
*/
private $_parent;
@@ -54,10 +56,10 @@ class PHPExcel_Worksheet_Row
/**
* Create a new row
*
- * @param PHPExcel_Worksheet $parent
+ * @param PHPExcel\Worksheet $parent
* @param int $rowIndex
*/
- public function __construct(PHPExcel_Worksheet $parent = null, $rowIndex = 1) {
+ public function __construct(Worksheet $parent = null, $rowIndex = 1) {
// Set parent and row index
$this->_parent = $parent;
$this->_rowIndex = $rowIndex;
@@ -82,9 +84,9 @@ class PHPExcel_Worksheet_Row
/**
* Get cell iterator
*
- * @return PHPExcel_Worksheet_CellIterator
+ * @return PHPExcel\Worksheet_CellIterator
*/
public function getCellIterator() {
- return new PHPExcel_Worksheet_CellIterator($this->_parent, $this->_rowIndex);
+ return new Worksheet_CellIterator($this->_parent, $this->_rowIndex);
}
}
diff --git a/Classes/PHPExcel/Worksheet/RowDimension.php b/Classes/PHPExcel/Worksheet/RowDimension.php
index 1c6abaa..5609556 100644
--- a/Classes/PHPExcel/Worksheet/RowDimension.php
+++ b/Classes/PHPExcel/Worksheet/RowDimension.php
@@ -26,6 +26,8 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Worksheet_RowDimension
*
@@ -33,7 +35,7 @@
* @package PHPExcel_Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_RowDimension
+class Worksheet_RowDimension
{
/**
* Row index
diff --git a/Classes/PHPExcel/Worksheet/RowIterator.php b/Classes/PHPExcel/Worksheet/RowIterator.php
index 840f7f9..a3bb0b1 100644
--- a/Classes/PHPExcel/Worksheet/RowIterator.php
+++ b/Classes/PHPExcel/Worksheet/RowIterator.php
@@ -19,28 +19,30 @@
* 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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Worksheet_RowIterator
+ * PHPExcel\Worksheet_RowIterator
*
- * Used to iterate rows in a PHPExcel_Worksheet
+ * Used to iterate rows in a PHPExcel\Worksheet
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_RowIterator implements Iterator
+class Worksheet_RowIterator implements \Iterator
{
/**
- * PHPExcel_Worksheet to iterate
+ * PHPExcel\Worksheet to iterate
*
- * @var PHPExcel_Worksheet
+ * @var PHPExcel\Worksheet
*/
private $_subject;
@@ -62,10 +64,10 @@ class PHPExcel_Worksheet_RowIterator implements Iterator
/**
* Create a new row iterator
*
- * @param PHPExcel_Worksheet $subject The worksheet to iterate over
+ * @param PHPExcel\Worksheet $subject The worksheet to iterate over
* @param integer $startRow The row number at which to start iterating
*/
- public function __construct(PHPExcel_Worksheet $subject = null, $startRow = 1) {
+ public function __construct(Worksheet $subject = null, $startRow = 1) {
// Set subject
$this->_subject = $subject;
$this->resetStart($startRow);
@@ -107,10 +109,10 @@ class PHPExcel_Worksheet_RowIterator implements Iterator
/**
* Return the current row in this worksheet
*
- * @return PHPExcel_Worksheet_Row
+ * @return PHPExcel\Worksheet_Row
*/
public function current() {
- return new PHPExcel_Worksheet_Row($this->_subject, $this->_position);
+ return new Worksheet_Row($this->_subject, $this->_position);
}
/**
diff --git a/Classes/PHPExcel/Worksheet/SheetView.php b/Classes/PHPExcel/Worksheet/SheetView.php
index f37ba81..a2d208a 100644
--- a/Classes/PHPExcel/Worksheet/SheetView.php
+++ b/Classes/PHPExcel/Worksheet/SheetView.php
@@ -26,14 +26,16 @@
*/
+namespace PHPExcel;
+
/**
* PHPExcel_Worksheet_SheetView
*
* @category PHPExcel
- * @package PHPExcel_Worksheet
+ * @package PHPExcel\Worksheet
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Worksheet_SheetView
+class Worksheet_SheetView
{
/* Sheet View types */
@@ -75,7 +77,7 @@ class PHPExcel_Worksheet_SheetView
private $_sheetviewType = self::SHEETVIEW_NORMAL;
/**
- * Create a new PHPExcel_Worksheet_SheetView
+ * Create a new PHPExcel\Worksheet_SheetView
*/
public function __construct()
{
@@ -96,8 +98,8 @@ class PHPExcel_Worksheet_SheetView
* Valid values range from 10 to 400.
*
* @param int $pValue
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_SheetView
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_SheetView
*/
public function setZoomScale($pValue = 100) {
// Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
@@ -105,7 +107,7 @@ class PHPExcel_Worksheet_SheetView
if (($pValue >= 1) || is_null($pValue)) {
$this->_zoomScale = $pValue;
} else {
- throw new PHPExcel_Exception("Scale must be greater than or equal to 1.");
+ throw new Exception("Scale must be greater than or equal to 1.");
}
return $this;
}
@@ -125,14 +127,14 @@ class PHPExcel_Worksheet_SheetView
* Valid values range from 10 to 400.
*
* @param int $pValue
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_SheetView
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_SheetView
*/
public function setZoomScaleNormal($pValue = 100) {
if (($pValue >= 1) || is_null($pValue)) {
$this->_zoomScaleNormal = $pValue;
} else {
- throw new PHPExcel_Exception("Scale must be greater than or equal to 1.");
+ throw new Exception("Scale must be greater than or equal to 1.");
}
return $this;
}
@@ -155,8 +157,8 @@ class PHPExcel_Worksheet_SheetView
* 'pageBreakPreview' self::SHEETVIEW_PAGE_BREAK_PREVIEW
*
* @param string $pValue
- * @throws PHPExcel_Exception
- * @return PHPExcel_Worksheet_SheetView
+ * @throws PHPExcel\Exception
+ * @return PHPExcel\Worksheet_SheetView
*/
public function setView($pValue = NULL) {
// MS Excel 2007 allows setting the view to 'normal', 'pageLayout' or 'pageBreakPreview'
@@ -166,7 +168,7 @@ class PHPExcel_Worksheet_SheetView
if (in_array($pValue, self::$_sheetViewTypes)) {
$this->_sheetviewType = $pValue;
} else {
- throw new PHPExcel_Exception("Invalid sheetview layout type.");
+ throw new Exception("Invalid sheetview layout type.");
}
return $this;
diff --git a/Classes/PHPExcel/WorksheetIterator.php b/Classes/PHPExcel/WorksheetIterator.php
index 27cc1d2..5a891cc 100644
--- a/Classes/PHPExcel/WorksheetIterator.php
+++ b/Classes/PHPExcel/WorksheetIterator.php
@@ -26,8 +26,10 @@
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_WorksheetIterator
+ * PHPExcel\WorksheetIterator
*
* Used to iterate worksheets in PHPExcel
*
@@ -35,7 +37,7 @@
* @package PHPExcel
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_WorksheetIterator implements Iterator
+class WorksheetIterator implements \Iterator
{
/**
* Spreadsheet to iterate
@@ -56,7 +58,7 @@ class PHPExcel_WorksheetIterator implements Iterator
*
* @param PHPExcel $subject
*/
- public function __construct(PHPExcel $subject = null)
+ public function __construct(Workbook $subject = null)
{
// Set subject
$this->_subject = $subject;
@@ -79,9 +81,9 @@ class PHPExcel_WorksheetIterator implements Iterator
}
/**
- * Current PHPExcel_Worksheet
+ * Current PHPExcel\Worksheet
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel\Worksheet
*/
public function current()
{
@@ -107,7 +109,7 @@ class PHPExcel_WorksheetIterator implements Iterator
}
/**
- * More PHPExcel_Worksheet instances available?
+ * More PHPExcel\Worksheet instances available?
*
* @return boolean
*/
diff --git a/Classes/PHPExcel/Writer/Abstract.php b/Classes/PHPExcel/Writer/Abstract.php
index 8b9fe50..7a0f749 100644
--- a/Classes/PHPExcel/Writer/Abstract.php
+++ b/Classes/PHPExcel/Writer/Abstract.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer
+ * @package PHPExcel\Writer
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Abstract
+ * PHPExcel\Writer_Abstract
*
* @category PHPExcel
- * @package PHPExcel_Writer
+ * @package PHPExcel\Writer
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-abstract class PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+abstract class Writer_Abstract implements Writer_IWriter
{
/**
* Write charts that are defined in the workbook?
@@ -83,7 +85,7 @@ abstract class PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
* Set to false (the default) to ignore charts.
*
* @param boolean $pValue
- * @return PHPExcel_Writer_IWriter
+ * @return PHPExcel\Writer_IWriter
*/
public function setIncludeCharts($pValue = FALSE) {
$this->_includeCharts = (boolean) $pValue;
@@ -110,7 +112,7 @@ abstract class PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
* Set to false to prevent precalculation of formulae on save.
*
* @param boolean $pValue Pre-Calculate Formulas?
- * @return PHPExcel_Writer_IWriter
+ * @return PHPExcel\Writer_IWriter
*/
public function setPreCalculateFormulas($pValue = TRUE) {
$this->_preCalculateFormulas = (boolean) $pValue;
@@ -131,8 +133,8 @@ abstract class PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
*
* @param boolean $pValue
* @param string $pDirectory Disk caching directory
- * @throws PHPExcel_Writer_Exception when directory does not exist
- * @return PHPExcel_Writer_Excel2007
+ * @throws PHPExcel\Writer_Exception when directory does not exist
+ * @return PHPExcel\Writer_Excel2007
*/
public function setUseDiskCaching($pValue = FALSE, $pDirectory = NULL) {
$this->_useDiskCaching = $pValue;
@@ -141,7 +143,7 @@ abstract class PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
if (is_dir($pDirectory)) {
$this->_diskCachingDirectory = $pDirectory;
} else {
- throw new PHPExcel_Writer_Exception("Directory does not exist: $pDirectory");
+ throw new Writer_Exception("Directory does not exist: $pDirectory");
}
}
return $this;
diff --git a/Classes/PHPExcel/Writer/CSV.php b/Classes/PHPExcel/Writer/CSV.php
index 2ca7c25..6e94771 100644
--- a/Classes/PHPExcel/Writer/CSV.php
+++ b/Classes/PHPExcel/Writer/CSV.php
@@ -19,21 +19,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_CSV
+ * @package PHPExcel\Writer_CSV
* @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##
*/
+namespace PHPExcel;
/**
- * PHPExcel_Writer_CSV
+ * PHPExcel\Writer_CSV
*
* @category PHPExcel
- * @package PHPExcel_Writer_CSV
+ * @package PHPExcel\Writer_CSV
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter {
+class Writer_CSV extends Writer_Abstract implements Writer_IWriter {
/**
* PHPExcel object
*
@@ -84,11 +85,11 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W
private $_excelCompatibility = false;
/**
- * Create a new PHPExcel_Writer_CSV
+ * Create a new PHPExcel\Writer_CSV
*
- * @param PHPExcel $phpExcel PHPExcel object
+ * @param PHPExcel\Workbook $phpExcel PHPExcel object
*/
- public function __construct(PHPExcel $phpExcel) {
+ public function __construct(Workbook $phpExcel) {
$this->_phpExcel = $phpExcel;
}
@@ -96,21 +97,21 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W
* Save PHPExcel to file
*
* @param string $pFilename
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_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 = Calculation::getInstance($this->_phpExcel)->getDebugLog()->getWriteDebugLog();
+ Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog(FALSE);
+ $saveArrayReturnType = Calculation::getArrayReturnType();
+ Calculation::setArrayReturnType(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 Writer_Exception("Could not open file $pFilename for writing.");
}
if ($this->_excelCompatibility) {
@@ -138,8 +139,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);
+ Calculation::setArrayReturnType($saveArrayReturnType);
+ Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
}
/**
@@ -155,7 +156,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 PHPExcel\Writer_CSV
*/
public function setDelimiter($pValue = ',') {
$this->_delimiter = $pValue;
@@ -175,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 PHPExcel\Writer_CSV
*/
public function setEnclosure($pValue = '"') {
if ($pValue == '') {
@@ -198,7 +199,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 PHPExcel\Writer_CSV
*/
public function setLineEnding($pValue = PHP_EOL) {
$this->_lineEnding = $pValue;
@@ -218,7 +219,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 PHPExcel\Writer_CSV
*/
public function setUseBOM($pValue = false) {
$this->_useBOM = $pValue;
@@ -239,7 +240,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 PHPExcel\Writer_CSV
*/
public function setExcelCompatibility($pValue = false) {
$this->_excelCompatibility = $pValue;
@@ -259,7 +260,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 PHPExcel\Writer_CSV
*/
public function setSheetIndex($pValue = 0) {
$this->_sheetIndex = $pValue;
@@ -271,7 +272,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 PHPExcel\Writer_Exception
*/
private function _writeLine($pFileHandle = null, $pValues = null) {
if (is_array($pValues)) {
@@ -306,7 +307,7 @@ class PHPExcel_Writer_CSV extends PHPExcel_Writer_Abstract implements PHPExcel_W
fwrite($pFileHandle, $line);
}
} else {
- throw new PHPExcel_Writer_Exception("Invalid data row passed to CSV writer.");
+ throw new Writer_Exception("Invalid data row passed to CSV writer.");
}
}
diff --git a/Classes/PHPExcel/Writer/Excel2007.php b/Classes/PHPExcel/Writer/Excel2007.php
index 9c78dff..42ccfcd 100644
--- a/Classes/PHPExcel/Writer/Excel2007.php
+++ b/Classes/PHPExcel/Writer/Excel2007.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007
+ * PHPExcel\Writer_Excel2007
*
* @category PHPExcel
- * @package PHPExcel_Writer_2007
+ * @package PHPExcel\Writer_2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+class Writer_Excel2007 extends Writer_Abstract implements Writer_IWriter
{
/**
* Office2003 compatibility
@@ -45,7 +47,7 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
/**
* Private writer parts
*
- * @var PHPExcel_Writer_Excel2007_WriterPart[]
+ * @var PHPExcel\Writer_Excel2007_WriterPart[]
*/
private $_writerParts = array();
@@ -64,68 +66,68 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
private $_stringTable = array();
/**
- * Private unique PHPExcel_Style_Conditional HashTable
+ * Private unique PHPExcel\Style_Conditional HashTable
*
- * @var PHPExcel_HashTable
+ * @var PHPExcel\HashTable
*/
private $_stylesConditionalHashTable;
/**
- * Private unique PHPExcel_Style_Fill HashTable
+ * Private unique PHPExcel\Style_Fill HashTable
*
- * @var PHPExcel_HashTable
+ * @var PHPExcel\HashTable
*/
private $_fillHashTable;
/**
- * Private unique PHPExcel_Style_Font HashTable
+ * Private unique PHPExcel\Style_Font HashTable
*
- * @var PHPExcel_HashTable
+ * @var PHPExcel\HashTable
*/
private $_fontHashTable;
/**
- * Private unique PHPExcel_Style_Borders HashTable
+ * Private unique PHPExcel\Style_Borders HashTable
*
- * @var PHPExcel_HashTable
+ * @var PHPExcel\HashTable
*/
private $_bordersHashTable ;
/**
- * Private unique PHPExcel_Style_NumberFormat HashTable
+ * Private unique PHPExcel\Style_NumberFormat HashTable
*
- * @var PHPExcel_HashTable
+ * @var PHPExcel\HashTable
*/
private $_numFmtHashTable;
/**
- * Private unique PHPExcel_Worksheet_BaseDrawing HashTable
+ * Private unique PHPExcel\Worksheet_BaseDrawing HashTable
*
- * @var PHPExcel_HashTable
+ * @var PHPExcel\HashTable
*/
private $_drawingHashTable;
/**
- * Create a new PHPExcel_Writer_Excel2007
+ * Create a new PHPExcel\Writer_Excel2007
*
* @param PHPExcel $pPHPExcel
*/
- public function __construct(PHPExcel $pPHPExcel = null)
+ public function __construct(Workbook $pPHPExcel = null)
{
// Assign PHPExcel
$this->setPHPExcel($pPHPExcel);
- $writerPartsArray = array( 'stringtable' => 'PHPExcel_Writer_Excel2007_StringTable',
- 'contenttypes' => 'PHPExcel_Writer_Excel2007_ContentTypes',
- 'docprops' => 'PHPExcel_Writer_Excel2007_DocProps',
- 'rels' => 'PHPExcel_Writer_Excel2007_Rels',
- 'theme' => 'PHPExcel_Writer_Excel2007_Theme',
- 'style' => 'PHPExcel_Writer_Excel2007_Style',
- 'workbook' => 'PHPExcel_Writer_Excel2007_Workbook',
- 'worksheet' => 'PHPExcel_Writer_Excel2007_Worksheet',
- 'drawing' => 'PHPExcel_Writer_Excel2007_Drawing',
- 'comments' => 'PHPExcel_Writer_Excel2007_Comments',
- 'chart' => 'PHPExcel_Writer_Excel2007_Chart',
+ $writerPartsArray = array( 'stringtable' => __NAMESPACE__ . '\Writer_Excel2007_StringTable',
+ 'contenttypes' => __NAMESPACE__ . '\Writer_Excel2007_ContentTypes',
+ 'docprops' => __NAMESPACE__ . '\Writer_Excel2007_DocProps',
+ 'rels' => __NAMESPACE__ . '\Writer_Excel2007_Rels',
+ 'theme' => __NAMESPACE__ . '\Writer_Excel2007_Theme',
+ 'style' => __NAMESPACE__ . '\Writer_Excel2007_Style',
+ 'workbook' => __NAMESPACE__ . '\Writer_Excel2007_Workbook',
+ 'worksheet' => __NAMESPACE__ . '\Writer_Excel2007_Worksheet',
+ 'drawing' => __NAMESPACE__ . '\Writer_Excel2007_Drawing',
+ 'comments' => __NAMESPACE__ . '\Writer_Excel2007_Comments',
+ 'chart' => __NAMESPACE__ . '\Writer_Excel2007_Chart',
);
// Initialise writer parts
@@ -140,7 +142,7 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
// Set HashTable variables
foreach ($hashTablesArray as $tableName) {
- $this->$tableName = new PHPExcel_HashTable();
+ $this->$tableName = new HashTable();
}
}
@@ -148,7 +150,7 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
* Get writer part
*
* @param string $pPartName Writer part name
- * @return PHPExcel_Writer_Excel2007_WriterPart
+ * @return PHPExcel\Writer_Excel2007_WriterPart
*/
public function getWriterPart($pPartName = '') {
if ($pPartName != '' && isset($this->_writerParts[strtolower($pPartName)])) {
@@ -162,7 +164,7 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
* Save PHPExcel to file
*
* @param string $pFilename
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function save($pFilename = null)
{
@@ -173,16 +175,16 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
// If $pFilename is php://output or php://stdout, make it a temporary file...
$originalFilename = $pFilename;
if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
- $pFilename = @tempnam(PHPExcel_Shared_File::sys_get_temp_dir(), 'phpxltmp');
+ $pFilename = @tempnam(Shared_File::sys_get_temp_dir(), 'phpxltmp');
if ($pFilename == '') {
$pFilename = $originalFilename;
}
}
- $saveDebugLog = PHPExcel_Calculation::getInstance($this->_spreadSheet)->getDebugLog()->getWriteDebugLog();
- PHPExcel_Calculation::getInstance($this->_spreadSheet)->getDebugLog()->setWriteDebugLog(FALSE);
- $saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType();
- PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
+ $saveDebugLog = Calculation::getInstance($this->_spreadSheet)->getDebugLog()->getWriteDebugLog();
+ Calculation::getInstance($this->_spreadSheet)->getDebugLog()->setWriteDebugLog(FALSE);
+ $saveDateReturnType = Calculation_Functions::getReturnDateType();
+ Calculation_Functions::setReturnDateType(Calculation_Functions::RETURNDATE_EXCEL);
// Create string lookup table
$this->_stringTable = array();
@@ -201,12 +203,12 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
$this->_drawingHashTable->addFromSource( $this->getWriterPart('Drawing')->allDrawings($this->_spreadSheet) );
// Create new ZIP file and open it for writing
- $zipClass = PHPExcel_Settings::getZipClass();
+ $zipClass = Settings::getZipClass();
$objZip = new $zipClass();
// Retrieve OVERWRITE and CREATE constants from the instantiated zip class
// This method of accessing constant values from a dynamic class should work with all appropriate versions of PHP
- $ro = new ReflectionObject($objZip);
+ $ro = new \ReflectionObject($objZip);
$zipOverWrite = $ro->getConstant('OVERWRITE');
$zipCreate = $ro->getConstant('CREATE');
@@ -216,7 +218,7 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
// Try opening the ZIP file
if ($objZip->open($pFilename, $zipOverWrite) !== true) {
if ($objZip->open($pFilename, $zipCreate) !== true) {
- throw new PHPExcel_Writer_Exception("Could not open " . $pFilename . " for writing.");
+ throw new Writer_Exception("Could not open " . $pFilename . " for writing.");
}
}
@@ -310,7 +312,7 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
// Add media
for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
- if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_Drawing) {
+ if ($this->getDrawingHashTable()->getByIndex($i) instanceof Worksheet_Drawing) {
$imageContents = null;
$imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
if (strpos($imagePath, 'zip://') !== false) {
@@ -327,7 +329,7 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
}
$objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
- } else if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_MemoryDrawing) {
+ } else if ($this->getDrawingHashTable()->getByIndex($i) instanceof Worksheet_MemoryDrawing) {
ob_start();
call_user_func(
$this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),
@@ -340,48 +342,48 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
}
}
- PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType);
- PHPExcel_Calculation::getInstance($this->_spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+ Calculation_Functions::setReturnDateType($saveDateReturnType);
+ Calculation::getInstance($this->_spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
// Close file
if ($objZip->close() === false) {
- throw new PHPExcel_Writer_Exception("Could not close zip file $pFilename.");
+ throw new Writer_Exception("Could not close zip file $pFilename.");
}
// If a temporary file was used, copy it to the correct file stream
if ($originalFilename != $pFilename) {
if (copy($pFilename, $originalFilename) === false) {
- throw new PHPExcel_Writer_Exception("Could not copy temporary zip file $pFilename to $originalFilename.");
+ throw new Writer_Exception("Could not copy temporary zip file $pFilename to $originalFilename.");
}
@unlink($pFilename);
}
} else {
- throw new PHPExcel_Writer_Exception("PHPExcel object unassigned.");
+ throw new Writer_Exception("PHPExcel object unassigned.");
}
}
/**
* Get PHPExcel object
*
- * @return PHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @return PHPExcel\Workbook
+ * @throws PHPExcel\Writer_Exception
*/
public function getPHPExcel() {
if ($this->_spreadSheet !== null) {
return $this->_spreadSheet;
} else {
- throw new PHPExcel_Writer_Exception("No PHPExcel assigned.");
+ throw new Writer_Exception("No PHPExcel assigned.");
}
}
/**
* Set PHPExcel object
*
- * @param PHPExcel $pPHPExcel PHPExcel object
- * @throws PHPExcel_Writer_Exception
- * @return PHPExcel_Writer_Excel2007
+ * @param PHPExcel\Workbook $pPHPExcel PHPExcel object
+ * @throws PHPExcel\Writer_Exception
+ * @return PHPExcel\Writer_Excel2007
*/
- public function setPHPExcel(PHPExcel $pPHPExcel = null) {
+ public function setPHPExcel(Workbook $pPHPExcel = null) {
$this->_spreadSheet = $pPHPExcel;
return $this;
}
@@ -396,54 +398,54 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
}
/**
- * Get PHPExcel_Style_Conditional HashTable
+ * Get PHPExcel\Style_Conditional HashTable
*
- * @return PHPExcel_HashTable
+ * @return PHPExcel\HashTable
*/
public function getStylesConditionalHashTable() {
return $this->_stylesConditionalHashTable;
}
/**
- * Get PHPExcel_Style_Fill HashTable
+ * Get PHPExcel\Style_Fill HashTable
*
- * @return PHPExcel_HashTable
+ * @return PHPExcel\HashTable
*/
public function getFillHashTable() {
return $this->_fillHashTable;
}
/**
- * Get PHPExcel_Style_Font HashTable
+ * Get PHPExcel\Style_Font HashTable
*
- * @return PHPExcel_HashTable
+ * @return PHPExcel\HashTable
*/
public function getFontHashTable() {
return $this->_fontHashTable;
}
/**
- * Get PHPExcel_Style_Borders HashTable
+ * Get PHPExcel\Style_Borders HashTable
*
- * @return PHPExcel_HashTable
+ * @return PHPExcel\HashTable
*/
public function getBordersHashTable() {
return $this->_bordersHashTable;
}
/**
- * Get PHPExcel_Style_NumberFormat HashTable
+ * Get PHPExcel\Style_NumberFormat HashTable
*
- * @return PHPExcel_HashTable
+ * @return PHPExcel\HashTable
*/
public function getNumFmtHashTable() {
return $this->_numFmtHashTable;
}
/**
- * Get PHPExcel_Worksheet_BaseDrawing HashTable
+ * Get PHPExcel\Worksheet_BaseDrawing HashTable
*
- * @return PHPExcel_HashTable
+ * @return PHPExcel\HashTable
*/
public function getDrawingHashTable() {
return $this->_drawingHashTable;
@@ -462,7 +464,7 @@ class PHPExcel_Writer_Excel2007 extends PHPExcel_Writer_Abstract implements PHPE
* Set Office2003 compatibility
*
* @param boolean $pValue Office2003 compatibility?
- * @return PHPExcel_Writer_Excel2007
+ * @return PHPExcel\Writer_Excel2007
*/
public function setOffice2003Compatibility($pValue = false) {
$this->_office2003compatibility = $pValue;
diff --git a/Classes/PHPExcel/Writer/Excel2007/Chart.php b/Classes/PHPExcel/Writer/Excel2007/Chart.php
index 763f8af..4a29723 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Chart.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Chart.php
@@ -19,37 +19,39 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_Chart
+ * PHPExcel\Writer_Excel2007_Chart
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_Chart extends Writer_Excel2007_WriterPart
{
/**
* Write charts to XML format
*
- * @param PHPExcel_Chart $pChart
+ * @param PHPExcel\Chart $pChart
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeChart(PHPExcel_Chart $pChart = null)
+ public function writeChart(Chart $pChart = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// Ensure that data series values are up-to-date before we save
$pChart->refresh();
@@ -118,11 +120,11 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Chart Title
*
- * @param PHPExcel_Chart_Title $title
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Chart_Title $title
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeTitle(PHPExcel_Chart_Title $title = null, $objWriter)
+ private function _writeTitle(Chart_Title $title = null, $objWriter)
{
if (is_null($title)) {
return;
@@ -162,11 +164,11 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Chart Legend
*
- * @param PHPExcel_Chart_Legend $legend
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Chart_Legend $legend
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeLegend(PHPExcel_Chart_Legend $legend = null, $objWriter)
+ private function _writeLegend(Chart_Legend $legend = null, $objWriter)
{
if (is_null($legend)) {
return;
@@ -213,17 +215,17 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Chart Plot Area
*
- * @param PHPExcel_Chart_PlotArea $plotArea
- * @param PHPExcel_Chart_Title $xAxisLabel
- * @param PHPExcel_Chart_Title $yAxisLabel
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Chart_PlotArea $plotArea
+ * @param PHPExcel\Chart_Title $xAxisLabel
+ * @param PHPExcel\Chart_Title $yAxisLabel
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writePlotArea(PHPExcel_Chart_PlotArea $plotArea,
- PHPExcel_Chart_Title $xAxisLabel = NULL,
- PHPExcel_Chart_Title $yAxisLabel = NULL,
+ private function _writePlotArea(Chart_PlotArea $plotArea,
+ Chart_Title $xAxisLabel = NULL,
+ Chart_Title $yAxisLabel = NULL,
$objWriter,
- PHPExcel_Worksheet $pSheet)
+ Worksheet $pSheet)
{
if (is_null($plotArea)) {
return;
@@ -250,11 +252,11 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
if ($groupType == $chartType) {
$plotStyle = $plotGroup->getPlotStyle();
- if ($groupType === PHPExcel_Chart_DataSeries::TYPE_RADARCHART) {
+ if ($groupType === Chart_DataSeries::TYPE_RADARCHART) {
$objWriter->startElement('c:radarStyle');
$objWriter->writeAttribute('val', $plotStyle );
$objWriter->endElement();
- } elseif ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART) {
+ } elseif ($groupType === Chart_DataSeries::TYPE_SCATTERCHART) {
$objWriter->startElement('c:scatterStyle');
$objWriter->writeAttribute('val', $plotStyle );
$objWriter->endElement();
@@ -266,14 +268,14 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$this->_writeDataLbls($objWriter, $layout);
- if ($chartType === PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
+ if ($chartType === Chart_DataSeries::TYPE_LINECHART) {
// Line only, Line3D can't be smoothed
$objWriter->startElement('c:smooth');
$objWriter->writeAttribute('val', (integer) $plotGroup->getSmoothLine() );
$objWriter->endElement();
- } elseif (($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
- ($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
+ } elseif (($chartType === Chart_DataSeries::TYPE_BARCHART) ||
+ ($chartType === Chart_DataSeries::TYPE_BARCHART_3D)) {
$objWriter->startElement('c:gapWidth');
$objWriter->writeAttribute('val', 150 );
@@ -286,7 +288,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->writeAttribute('val', 100 );
$objWriter->endElement();
}
- } elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+ } elseif ($chartType === Chart_DataSeries::TYPE_BUBBLECHART) {
$objWriter->startElement('c:bubbleScale');
$objWriter->writeAttribute('val', 25 );
@@ -295,7 +297,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->startElement('c:showNegBubbles');
$objWriter->writeAttribute('val', 0 );
$objWriter->endElement();
- } elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) {
+ } elseif ($chartType === Chart_DataSeries::TYPE_STOCKCHART) {
$objWriter->startElement('c:hiLowLines');
$objWriter->endElement();
@@ -309,9 +311,9 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$id1 = '75091328';
$id2 = '75089408';
- if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
- ($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
- ($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+ if (($chartType !== Chart_DataSeries::TYPE_PIECHART) &&
+ ($chartType !== Chart_DataSeries::TYPE_PIECHART_3D) &&
+ ($chartType !== Chart_DataSeries::TYPE_DONUTCHART)) {
$objWriter->startElement('c:axId');
$objWriter->writeAttribute('val', $id1 );
@@ -324,7 +326,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->writeAttribute('val', 0);
$objWriter->endElement();
- if ($chartType === PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) {
+ if ($chartType === Chart_DataSeries::TYPE_DONUTCHART) {
$objWriter->startElement('c:holeSize');
$objWriter->writeAttribute('val', 50);
@@ -335,11 +337,11 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement();
}
- if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
- ($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
- ($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+ if (($chartType !== Chart_DataSeries::TYPE_PIECHART) &&
+ ($chartType !== Chart_DataSeries::TYPE_PIECHART_3D) &&
+ ($chartType !== Chart_DataSeries::TYPE_DONUTCHART)) {
- if ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+ if ($chartType === Chart_DataSeries::TYPE_BUBBLECHART) {
$this->_writeValAx($objWriter,$plotArea,$xAxisLabel,$chartType,$id1,$id2,$catIsMultiLevelSeries);
} else {
$this->_writeCatAx($objWriter,$plotArea,$xAxisLabel,$chartType,$id1,$id2,$catIsMultiLevelSeries);
@@ -354,9 +356,9 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Data Labels
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Chart_Layout $chartLayout Chart layout
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Chart_Layout $chartLayout Chart layout
+ * @throws PHPExcel\Writer_Exception
*/
private function _writeDataLbls($objWriter, $chartLayout)
{
@@ -404,16 +406,16 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Category Axis
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Chart_PlotArea $plotArea
- * @param PHPExcel_Chart_Title $xAxisLabel
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Chart_PlotArea $plotArea
+ * @param PHPExcel\Chart_Title $xAxisLabel
* @param string $groupType Chart type
* @param string $id1
* @param string $id2
* @param boolean $isMultiLevelSeries
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeCatAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $xAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries)
+ private function _writeCatAx($objWriter, Chart_PlotArea $plotArea, $xAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries)
{
$objWriter->startElement('c:catAx');
@@ -456,7 +458,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$caption = $caption[0];
$objWriter->startElement('a:t');
// $objWriter->writeAttribute('xml:space', 'preserve');
- $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
+ $objWriter->writeRawData(Shared_String::ControlCharacterPHP2OOXML( $caption ));
$objWriter->endElement();
$objWriter->endElement();
@@ -527,16 +529,16 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Value Axis
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Chart_PlotArea $plotArea
- * @param PHPExcel_Chart_Title $yAxisLabel
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Chart_PlotArea $plotArea
+ * @param PHPExcel\Chart_Title $yAxisLabel
* @param string $groupType Chart type
* @param string $id1
* @param string $id2
* @param boolean $isMultiLevelSeries
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeValAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries)
+ private function _writeValAx($objWriter, Chart_PlotArea $plotArea, $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries)
{
$objWriter->startElement('c:valAx');
@@ -582,7 +584,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$caption = $caption[0];
$objWriter->startElement('a:t');
// $objWriter->writeAttribute('xml:space', 'preserve');
- $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
+ $objWriter->writeRawData(Shared_String::ControlCharacterPHP2OOXML( $caption ));
$objWriter->endElement();
$objWriter->endElement();
@@ -590,7 +592,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement();
$objWriter->endElement();
- if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+ if ($groupType !== Chart_DataSeries::TYPE_BUBBLECHART) {
$layout = $yAxisLabel->getLayout();
$this->_writeLayout($layout, $objWriter);
}
@@ -634,7 +636,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
}
if ($isMultiLevelSeries) {
- if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+ if ($groupType !== Chart_DataSeries::TYPE_BUBBLECHART) {
$objWriter->startElement('c:noMultiLvlLbl');
$objWriter->writeAttribute('val', 0);
$objWriter->endElement();
@@ -648,9 +650,9 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Get the data series type(s) for a chart plot series
*
- * @param PHPExcel_Chart_PlotArea $plotArea
+ * @param PHPExcel\Chart_PlotArea $plotArea
* @return string|array
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
private static function _getChartType($plotArea)
{
@@ -665,7 +667,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
}
$chartType = array_unique($chartTypes);
if (count($chartTypes) == 0) {
- throw new PHPExcel_Writer_Exception('Chart is not yet implemented');
+ throw new Writer_Exception('Chart is not yet implemented');
}
}
@@ -675,14 +677,14 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Plot Group (series of related plots)
*
- * @param PHPExcel_Chart_DataSeries $plotGroup
+ * @param PHPExcel\Chart_DataSeries $plotGroup
* @param string $groupType Type of plot for dataseries
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param boolean &$catIsMultiLevelSeries Is category a multi-series category
* @param boolean &$valIsMultiLevelSeries Is value set a multi-series set
* @param string &$plotGroupingType Type of grouping for multi-series values
- * @param PHPExcel_Worksheet $pSheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Worksheet $pSheet
+ * @throws PHPExcel\Writer_Exception
*/
private function _writePlotGroup( $plotGroup,
$groupType,
@@ -690,15 +692,15 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
&$catIsMultiLevelSeries,
&$valIsMultiLevelSeries,
&$plotGroupingType,
- PHPExcel_Worksheet $pSheet
+ Worksheet $pSheet
)
{
if (is_null($plotGroup)) {
return;
}
- if (($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
- ($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
+ if (($groupType == Chart_DataSeries::TYPE_BARCHART) ||
+ ($groupType == Chart_DataSeries::TYPE_BARCHART_3D)) {
$objWriter->startElement('c:barDir');
$objWriter->writeAttribute('val', $plotGroup->getPlotDirection());
$objWriter->endElement();
@@ -715,13 +717,13 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$plotSeriesOrder = $plotGroup->getPlotOrder();
$plotSeriesCount = count($plotSeriesOrder);
- if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_RADARCHART) &&
- ($groupType !== PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)) {
+ if (($groupType !== Chart_DataSeries::TYPE_RADARCHART) &&
+ ($groupType !== Chart_DataSeries::TYPE_STOCKCHART)) {
- if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
- if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
- ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
- ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) ||
+ if ($groupType !== Chart_DataSeries::TYPE_LINECHART) {
+ if (($groupType == Chart_DataSeries::TYPE_PIECHART) ||
+ ($groupType == Chart_DataSeries::TYPE_PIECHART_3D) ||
+ ($groupType == Chart_DataSeries::TYPE_DONUTCHART) ||
($plotSeriesCount > 1)) {
$objWriter->startElement('c:varyColors');
$objWriter->writeAttribute('val', 1);
@@ -745,9 +747,9 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->writeAttribute('val', $this->_seriesIndex + $plotSeriesRef);
$objWriter->endElement();
- if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
- ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
- ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+ if (($groupType == Chart_DataSeries::TYPE_PIECHART) ||
+ ($groupType == Chart_DataSeries::TYPE_PIECHART_3D) ||
+ ($groupType == Chart_DataSeries::TYPE_DONUTCHART)) {
$objWriter->startElement('c:dPt');
$objWriter->startElement('c:idx');
@@ -779,7 +781,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
}
// Formatting for the points
- if ($groupType == PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
+ if ($groupType == Chart_DataSeries::TYPE_LINECHART) {
$objWriter->startElement('c:spPr');
$objWriter->startElement('a:ln');
$objWriter->writeAttribute('w', 12700);
@@ -805,9 +807,9 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
}
}
- if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
- ($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D) ||
- ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART)) {
+ if (($groupType === Chart_DataSeries::TYPE_BARCHART) ||
+ ($groupType === Chart_DataSeries::TYPE_BARCHART_3D) ||
+ ($groupType === Chart_DataSeries::TYPE_BUBBLECHART)) {
$objWriter->startElement('c:invertIfNegative');
$objWriter->writeAttribute('val', 0);
@@ -819,9 +821,9 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
if ($plotSeriesCategory && ($plotSeriesCategory->getPointCount() > 0)) {
$catIsMultiLevelSeries = $catIsMultiLevelSeries || $plotSeriesCategory->isMultiLevelSeries();
- if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
- ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
- ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+ if (($groupType == Chart_DataSeries::TYPE_PIECHART) ||
+ ($groupType == Chart_DataSeries::TYPE_PIECHART_3D) ||
+ ($groupType == Chart_DataSeries::TYPE_DONUTCHART)) {
if (!is_null($plotGroup->getPlotStyle())) {
$plotStyle = $plotGroup->getPlotStyle();
@@ -833,8 +835,8 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
}
}
- if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
- ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
+ if (($groupType === Chart_DataSeries::TYPE_BUBBLECHART) ||
+ ($groupType === Chart_DataSeries::TYPE_SCATTERCHART)) {
$objWriter->startElement('c:xVal');
} else {
$objWriter->startElement('c:cat');
@@ -848,8 +850,8 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
if ($plotSeriesValues) {
$valIsMultiLevelSeries = $valIsMultiLevelSeries || $plotSeriesValues->isMultiLevelSeries();
- if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
- ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
+ if (($groupType === Chart_DataSeries::TYPE_BUBBLECHART) ||
+ ($groupType === Chart_DataSeries::TYPE_SCATTERCHART)) {
$objWriter->startElement('c:yVal');
} else {
$objWriter->startElement('c:val');
@@ -859,7 +861,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement();
}
- if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+ if ($groupType === Chart_DataSeries::TYPE_BUBBLECHART) {
$this->_writeBubbles($plotSeriesValues, $objWriter, $pSheet);
}
@@ -873,9 +875,9 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Plot Series Label
*
- * @param PHPExcel_Chart_DataSeriesValues $plotSeriesLabel
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Chart_DataSeriesValues $plotSeriesLabel
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
private function _writePlotSeriesLabel($plotSeriesLabel, $objWriter)
{
@@ -908,18 +910,18 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Plot Series Values
*
- * @param PHPExcel_Chart_DataSeriesValues $plotSeriesValues
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Chart_DataSeriesValues $plotSeriesValues
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param string $groupType Type of plot for dataseries
* @param string $dataType Datatype of series values
- * @param PHPExcel_Worksheet $pSheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Worksheet $pSheet
+ * @throws PHPExcel\Writer_Exception
*/
private function _writePlotSeriesValues( $plotSeriesValues,
$objWriter,
$groupType,
$dataType='str',
- PHPExcel_Worksheet $pSheet
+ Worksheet $pSheet
)
{
if (is_null($plotSeriesValues)) {
@@ -971,9 +973,9 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->startElement('c:'.$dataType.'Cache');
- if (($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
- ($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
- ($groupType != PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+ if (($groupType != Chart_DataSeries::TYPE_PIECHART) &&
+ ($groupType != Chart_DataSeries::TYPE_PIECHART_3D) &&
+ ($groupType != Chart_DataSeries::TYPE_DONUTCHART)) {
if (($plotSeriesValues->getFormatCode() !== NULL) &&
($plotSeriesValues->getFormatCode() !== '')) {
@@ -1011,11 +1013,11 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Bubble Chart Details
*
- * @param PHPExcel_Chart_DataSeriesValues $plotSeriesValues
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Chart_DataSeriesValues $plotSeriesValues
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeBubbles($plotSeriesValues, $objWriter, PHPExcel_Worksheet $pSheet)
+ private function _writeBubbles($plotSeriesValues, $objWriter, Worksheet $pSheet)
{
if (is_null($plotSeriesValues)) {
return;
@@ -1057,11 +1059,11 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Layout
*
- * @param PHPExcel_Chart_Layout $layout
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Chart_Layout $layout
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeLayout(PHPExcel_Chart_Layout $layout = NULL, $objWriter)
+ private function _writeLayout(Chart_Layout $layout = NULL, $objWriter)
{
$objWriter->startElement('c:layout');
@@ -1126,8 +1128,8 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Alternate Content block
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
private function _writeAlternateContent($objWriter)
{
@@ -1155,8 +1157,8 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Printer Settings
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
private function _writePrintSettings($objWriter)
{
diff --git a/Classes/PHPExcel/Writer/Excel2007/Comments.php b/Classes/PHPExcel/Writer/Excel2007/Comments.php
index cfaffef..0764313 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Comments.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Comments.php
@@ -19,37 +19,39 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_Comments
+ * PHPExcel\Writer_Excel2007_Comments
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_Comments extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_Comments extends Writer_Excel2007_WriterPart
{
/**
* Write comments to XML format
*
- * @param PHPExcel_Worksheet $pWorksheet
+ * @param PHPExcel\Worksheet $pWorksheet
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeComments(PHPExcel_Worksheet $pWorksheet = null)
+ public function writeComments(Worksheet $pWorksheet = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -94,13 +96,13 @@ class PHPExcel_Writer_Excel2007_Comments extends PHPExcel_Writer_Excel2007_Write
/**
* Write comment to XML format
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param string $pCellReference Cell reference
- * @param PHPExcel_Comment $pComment Comment
+ * @param PHPExcel\Comment $pComment Comment
* @param array $pAuthors Array of authors
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function _writeComment(PHPExcel_Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', PHPExcel_Comment $pComment = null, $pAuthors = null)
+ public function _writeComment(Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', Comment $pComment = null, $pAuthors = null)
{
// comment
$objWriter->startElement('comment');
@@ -118,18 +120,18 @@ class PHPExcel_Writer_Excel2007_Comments extends PHPExcel_Writer_Excel2007_Write
/**
* Write VML comments to XML format
*
- * @param PHPExcel_Worksheet $pWorksheet
+ * @param PHPExcel\Worksheet $pWorksheet
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeVMLComments(PHPExcel_Worksheet $pWorksheet = null)
+ public function writeVMLComments(Worksheet $pWorksheet = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -190,16 +192,16 @@ class PHPExcel_Writer_Excel2007_Comments extends PHPExcel_Writer_Excel2007_Write
/**
* Write VML comment to XML format
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param string $pCellReference Cell reference
- * @param PHPExcel_Comment $pComment Comment
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Comment $pComment Comment
+ * @throws PHPExcel\Writer_Exception
*/
- public function _writeVMLComment(PHPExcel_Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', PHPExcel_Comment $pComment = null)
+ public function _writeVMLComment(Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', Comment $pComment = null)
{
// Metadata
- list($column, $row) = PHPExcel_Cell::coordinateFromString($pCellReference);
- $column = PHPExcel_Cell::columnIndexFromString($column);
+ list($column, $row) = Cell::coordinateFromString($pCellReference);
+ $column = Cell::columnIndexFromString($column);
$id = 1024 + $column + $row;
$id = substr($id, 0, 4);
diff --git a/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php b/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
index 9fdc9dd..3c4364f 100644
--- a/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
+++ b/Classes/PHPExcel/Writer/Excel2007/ContentTypes.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_ContentTypes
+ * PHPExcel\Writer_Excel2007_ContentTypes
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_ContentTypes extends Writer_Excel2007_WriterPart
{
/**
* Write content types to XML format
@@ -41,16 +43,16 @@ class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_W
* @param PHPExcel $pPHPExcel
* @param boolean $includeCharts Flag indicating if we should include drawing details for charts
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeContentTypes(PHPExcel $pPHPExcel = null, $includeCharts = FALSE)
+ public function writeContentTypes(Workbook $pPHPExcel = null, $includeCharts = FALSE)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -159,10 +161,10 @@ class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_W
$extension = '';
$mimeType = '';
- if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_Drawing) {
+ if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof Worksheet_Drawing) {
$extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());
$mimeType = $this->_getImageMimeType( $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getPath() );
- } else if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_MemoryDrawing) {
+ } else if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof Worksheet_MemoryDrawing) {
$extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType());
$extension = explode('/', $extension);
$extension = $extension[1];
@@ -205,27 +207,27 @@ class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_W
*
* @param string $pFile Filename
* @return string Mime Type
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
private function _getImageMimeType($pFile = '')
{
- if (PHPExcel_Shared_File::file_exists($pFile)) {
+ if (Shared_File::file_exists($pFile)) {
$image = getimagesize($pFile);
return image_type_to_mime_type($image[2]);
} else {
- throw new PHPExcel_Writer_Exception("File $pFile does not exist");
+ throw new Writer_Exception("File $pFile does not exist");
}
}
/**
* Write Default content type
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param string $pPartname Part name
* @param string $pContentType Content type
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDefaultContentType(PHPExcel_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
+ private function _writeDefaultContentType(Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
{
if ($pPartname != '' && $pContentType != '') {
// Write content type
@@ -234,19 +236,19 @@ class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_W
$objWriter->writeAttribute('ContentType', $pContentType);
$objWriter->endElement();
} else {
- throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+ throw new Writer_Exception("Invalid parameters passed.");
}
}
/**
* Write Override content type
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param string $pPartname Part name
* @param string $pContentType Content type
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeOverrideContentType(PHPExcel_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
+ private function _writeOverrideContentType(Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
{
if ($pPartname != '' && $pContentType != '') {
// Write content type
@@ -255,7 +257,7 @@ class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_W
$objWriter->writeAttribute('ContentType', $pContentType);
$objWriter->endElement();
} else {
- throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+ throw new Writer_Exception("Invalid parameters passed.");
}
}
}
diff --git a/Classes/PHPExcel/Writer/Excel2007/DocProps.php b/Classes/PHPExcel/Writer/Excel2007/DocProps.php
index 3d1497a..508df74 100644
--- a/Classes/PHPExcel/Writer/Excel2007/DocProps.php
+++ b/Classes/PHPExcel/Writer/Excel2007/DocProps.php
@@ -19,37 +19,39 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_DocProps
+ * PHPExcel\Writer_Excel2007_DocProps
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_DocProps extends Writer_Excel2007_WriterPart
{
/**
* Write docProps/app.xml to XML format
*
* @param PHPExcel $pPHPExcel
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeDocPropsApp(PHPExcel $pPHPExcel = null)
+ public function writeDocPropsApp(Workbook $pPHPExcel = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -137,16 +139,16 @@ class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_Write
*
* @param PHPExcel $pPHPExcel
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeDocPropsCore(PHPExcel $pPHPExcel = null)
+ public function writeDocPropsCore(Workbook $pPHPExcel = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -204,9 +206,9 @@ class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_Write
*
* @param PHPExcel $pPHPExcel
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeDocPropsCustom(PHPExcel $pPHPExcel = null)
+ public function writeDocPropsCustom(Workbook $pPHPExcel = null)
{
$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
if (empty($customPropertyList)) {
@@ -216,9 +218,9 @@ class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_Write
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
diff --git a/Classes/PHPExcel/Writer/Excel2007/Drawing.php b/Classes/PHPExcel/Writer/Excel2007/Drawing.php
index 2bc4b39..93fd15d 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Drawing.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Drawing.php
@@ -19,39 +19,41 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_Drawing
+ * PHPExcel\Writer_Excel2007_Drawing
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_Drawing extends Writer_Excel2007_WriterPart
{
/**
* Write drawings to XML format
*
- * @param PHPExcel_Worksheet $pWorksheet
+ * @param PHPExcel\Worksheet $pWorksheet
* @param int &$chartRef Chart ID
* @param boolean $includeCharts Flag indicating if we should include drawing details for charts
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeDrawings(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
+ public function writeDrawings(Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -92,31 +94,31 @@ class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_Writer
/**
* Write drawings to XML format
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Chart $pChart
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Chart $pChart
* @param int $pRelationId
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function _writeChart(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Chart $pChart = null, $pRelationId = -1)
+ public function _writeChart(Shared_XMLWriter $objWriter = null, Chart $pChart = null, $pRelationId = -1)
{
$tl = $pChart->getTopLeftPosition();
- $tl['colRow'] = PHPExcel_Cell::coordinateFromString($tl['cell']);
+ $tl['colRow'] = Cell::coordinateFromString($tl['cell']);
$br = $pChart->getBottomRightPosition();
- $br['colRow'] = PHPExcel_Cell::coordinateFromString($br['cell']);
+ $br['colRow'] = Cell::coordinateFromString($br['cell']);
$objWriter->startElement('xdr:twoCellAnchor');
$objWriter->startElement('xdr:from');
- $objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($tl['colRow'][0]) - 1);
- $objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['xOffset']));
+ $objWriter->writeElement('xdr:col', Cell::columnIndexFromString($tl['colRow'][0]) - 1);
+ $objWriter->writeElement('xdr:colOff', Shared_Drawing::pixelsToEMU($tl['xOffset']));
$objWriter->writeElement('xdr:row', $tl['colRow'][1] - 1);
- $objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['yOffset']));
+ $objWriter->writeElement('xdr:rowOff', Shared_Drawing::pixelsToEMU($tl['yOffset']));
$objWriter->endElement();
$objWriter->startElement('xdr:to');
- $objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($br['colRow'][0]) - 1);
- $objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['xOffset']));
+ $objWriter->writeElement('xdr:col', Cell::columnIndexFromString($br['colRow'][0]) - 1);
+ $objWriter->writeElement('xdr:colOff', Shared_Drawing::pixelsToEMU($br['xOffset']));
$objWriter->writeElement('xdr:row', $br['colRow'][1] - 1);
- $objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['yOffset']));
+ $objWriter->writeElement('xdr:rowOff', Shared_Drawing::pixelsToEMU($br['yOffset']));
$objWriter->endElement();
$objWriter->startElement('xdr:graphicFrame');
@@ -164,32 +166,32 @@ class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_Writer
/**
* Write drawings to XML format
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet_BaseDrawing $pDrawing
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet_BaseDrawing $pDrawing
* @param int $pRelationId
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function _writeDrawing(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet_BaseDrawing $pDrawing = null, $pRelationId = -1)
+ public function _writeDrawing(Shared_XMLWriter $objWriter = null, Worksheet_BaseDrawing $pDrawing = null, $pRelationId = -1)
{
if ($pRelationId >= 0) {
// xdr:oneCellAnchor
$objWriter->startElement('xdr:oneCellAnchor');
// Image location
- $aCoordinates = PHPExcel_Cell::coordinateFromString($pDrawing->getCoordinates());
- $aCoordinates[0] = PHPExcel_Cell::columnIndexFromString($aCoordinates[0]);
+ $aCoordinates = Cell::coordinateFromString($pDrawing->getCoordinates());
+ $aCoordinates[0] = Cell::columnIndexFromString($aCoordinates[0]);
// xdr:from
$objWriter->startElement('xdr:from');
$objWriter->writeElement('xdr:col', $aCoordinates[0] - 1);
- $objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getOffsetX()));
+ $objWriter->writeElement('xdr:colOff', Shared_Drawing::pixelsToEMU($pDrawing->getOffsetX()));
$objWriter->writeElement('xdr:row', $aCoordinates[1] - 1);
- $objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getOffsetY()));
+ $objWriter->writeElement('xdr:rowOff', Shared_Drawing::pixelsToEMU($pDrawing->getOffsetY()));
$objWriter->endElement();
// xdr:ext
$objWriter->startElement('xdr:ext');
- $objWriter->writeAttribute('cx', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getWidth()));
- $objWriter->writeAttribute('cy', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getHeight()));
+ $objWriter->writeAttribute('cx', Shared_Drawing::pixelsToEMU($pDrawing->getWidth()));
+ $objWriter->writeAttribute('cy', Shared_Drawing::pixelsToEMU($pDrawing->getHeight()));
$objWriter->endElement();
// xdr:pic
@@ -238,7 +240,7 @@ class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_Writer
// a:xfrm
$objWriter->startElement('a:xfrm');
- $objWriter->writeAttribute('rot', PHPExcel_Shared_Drawing::degreesToAngle($pDrawing->getRotation()));
+ $objWriter->writeAttribute('rot', Shared_Drawing::degreesToAngle($pDrawing->getRotation()));
$objWriter->endElement();
// a:prstGeom
@@ -297,9 +299,9 @@ class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_Writer
// a:outerShdw
$objWriter->startElement('a:outerShdw');
- $objWriter->writeAttribute('blurRad', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getBlurRadius()));
- $objWriter->writeAttribute('dist', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getDistance()));
- $objWriter->writeAttribute('dir', PHPExcel_Shared_Drawing::degreesToAngle($pDrawing->getShadow()->getDirection()));
+ $objWriter->writeAttribute('blurRad', Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getBlurRadius()));
+ $objWriter->writeAttribute('dist', Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getDistance()));
+ $objWriter->writeAttribute('dir', Shared_Drawing::degreesToAngle($pDrawing->getShadow()->getDirection()));
$objWriter->writeAttribute('algn', $pDrawing->getShadow()->getAlignment());
$objWriter->writeAttribute('rotWithShape', '0');
@@ -375,25 +377,25 @@ class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_Writer
$objWriter->endElement();
} else {
- throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+ throw new Writer_Exception("Invalid parameters passed.");
}
}
/**
* Write VML header/footer images to XML format
*
- * @param PHPExcel_Worksheet $pWorksheet
+ * @param PHPExcel\Worksheet $pWorksheet
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeVMLHeaderFooterImages(PHPExcel_Worksheet $pWorksheet = null)
+ public function writeVMLHeaderFooterImages(Worksheet $pWorksheet = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -529,12 +531,12 @@ class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_Writer
/**
* Write VML comment to XML format
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param string $pReference Reference
- * @param PHPExcel_Worksheet_HeaderFooterDrawing $pImage Image
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Worksheet_HeaderFooterDrawing $pImage Image
+ * @throws PHPExcel\Writer_Exception
*/
- public function _writeVMLHeaderFooterImage(PHPExcel_Shared_XMLWriter $objWriter = null, $pReference = '', PHPExcel_Worksheet_HeaderFooterDrawing $pImage = null)
+ public function _writeVMLHeaderFooterImage(Shared_XMLWriter $objWriter = null, $pReference = '', Worksheet_HeaderFooterDrawing $pImage = null)
{
// Calculate object id
preg_match('{(\d+)}', md5($pReference), $m);
@@ -572,11 +574,11 @@ class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_Writer
/**
* Get an array of all drawings
*
- * @param PHPExcel $pPHPExcel
- * @return PHPExcel_Worksheet_Drawing[] All drawings in PHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Workbook $pPHPExcel
+ * @return PHPExcel\Worksheet_Drawing[] All drawings in PHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- public function allDrawings(PHPExcel $pPHPExcel = null)
+ public function allDrawings(Workbook $pPHPExcel = null)
{
// Get an array of all drawings
$aDrawings = array();
diff --git a/Classes/PHPExcel/Writer/Excel2007/Rels.php b/Classes/PHPExcel/Writer/Excel2007/Rels.php
index fa225ee..3378459 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Rels.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Rels.php
@@ -19,37 +19,39 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_Rels
+ * PHPExcel\Writer_Excel2007_Rels
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_Rels extends Writer_Excel2007_WriterPart
{
/**
* Write relationships to XML format
*
* @param PHPExcel $pPHPExcel
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeRelationships(PHPExcel $pPHPExcel = null)
+ public function writeRelationships(Workbook $pPHPExcel = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -106,16 +108,16 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
*
* @param PHPExcel $pPHPExcel
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeWorkbookRelationships(PHPExcel $pPHPExcel = null)
+ public function writeWorkbookRelationships(Workbook $pPHPExcel = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -173,20 +175,20 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
* rId1 - Drawings
* rId_hyperlink_x - Hyperlinks
*
- * @param PHPExcel_Worksheet $pWorksheet
+ * @param PHPExcel\Worksheet $pWorksheet
* @param int $pWorksheetId
* @param boolean $includeCharts Flag indicating if we should write charts
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeWorksheetRelationships(PHPExcel_Worksheet $pWorksheet = null, $pWorksheetId = 1, $includeCharts = FALSE)
+ public function writeWorksheetRelationships(Worksheet $pWorksheet = null, $pWorksheetId = 1, $includeCharts = FALSE)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -282,20 +284,20 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
/**
* Write drawing relationships to XML format
*
- * @param PHPExcel_Worksheet $pWorksheet
+ * @param PHPExcel\Worksheet $pWorksheet
* @param int &$chartRef Chart ID
* @param boolean $includeCharts Flag indicating if we should write charts
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
+ public function writeDrawingRelationships(Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -309,8 +311,8 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
$i = 1;
$iterator = $pWorksheet->getDrawingCollection()->getIterator();
while ($iterator->valid()) {
- if ($iterator->current() instanceof PHPExcel_Worksheet_Drawing
- || $iterator->current() instanceof PHPExcel_Worksheet_MemoryDrawing) {
+ if ($iterator->current() instanceof Worksheet_Drawing
+ || $iterator->current() instanceof Worksheet_MemoryDrawing) {
// Write relationship for image drawing
$this->_writeRelationship(
$objWriter,
@@ -348,18 +350,18 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
/**
* Write header/footer drawing relationships to XML format
*
- * @param PHPExcel_Worksheet $pWorksheet
+ * @param PHPExcel\Worksheet $pWorksheet
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeHeaderFooterDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null)
+ public function writeHeaderFooterDrawingRelationships(Worksheet $pWorksheet = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -389,14 +391,14 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
/**
* Write Override content type
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param int $pId Relationship ID. rId will be prepended!
* @param string $pType Relationship type
* @param string $pTarget Relationship target
* @param string $pTargetMode Relationship target mode
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeRelationship(PHPExcel_Shared_XMLWriter $objWriter = null, $pId = 1, $pType = '', $pTarget = '', $pTargetMode = '')
+ private function _writeRelationship(Shared_XMLWriter $objWriter = null, $pId = 1, $pType = '', $pTarget = '', $pTargetMode = '')
{
if ($pType != '' && $pTarget != '') {
// Write relationship
@@ -411,7 +413,7 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
$objWriter->endElement();
} else {
- throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+ throw new Writer_Exception("Invalid parameters passed.");
}
}
}
diff --git a/Classes/PHPExcel/Writer/Excel2007/StringTable.php b/Classes/PHPExcel/Writer/Excel2007/StringTable.php
index d6a7027..ca41ab6 100644
--- a/Classes/PHPExcel/Writer/Excel2007/StringTable.php
+++ b/Classes/PHPExcel/Writer/Excel2007/StringTable.php
@@ -19,29 +19,31 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_StringTable
+ * PHPExcel\Writer_Excel2007_StringTable
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_StringTable extends Writer_Excel2007_WriterPart
{
/**
* Create worksheet stringtable
*
- * @param PHPExcel_Worksheet $pSheet Worksheet
+ * @param PHPExcel\Worksheet $pSheet Worksheet
* @param string[] $pExistingTable Existing table to eventually merge with
* @return string[] String table for worksheet
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function createStringTable($pSheet = null, $pExistingTable = null)
{
@@ -67,10 +69,10 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
($cellValue !== NULL) &&
$cellValue !== '' &&
!isset($aFlippedStringTable[$cellValue]) &&
- ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING2 || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_NULL)) {
+ ($cell->getDataType() == Cell_DataType::TYPE_STRING || $cell->getDataType() == Cell_DataType::TYPE_STRING2 || $cell->getDataType() == Cell_DataType::TYPE_NULL)) {
$aStringTable[] = $cellValue;
$aFlippedStringTable[$cellValue] = true;
- } elseif ($cellValue instanceof PHPExcel_RichText &&
+ } elseif ($cellValue instanceof RichText &&
($cellValue !== NULL) &&
!isset($aFlippedStringTable[$cellValue->getHashCode()])) {
$aStringTable[] = $cellValue;
@@ -81,7 +83,7 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
// Return
return $aStringTable;
} else {
- throw new PHPExcel_Writer_Exception("Invalid PHPExcel_Worksheet object passed.");
+ throw new Writer_Exception("Invalid PHPExcel\Worksheet object passed.");
}
}
@@ -90,7 +92,7 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
*
* @param string[] $pStringTable
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function writeStringTable($pStringTable = null)
{
@@ -98,9 +100,9 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -115,15 +117,15 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
foreach ($pStringTable as $textElement) {
$objWriter->startElement('si');
- if (! $textElement instanceof PHPExcel_RichText) {
- $textToWrite = PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $textElement );
+ if (! $textElement instanceof RichText) {
+ $textToWrite = Shared_String::ControlCharacterPHP2OOXML( $textElement );
$objWriter->startElement('t');
if ($textToWrite !== trim($textToWrite)) {
$objWriter->writeAttribute('xml:space', 'preserve');
}
$objWriter->writeRawData($textToWrite);
$objWriter->endElement();
- } else if ($textElement instanceof PHPExcel_RichText) {
+ } else if ($textElement instanceof RichText) {
$this->writeRichText($objWriter, $textElement);
}
@@ -135,19 +137,19 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
// Return
return $objWriter->getData();
} else {
- throw new PHPExcel_Writer_Exception("Invalid string table array passed.");
+ throw new Writer_Exception("Invalid string table array passed.");
}
}
/**
* Write Rich Text
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_RichText $pRichText Rich text
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\RichText $pRichText Rich text
* @param string $prefix Optional Namespace prefix
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeRichText(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_RichText $pRichText = null, $prefix=NULL)
+ public function writeRichText(Shared_XMLWriter $objWriter = null, RichText $pRichText = null, $prefix=NULL)
{
if ($prefix !== NULL)
$prefix .= ':';
@@ -158,7 +160,7 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
$objWriter->startElement($prefix.'r');
// rPr
- if ($element instanceof PHPExcel_RichText_Run) {
+ if ($element instanceof RichText_Run) {
// rPr
$objWriter->startElement($prefix.'rPr');
@@ -214,7 +216,7 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
// t
$objWriter->startElement($prefix.'t');
$objWriter->writeAttribute('xml:space', 'preserve');
- $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
+ $objWriter->writeRawData(Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
$objWriter->endElement();
$objWriter->endElement();
@@ -224,16 +226,16 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
/**
* Write Rich Text
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param string|PHPExcel_RichText $pRichText text string or Rich text
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param string|PHPExcel\RichText $pRichText text string or Rich text
* @param string $prefix Optional Namespace prefix
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeRichTextForCharts(PHPExcel_Shared_XMLWriter $objWriter = null, $pRichText = null, $prefix=NULL)
+ public function writeRichTextForCharts(Shared_XMLWriter $objWriter = null, $pRichText = null, $prefix=NULL)
{
- if (!$pRichText instanceof PHPExcel_RichText) {
+ if (!$pRichText instanceof RichText) {
$textRun = $pRichText;
- $pRichText = new PHPExcel_RichText();
+ $pRichText = new RichText();
$pRichText->createTextRun($textRun);
}
@@ -287,7 +289,7 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
// t
$objWriter->startElement($prefix.'t');
// $objWriter->writeAttribute('xml:space', 'preserve'); // Excel2010 accepts, Excel2007 complains
- $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
+ $objWriter->writeRawData(Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
$objWriter->endElement();
$objWriter->endElement();
@@ -306,9 +308,9 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
// Loop through stringtable and add flipped items to $returnValue
foreach ($stringTable as $key => $value) {
- if (! $value instanceof PHPExcel_RichText) {
+ if (! $value instanceof RichText) {
$returnValue[$value] = $key;
- } else if ($value instanceof PHPExcel_RichText) {
+ } else if ($value instanceof RichText) {
$returnValue[$value->getHashCode()] = $key;
}
}
diff --git a/Classes/PHPExcel/Writer/Excel2007/Style.php b/Classes/PHPExcel/Writer/Excel2007/Style.php
index 887b5ab..edac85b 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Style.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Style.php
@@ -19,37 +19,39 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_Style
+ * PHPExcel\Writer_Excel2007_Style
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_Style extends Writer_Excel2007_WriterPart
{
/**
* Write styles to XML format
*
- * @param PHPExcel $pPHPExcel
- * @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Workbook $pPHPExcel
+ * @return string XML Output
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeStyles(PHPExcel $pPHPExcel = null)
+ public function writeStyles(Workbook $pPHPExcel = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -168,15 +170,15 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Fill
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Style_Fill $pFill Fill style
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Style_Fill $pFill Fill style
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
+ private function _writeFill(Shared_XMLWriter $objWriter = null, Style_Fill $pFill = null)
{
// Check if this is a pattern type or gradient type
- if ($pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR ||
- $pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_PATH) {
+ if ($pFill->getFillType() === Style_Fill::FILL_GRADIENT_LINEAR ||
+ $pFill->getFillType() === Style_Fill::FILL_GRADIENT_PATH) {
// Gradient fill
$this->_writeGradientFill($objWriter, $pFill);
} elseif($pFill->getFillType() !== NULL) {
@@ -188,11 +190,11 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Gradient Fill
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Style_Fill $pFill Fill style
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Style_Fill $pFill Fill style
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeGradientFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
+ private function _writeGradientFill(Shared_XMLWriter $objWriter = null, Style_Fill $pFill = null)
{
// fill
$objWriter->startElement('fill');
@@ -232,11 +234,11 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Pattern Fill
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Style_Fill $pFill Fill style
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Style_Fill $pFill Fill style
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writePatternFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
+ private function _writePatternFill(Shared_XMLWriter $objWriter = null, Style_Fill $pFill = null)
{
// fill
$objWriter->startElement('fill');
@@ -245,7 +247,7 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->startElement('patternFill');
$objWriter->writeAttribute('patternType', $pFill->getFillType());
- if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
+ if ($pFill->getFillType() !== Style_Fill::FILL_NONE) {
// fgColor
if ($pFill->getStartColor()->getARGB()) {
$objWriter->startElement('fgColor');
@@ -253,7 +255,7 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement();
}
}
- if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
+ if ($pFill->getFillType() !== Style_Fill::FILL_NONE) {
// bgColor
if ($pFill->getEndColor()->getARGB()) {
$objWriter->startElement('bgColor');
@@ -270,11 +272,11 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Font
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Style_Font $pFont Font style
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Style_Font $pFont Font style
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeFont(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Font $pFont = null)
+ private function _writeFont(Shared_XMLWriter $objWriter = null, Style_Font $pFont = null)
{
// font
$objWriter->startElement('font');
@@ -350,25 +352,25 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Border
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Style_Borders $pBorders Borders style
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Style_Borders $pBorders Borders style
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeBorder(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Borders $pBorders = null)
+ private function _writeBorder(Shared_XMLWriter $objWriter = null, Style_Borders $pBorders = null)
{
// Write border
$objWriter->startElement('border');
// Diagonal?
switch ($pBorders->getDiagonalDirection()) {
- case PHPExcel_Style_Borders::DIAGONAL_UP:
+ case Style_Borders::DIAGONAL_UP:
$objWriter->writeAttribute('diagonalUp', 'true');
$objWriter->writeAttribute('diagonalDown', 'false');
break;
- case PHPExcel_Style_Borders::DIAGONAL_DOWN:
+ case Style_Borders::DIAGONAL_DOWN:
$objWriter->writeAttribute('diagonalUp', 'false');
$objWriter->writeAttribute('diagonalDown', 'true');
break;
- case PHPExcel_Style_Borders::DIAGONAL_BOTH:
+ case Style_Borders::DIAGONAL_BOTH:
$objWriter->writeAttribute('diagonalUp', 'true');
$objWriter->writeAttribute('diagonalDown', 'true');
break;
@@ -386,12 +388,12 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Cell Style Xf
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Style $pStyle Style
- * @param PHPExcel $pPHPExcel Workbook
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Style $pStyle Style
+ * @param PHPExcel\Workbook $pPHPExcel Workbook
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeCellStyleXf(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style $pStyle = null, PHPExcel $pPHPExcel = null)
+ private function _writeCellStyleXf(Shared_XMLWriter $objWriter = null, Style $pStyle = null, Workbook $pPHPExcel = null)
{
// xf
$objWriter->startElement('xf');
@@ -413,7 +415,7 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->writeAttribute('applyFill', ($pPHPExcel->getDefaultStyle()->getFill()->getHashCode() != $pStyle->getFill()->getHashCode()) ? '1' : '0');
$objWriter->writeAttribute('applyBorder', ($pPHPExcel->getDefaultStyle()->getBorders()->getHashCode() != $pStyle->getBorders()->getHashCode()) ? '1' : '0');
$objWriter->writeAttribute('applyAlignment', ($pPHPExcel->getDefaultStyle()->getAlignment()->getHashCode() != $pStyle->getAlignment()->getHashCode()) ? '1' : '0');
- if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+ if ($pStyle->getProtection()->getLocked() != Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != Style_Protection::PROTECTION_INHERIT) {
$objWriter->writeAttribute('applyProtection', 'true');
}
@@ -439,13 +441,13 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement();
// protection
- if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+ if ($pStyle->getProtection()->getLocked() != Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != Style_Protection::PROTECTION_INHERIT) {
$objWriter->startElement('protection');
- if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
- $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+ if ($pStyle->getProtection()->getLocked() != Style_Protection::PROTECTION_INHERIT) {
+ $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
}
- if ($pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
- $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+ if ($pStyle->getProtection()->getHidden() != Style_Protection::PROTECTION_INHERIT) {
+ $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
}
$objWriter->endElement();
}
@@ -456,11 +458,11 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write Cell Style Dxf
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Style $pStyle Style
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Style $pStyle Style
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeCellStyleDxf(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style $pStyle = null)
+ private function _writeCellStyleDxf(Shared_XMLWriter $objWriter = null, Style $pStyle = null)
{
// dxf
$objWriter->startElement('dxf');
@@ -500,16 +502,16 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
// protection
if (($pStyle->getProtection()->getLocked() !== NULL) ||
($pStyle->getProtection()->getHidden() !== NULL)) {
- if ($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT ||
- $pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+ if ($pStyle->getProtection()->getLocked() !== Style_Protection::PROTECTION_INHERIT ||
+ $pStyle->getProtection()->getHidden() !== Style_Protection::PROTECTION_INHERIT) {
$objWriter->startElement('protection');
if (($pStyle->getProtection()->getLocked() !== NULL) &&
- ($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
- $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+ ($pStyle->getProtection()->getLocked() !== Style_Protection::PROTECTION_INHERIT)) {
+ $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
}
if (($pStyle->getProtection()->getHidden() !== NULL) &&
- ($pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
- $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+ ($pStyle->getProtection()->getHidden() !== Style_Protection::PROTECTION_INHERIT)) {
+ $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
}
$objWriter->endElement();
}
@@ -521,15 +523,15 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write BorderPr
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param string $pName Element name
- * @param PHPExcel_Style_Border $pBorder Border style
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Style_Border $pBorder Border style
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeBorderPr(PHPExcel_Shared_XMLWriter $objWriter = null, $pName = 'left', PHPExcel_Style_Border $pBorder = null)
+ private function _writeBorderPr(Shared_XMLWriter $objWriter = null, $pName = 'left', Style_Border $pBorder = null)
{
// Write BorderPr
- if ($pBorder->getBorderStyle() != PHPExcel_Style_Border::BORDER_NONE) {
+ if ($pBorder->getBorderStyle() != Style_Border::BORDER_NONE) {
$objWriter->startElement($pName);
$objWriter->writeAttribute('style', $pBorder->getBorderStyle());
@@ -545,12 +547,12 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write NumberFormat
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Style_NumberFormat $pNumberFormat Number Format
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Style_NumberFormat $pNumberFormat Number Format
* @param int $pId Number Format identifier
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeNumFmt(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_NumberFormat $pNumberFormat = null, $pId = 0)
+ private function _writeNumFmt(Shared_XMLWriter $objWriter = null, Style_NumberFormat $pNumberFormat = null, $pId = 0)
{
// Translate formatcode
$formatCode = $pNumberFormat->getFormatCode();
@@ -568,10 +570,10 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
* Get an array of all styles
*
* @param PHPExcel $pPHPExcel
- * @return PHPExcel_Style[] All styles in PHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @return PHPExcel\Style[] All styles in PHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- public function allStyles(PHPExcel $pPHPExcel = null)
+ public function allStyles(Workbook $pPHPExcel = null)
{
$aStyles = $pPHPExcel->getCellXfCollection();
@@ -582,10 +584,10 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
* Get an array of all conditional styles
*
* @param PHPExcel $pPHPExcel
- * @return PHPExcel_Style_Conditional[] All conditional styles in PHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @return PHPExcel\Style_Conditional[] All conditional styles in PHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- public function allConditionalStyles(PHPExcel $pPHPExcel = null)
+ public function allConditionalStyles(Workbook $pPHPExcel = null)
{
// Get an array of all styles
$aStyles = array();
@@ -606,21 +608,21 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
* Get an array of all fills
*
* @param PHPExcel $pPHPExcel
- * @return PHPExcel_Style_Fill[] All fills in PHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @return PHPExcel\Style_Fill[] All fills in PHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- public function allFills(PHPExcel $pPHPExcel = null)
+ public function allFills(Workbook $pPHPExcel = null)
{
// Get an array of unique fills
$aFills = array();
// Two first fills are predefined
- $fill0 = new PHPExcel_Style_Fill();
- $fill0->setFillType(PHPExcel_Style_Fill::FILL_NONE);
+ $fill0 = new Style_Fill();
+ $fill0->setFillType(Style_Fill::FILL_NONE);
$aFills[] = $fill0;
- $fill1 = new PHPExcel_Style_Fill();
- $fill1->setFillType(PHPExcel_Style_Fill::FILL_PATTERN_GRAY125);
+ $fill1 = new Style_Fill();
+ $fill1->setFillType(Style_Fill::FILL_PATTERN_GRAY125);
$aFills[] = $fill1;
// The remaining fills
$aStyles = $this->allStyles($pPHPExcel);
@@ -637,10 +639,10 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
* Get an array of all fonts
*
* @param PHPExcel $pPHPExcel
- * @return PHPExcel_Style_Font[] All fonts in PHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @return PHPExcel\Style_Font[] All fonts in PHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- public function allFonts(PHPExcel $pPHPExcel = null)
+ public function allFonts(Workbook $pPHPExcel = null)
{
// Get an array of unique fonts
$aFonts = array();
@@ -659,10 +661,10 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
* Get an array of all borders
*
* @param PHPExcel $pPHPExcel
- * @return PHPExcel_Style_Borders[] All borders in PHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @return PHPExcel\Style_Borders[] All borders in PHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- public function allBorders(PHPExcel $pPHPExcel = null)
+ public function allBorders(Workbook $pPHPExcel = null)
{
// Get an array of unique borders
$aBorders = array();
@@ -681,10 +683,10 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
* Get an array of all number formats
*
* @param PHPExcel $pPHPExcel
- * @return PHPExcel_Style_NumberFormat[] All number formats in PHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @return PHPExcel\Style_NumberFormat[] All number formats in PHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- public function allNumberFormats(PHPExcel $pPHPExcel = null)
+ public function allNumberFormats(Workbook $pPHPExcel = null)
{
// Get an array of unique number formats
$aNumFmts = array();
diff --git a/Classes/PHPExcel/Writer/Excel2007/Theme.php b/Classes/PHPExcel/Writer/Excel2007/Theme.php
index ba85639..aae177a 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Theme.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Theme.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_Theme
+ * PHPExcel\Writer_Excel2007_Theme
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_Theme extends Writer_Excel2007_WriterPart
{
/**
* Map of Major fonts to write
@@ -132,18 +134,18 @@ class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write theme to XML format
*
- * @param PHPExcel $pPHPExcel
- * @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Workbook $pPHPExcel
+ * @return string XML Output
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeTheme(PHPExcel $pPHPExcel = null)
+ public function writeTheme(Workbook $pPHPExcel = null)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -816,13 +818,13 @@ class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write fonts to XML format
*
- * @param PHPExcel_Shared_XMLWriter $objWriter
+ * @param PHPExcel\Shared_XMLWriter $objWriter
* @param string $latinFont
* @param array of string $fontSet
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeFonts($objWriter, $latinFont, $fontSet)
+ private function _writeFonts(Shared_XMLWriter $objWriter, $latinFont, $fontSet)
{
// a:latin
$objWriter->startElement('a:latin');
@@ -851,11 +853,11 @@ class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPa
/**
* Write colour scheme to XML format
*
- * @param PHPExcel_Shared_XMLWriter $objWriter
+ * @param PHPExcel\Shared_XMLWriter $objWriter
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeColourScheme($objWriter)
+ private function _writeColourScheme(Shared_XMLWriter $objWriter)
{
foreach(self::$_colourScheme as $colourName => $colourValue) {
$objWriter->startElement('a:'.$colourName);
diff --git a/Classes/PHPExcel/Writer/Excel2007/Workbook.php b/Classes/PHPExcel/Writer/Excel2007/Workbook.php
index db88e74..9614fe7 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Workbook.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Workbook.php
@@ -19,38 +19,40 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_Workbook
+ * PHPExcel\Writer_Excel2007_Workbook
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_Workbook extends Writer_Excel2007_WriterPart
{
/**
* Write workbook to XML format
*
- * @param PHPExcel $pPHPExcel
- * @param boolean $recalcRequired Indicate whether formulas should be recalculated before writing
- * @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Workbook $pPHPExcel
+ * @param boolean $recalcRequired Indicate whether formulas should be recalculated before writing
+ * @return string XML Output
+ * @throws PHPExcel\Writer_Exception
*/
- public function writeWorkbook(PHPExcel $pPHPExcel = null, $recalcRequired = FALSE)
+ public function writeWorkbook(Workbook $pPHPExcel = null, $recalcRequired = FALSE)
{
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -94,10 +96,10 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write file version
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeFileVersion(PHPExcel_Shared_XMLWriter $objWriter = null)
+ private function _writeFileVersion(Shared_XMLWriter $objWriter = null)
{
$objWriter->startElement('fileVersion');
$objWriter->writeAttribute('appName', 'xl');
@@ -110,14 +112,14 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write WorkbookPr
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeWorkbookPr(PHPExcel_Shared_XMLWriter $objWriter = null)
+ private function _writeWorkbookPr(Shared_XMLWriter $objWriter = null)
{
$objWriter->startElement('workbookPr');
- if (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) {
+ if (Shared_Date::getExcelCalendar() == Shared_Date::CALENDAR_MAC_1904) {
$objWriter->writeAttribute('date1904', '1');
}
@@ -129,11 +131,11 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write BookViews
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel $pPHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Workbook $pPHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeBookViews(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
+ private function _writeBookViews(Shared_XMLWriter $objWriter = null, Workbook $pPHPExcel = null)
{
// bookViews
$objWriter->startElement('bookViews');
@@ -159,11 +161,11 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write WorkbookProtection
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel $pPHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Workbook $pPHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeWorkbookProtection(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
+ private function _writeWorkbookProtection(Shared_XMLWriter $objWriter = null, Workbook $pPHPExcel = null)
{
if ($pPHPExcel->getSecurity()->isSecurityEnabled()) {
$objWriter->startElement('workbookProtection');
@@ -186,11 +188,11 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write calcPr
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param boolean $recalcRequired Indicate whether formulas should be recalculated before writing
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeCalcPr(PHPExcel_Shared_XMLWriter $objWriter = null, $recalcRequired = TRUE)
+ private function _writeCalcPr(Shared_XMLWriter $objWriter = null, $recalcRequired = TRUE)
{
$objWriter->startElement('calcPr');
@@ -205,11 +207,11 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write sheets
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel $pPHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Workbook $pPHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeSheets(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
+ private function _writeSheets(Shared_XMLWriter $objWriter = null, Workbook $pPHPExcel = null)
{
// Write sheets
$objWriter->startElement('sheets');
@@ -231,14 +233,14 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write sheet
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param string $pSheetname Sheet name
* @param int $pSheetId Sheet id
* @param int $pRelId Relationship ID
* @param string $sheetState Sheet state (visible, hidden, veryHidden)
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeSheet(PHPExcel_Shared_XMLWriter $objWriter = null, $pSheetname = '', $pSheetId = 1, $pRelId = 1, $sheetState = 'visible')
+ private function _writeSheet(Shared_XMLWriter $objWriter = null, $pSheetname = '', $pSheetId = 1, $pRelId = 1, $sheetState = 'visible')
{
if ($pSheetname != '') {
// Write sheet
@@ -251,18 +253,18 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
$objWriter->writeAttribute('r:id', 'rId' . $pRelId);
$objWriter->endElement();
} else {
- throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+ throw new Writer_Exception("Invalid parameters passed.");
}
}
/**
* Write Defined Names
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel $pPHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Workbook $pPHPExcel
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDefinedNames(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
+ private function _writeDefinedNames(Shared_XMLWriter $objWriter = null, Workbook $pPHPExcel = null)
{
// Write defined names
$objWriter->startElement('definedNames');
@@ -292,11 +294,11 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write named ranges
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
* @param PHPExcel $pPHPExcel
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeNamedRanges(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel)
+ private function _writeNamedRanges(Shared_XMLWriter $objWriter = null, Workbook $pPHPExcel)
{
// Loop named ranges
$namedRanges = $pPHPExcel->getNamedRanges();
@@ -308,11 +310,11 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write Defined Name for named range
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_NamedRange $pNamedRange
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\NamedRange $pNamedRange
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDefinedNameForNamedRange(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_NamedRange $pNamedRange)
+ private function _writeDefinedNameForNamedRange(Shared_XMLWriter $objWriter = null, NamedRange $pNamedRange)
{
// definedName for named range
$objWriter->startElement('definedName');
@@ -322,14 +324,14 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
}
// Create absolute coordinate and write as raw text
- $range = PHPExcel_Cell::splitRange($pNamedRange->getRange());
+ $range = Cell::splitRange($pNamedRange->getRange());
for ($i = 0; $i < count($range); $i++) {
- $range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteReference($range[$i][0]);
+ $range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . Cell::absoluteReference($range[$i][0]);
if (isset($range[$i][1])) {
- $range[$i][1] = PHPExcel_Cell::absoluteReference($range[$i][1]);
+ $range[$i][1] = Cell::absoluteReference($range[$i][1]);
}
}
- $range = PHPExcel_Cell::buildRange($range);
+ $range = Cell::buildRange($range);
$objWriter->writeRawData($range);
@@ -339,12 +341,12 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write Defined Name for autoFilter
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet
* @param int $pSheetId
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDefinedNameForAutofilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
+ private function _writeDefinedNameForAutofilter(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null, $pSheetId = 0)
{
// definedName for autoFilter
$autoFilterRange = $pSheet->getAutoFilter()->getRange();
@@ -355,15 +357,15 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
$objWriter->writeAttribute('hidden', '1');
// Create absolute coordinate and write as raw text
- $range = PHPExcel_Cell::splitRange($autoFilterRange);
+ $range = Cell::splitRange($autoFilterRange);
$range = $range[0];
// Strip any worksheet ref so we can make the cell ref absolute
if (strpos($range[0],'!') !== false) {
list($ws,$range[0]) = explode('!',$range[0]);
}
- $range[0] = PHPExcel_Cell::absoluteCoordinate($range[0]);
- $range[1] = PHPExcel_Cell::absoluteCoordinate($range[1]);
+ $range[0] = Cell::absoluteCoordinate($range[0]);
+ $range[1] = Cell::absoluteCoordinate($range[1]);
$range = implode(':', $range);
$objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
@@ -375,12 +377,12 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write Defined Name for PrintTitles
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet
* @param int $pSheetId
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDefinedNameForPrintTitles(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
+ private function _writeDefinedNameForPrintTitles(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null, $pSheetId = 0)
{
// definedName for PrintTitles
if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
@@ -418,12 +420,12 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
/**
* Write Defined Name for PrintTitles
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet
* @param int $pSheetId
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDefinedNameForPrintArea(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
+ private function _writeDefinedNameForPrintArea(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null, $pSheetId = 0)
{
// definedName for PrintArea
if ($pSheet->getPageSetup()->isPrintAreaSet()) {
@@ -435,12 +437,12 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
$settingString = '';
// Print area
- $printArea = PHPExcel_Cell::splitRange($pSheet->getPageSetup()->getPrintArea());
+ $printArea = Cell::splitRange($pSheet->getPageSetup()->getPrintArea());
$chunks = array();
foreach ($printArea as $printAreaRect) {
- $printAreaRect[0] = PHPExcel_Cell::absoluteReference($printAreaRect[0]);
- $printAreaRect[1] = PHPExcel_Cell::absoluteReference($printAreaRect[1]);
+ $printAreaRect[0] = Cell::absoluteReference($printAreaRect[0]);
+ $printAreaRect[1] = Cell::absoluteReference($printAreaRect[1]);
$chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
}
diff --git a/Classes/PHPExcel/Writer/Excel2007/Worksheet.php b/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
index f70d4fe..81e7162 100644
--- a/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
+++ b/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
@@ -19,30 +19,32 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_Worksheet
+ * PHPExcel\Writer_Excel2007_Worksheet
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_WriterPart
+class Writer_Excel2007_Worksheet extends Writer_Excel2007_WriterPart
{
/**
* Write worksheet to XML format
*
- * @param PHPExcel_Worksheet $pSheet
+ * @param PHPExcel\Worksheet $pSheet
* @param string[] $pStringTable
* @param boolean $includeCharts Flag indicating if we should write charts
* @return string XML Output
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function writeWorksheet($pSheet = null, $pStringTable = null, $includeCharts = FALSE)
{
@@ -50,9 +52,9 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// Create XML writer
$objWriter = null;
if ($this->getParentWriter()->getUseDiskCaching()) {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
} else {
- $objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+ $objWriter = new Shared_XMLWriter(Shared_XMLWriter::STORAGE_MEMORY);
}
// XML header
@@ -132,18 +134,18 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// Return
return $objWriter->getData();
} else {
- throw new PHPExcel_Writer_Exception("Invalid PHPExcel_Worksheet object passed.");
+ throw new Writer_Exception("Invalid PHPExcel\Worksheet object passed.");
}
}
/**
* Write SheetPr
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeSheetPr(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeSheetPr(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// sheetPr
$objWriter->startElement('sheetPr');
@@ -180,11 +182,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write Dimension
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDimension(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeDimension(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// dimension
$objWriter->startElement('dimension');
@@ -195,11 +197,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write SheetViews
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeSheetViews(PHPExcel_Shared_XMLWriter $objWriter = NULL, PHPExcel_Worksheet $pSheet = NULL)
+ private function _writeSheetViews(Shared_XMLWriter $objWriter = NULL, Worksheet $pSheet = NULL)
{
// sheetViews
$objWriter->startElement('sheetViews');
@@ -224,7 +226,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
}
// View Layout Type
- if ($pSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_NORMAL) {
+ if ($pSheet->getSheetView()->getView() !== Worksheet_SheetView::SHEETVIEW_NORMAL) {
$objWriter->writeAttribute('view', $pSheet->getSheetView()->getView());
}
@@ -257,8 +259,8 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// Calculate freeze coordinates
$xSplit = $ySplit = 0;
- list($xSplit, $ySplit) = PHPExcel_Cell::coordinateFromString($topLeftCell);
- $xSplit = PHPExcel_Cell::columnIndexFromString($xSplit);
+ list($xSplit, $ySplit) = Cell::coordinateFromString($topLeftCell);
+ $xSplit = Cell::columnIndexFromString($xSplit);
// pane
$pane = 'topRight';
@@ -302,11 +304,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write SheetFormatPr
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeSheetFormatPr(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeSheetFormatPr(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// sheetFormatPr
$objWriter->startElement('sheetFormatPr');
@@ -314,7 +316,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// Default row height
if ($pSheet->getDefaultRowDimension()->getRowHeight() >= 0) {
$objWriter->writeAttribute('customHeight', 'true');
- $objWriter->writeAttribute('defaultRowHeight', PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
+ $objWriter->writeAttribute('defaultRowHeight', Shared_String::FormatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
} else {
$objWriter->writeAttribute('defaultRowHeight', '14.4');
}
@@ -327,7 +329,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// Default column width
if ($pSheet->getDefaultColumnDimension()->getWidth() >= 0) {
- $objWriter->writeAttribute('defaultColWidth', PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultColumnDimension()->getWidth()));
+ $objWriter->writeAttribute('defaultColWidth', Shared_String::FormatNumber($pSheet->getDefaultColumnDimension()->getWidth()));
}
// Outline level - row
@@ -354,11 +356,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write Cols
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeCols(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeCols(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// cols
if (count($pSheet->getColumnDimensions()) > 0) {
@@ -370,15 +372,15 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
foreach ($pSheet->getColumnDimensions() as $colDimension) {
// col
$objWriter->startElement('col');
- $objWriter->writeAttribute('min', PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
- $objWriter->writeAttribute('max', PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
+ $objWriter->writeAttribute('min', Cell::columnIndexFromString($colDimension->getColumnIndex()));
+ $objWriter->writeAttribute('max', Cell::columnIndexFromString($colDimension->getColumnIndex()));
if ($colDimension->getWidth() < 0) {
// No width set, apply default of 10
$objWriter->writeAttribute('width', '9.10');
} else {
// Width set
- $objWriter->writeAttribute('width', PHPExcel_Shared_String::FormatNumber($colDimension->getWidth()));
+ $objWriter->writeAttribute('width', Shared_String::FormatNumber($colDimension->getWidth()));
}
// Column visibility
@@ -419,11 +421,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write SheetProtection
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeSheetProtection(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeSheetProtection(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// sheetProtection
$objWriter->startElement('sheetProtection');
@@ -454,11 +456,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write ConditionalFormatting
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeConditionalFormatting(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeConditionalFormatting(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// Conditional id
$id = 1;
@@ -470,7 +472,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// if ($this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode( $conditional->getHashCode() ) == '') {
// continue;
// }
- if ($conditional->getConditionType() != PHPExcel_Style_Conditional::CONDITION_NONE) {
+ if ($conditional->getConditionType() != Style_Conditional::CONDITION_NONE) {
// conditionalFormatting
$objWriter->startElement('conditionalFormatting');
$objWriter->writeAttribute('sqref', $cellCoordinate);
@@ -481,37 +483,37 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
$objWriter->writeAttribute('dxfId', $this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode( $conditional->getHashCode() ));
$objWriter->writeAttribute('priority', $id++);
- if (($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
+ if (($conditional->getConditionType() == Style_Conditional::CONDITION_CELLIS
||
- $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT)
- && $conditional->getOperatorType() != PHPExcel_Style_Conditional::OPERATOR_NONE) {
+ $conditional->getConditionType() == Style_Conditional::CONDITION_CONTAINSTEXT)
+ && $conditional->getOperatorType() != Style_Conditional::OPERATOR_NONE) {
$objWriter->writeAttribute('operator', $conditional->getOperatorType());
}
- if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
+ if ($conditional->getConditionType() == Style_Conditional::CONDITION_CONTAINSTEXT
&& !is_null($conditional->getText())) {
$objWriter->writeAttribute('text', $conditional->getText());
}
- if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
- && $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_CONTAINSTEXT
+ if ($conditional->getConditionType() == Style_Conditional::CONDITION_CONTAINSTEXT
+ && $conditional->getOperatorType() == Style_Conditional::OPERATOR_CONTAINSTEXT
&& !is_null($conditional->getText())) {
$objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . ')))');
- } else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
- && $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_BEGINSWITH
+ } else if ($conditional->getConditionType() == Style_Conditional::CONDITION_CONTAINSTEXT
+ && $conditional->getOperatorType() == Style_Conditional::OPERATOR_BEGINSWITH
&& !is_null($conditional->getText())) {
$objWriter->writeElement('formula', 'LEFT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
- } else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
- && $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_ENDSWITH
+ } else if ($conditional->getConditionType() == Style_Conditional::CONDITION_CONTAINSTEXT
+ && $conditional->getOperatorType() == Style_Conditional::OPERATOR_ENDSWITH
&& !is_null($conditional->getText())) {
$objWriter->writeElement('formula', 'RIGHT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
- } else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
- && $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_NOTCONTAINS
+ } else if ($conditional->getConditionType() == Style_Conditional::CONDITION_CONTAINSTEXT
+ && $conditional->getOperatorType() == Style_Conditional::OPERATOR_NOTCONTAINS
&& !is_null($conditional->getText())) {
$objWriter->writeElement('formula', 'ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . '))');
- } else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
- || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
- || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION) {
+ } else if ($conditional->getConditionType() == Style_Conditional::CONDITION_CELLIS
+ || $conditional->getConditionType() == Style_Conditional::CONDITION_CONTAINSTEXT
+ || $conditional->getConditionType() == Style_Conditional::CONDITION_EXPRESSION) {
foreach ($conditional->getConditions() as $formula) {
// Formula
$objWriter->writeElement('formula', $formula);
@@ -529,11 +531,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write DataValidations
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDataValidations(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeDataValidations(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// Datavalidation collection
$dataValidationCollection = $pSheet->getDataValidationCollection();
@@ -595,11 +597,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write Hyperlinks
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeHyperlinks(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeHyperlinks(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// Hyperlink collection
$hyperlinkCollection = $pSheet->getHyperlinkCollection();
@@ -636,11 +638,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write ProtectedRanges
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeProtectedRanges(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeProtectedRanges(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
if (count($pSheet->getProtectedCells()) > 0) {
// protectedRanges
@@ -665,11 +667,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write MergeCells
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeMergeCells(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeMergeCells(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
if (count($pSheet->getMergeCells()) > 0) {
// mergeCells
@@ -690,11 +692,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write PrintOptions
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writePrintOptions(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writePrintOptions(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// printOptions
$objWriter->startElement('printOptions');
@@ -716,31 +718,31 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write PageMargins
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel|Writer_Exception
*/
- private function _writePageMargins(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writePageMargins(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// pageMargins
$objWriter->startElement('pageMargins');
- $objWriter->writeAttribute('left', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()));
- $objWriter->writeAttribute('right', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()));
- $objWriter->writeAttribute('top', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()));
- $objWriter->writeAttribute('bottom', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()));
- $objWriter->writeAttribute('header', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getHeader()));
- $objWriter->writeAttribute('footer', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getFooter()));
+ $objWriter->writeAttribute('left', Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()));
+ $objWriter->writeAttribute('right', Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()));
+ $objWriter->writeAttribute('top', Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()));
+ $objWriter->writeAttribute('bottom', Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()));
+ $objWriter->writeAttribute('header', Shared_String::FormatNumber($pSheet->getPageMargins()->getHeader()));
+ $objWriter->writeAttribute('footer', Shared_String::FormatNumber($pSheet->getPageMargins()->getFooter()));
$objWriter->endElement();
}
/**
* Write AutoFilter
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeAutoFilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeAutoFilter(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
$autoFilterRange = $pSheet->getAutoFilter()->getRange();
if (!empty($autoFilterRange)) {
@@ -748,7 +750,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
$objWriter->startElement('autoFilter');
// Strip any worksheet reference from the filter coordinates
- $range = PHPExcel_Cell::splitRange($autoFilterRange);
+ $range = Cell::splitRange($autoFilterRange);
$range = $range[0];
// Strip any worksheet ref
if (strpos($range[0],'!') !== false) {
@@ -767,17 +769,17 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
$objWriter->writeAttribute('colId', $pSheet->getAutoFilter()->getColumnOffset($columnID));
$objWriter->startElement( $column->getFilterType());
- if ($column->getJoin() == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND) {
+ if ($column->getJoin() == Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND) {
$objWriter->writeAttribute('and', 1);
}
foreach ($rules as $rule) {
- if (($column->getFilterType() === PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER) &&
- ($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) &&
+ if (($column->getFilterType() === Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER) &&
+ ($rule->getOperator() === Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) &&
($rule->getValue() === '')) {
// Filter rule for Blanks
$objWriter->writeAttribute('blank', 1);
- } elseif($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
+ } elseif($rule->getRuleType() === Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
// Dynamic Filter Rule
$objWriter->writeAttribute('type', $rule->getGrouping());
$val = $column->getAttribute('val');
@@ -788,19 +790,19 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
if ($maxVal !== NULL) {
$objWriter->writeAttribute('maxVal', $maxVal);
}
- } elseif($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
+ } elseif($rule->getRuleType() === Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
// Top 10 Filter Rule
$objWriter->writeAttribute('val', $rule->getValue());
- $objWriter->writeAttribute('percent', (($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
- $objWriter->writeAttribute('top', (($rule->getGrouping() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1': '0'));
+ $objWriter->writeAttribute('percent', (($rule->getOperator() === Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
+ $objWriter->writeAttribute('top', (($rule->getGrouping() === Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1': '0'));
} else {
// Filter, DateGroupItem or CustomFilter
$objWriter->startElement($rule->getRuleType());
- if ($rule->getOperator() !== PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
+ if ($rule->getOperator() !== Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
$objWriter->writeAttribute('operator', $rule->getOperator());
}
- if ($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
+ if ($rule->getRuleType() === Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
// Date Group filters
foreach($rule->getValue() as $key => $value) {
if ($value > '') $objWriter->writeAttribute($key, $value);
@@ -828,11 +830,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write PageSetup
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writePageSetup(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writePageSetup(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// pageSetup
$objWriter->startElement('pageSetup');
@@ -863,11 +865,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write Header / Footer
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeHeaderFooter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeHeaderFooter(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// headerFooter
$objWriter->startElement('headerFooter');
@@ -888,19 +890,19 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write Breaks
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeBreaks(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeBreaks(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// Get row and column breaks
$aRowBreaks = array();
$aColumnBreaks = array();
foreach ($pSheet->getBreaks() as $cell => $breakType) {
- if ($breakType == PHPExcel_Worksheet::BREAK_ROW) {
+ if ($breakType == Worksheet::BREAK_ROW) {
$aRowBreaks[] = $cell;
- } else if ($breakType == PHPExcel_Worksheet::BREAK_COLUMN) {
+ } else if ($breakType == Worksheet::BREAK_COLUMN) {
$aColumnBreaks[] = $cell;
}
}
@@ -912,7 +914,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
$objWriter->writeAttribute('manualBreakCount', count($aRowBreaks));
foreach ($aRowBreaks as $cell) {
- $coords = PHPExcel_Cell::coordinateFromString($cell);
+ $coords = Cell::coordinateFromString($cell);
$objWriter->startElement('brk');
$objWriter->writeAttribute('id', $coords[1]);
@@ -930,11 +932,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
$objWriter->writeAttribute('manualBreakCount', count($aColumnBreaks));
foreach ($aColumnBreaks as $cell) {
- $coords = PHPExcel_Cell::coordinateFromString($cell);
+ $coords = Cell::coordinateFromString($cell);
$objWriter->startElement('brk');
- $objWriter->writeAttribute('id', PHPExcel_Cell::columnIndexFromString($coords[0]) - 1);
- $objWriter->writeAttribute('man', '1');
+ $objWriter->writeAttribute('id', Cell::columnIndexFromString($coords[0]) - 1);
+ $objWriter->writeAttribute('man', '1');
$objWriter->endElement();
}
@@ -945,12 +947,12 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write SheetData
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
* @param string[] $pStringTable String table
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeSheetData(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pStringTable = null)
+ private function _writeSheetData(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null, $pStringTable = null)
{
if (is_array($pStringTable)) {
// Flipped stringtable, for faster index searching
@@ -960,7 +962,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
$objWriter->startElement('sheetData');
// Get column count
- $colCount = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn());
+ $colCount = Cell::columnIndexFromString($pSheet->getHighestColumn());
// Highest row number
$highestRow = $pSheet->getHighestRow();
@@ -968,7 +970,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// Loop through cells
$cellsByRow = array();
foreach ($pSheet->getCellCollection() as $cellID) {
- $cellAddress = PHPExcel_Cell::coordinateFromString($cellID);
+ $cellAddress = Cell::coordinateFromString($cellID);
$cellsByRow[$cellAddress[1]][] = $cellID;
}
@@ -994,7 +996,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// Row dimensions
if ($rowDimension->getRowHeight() >= 0) {
$objWriter->writeAttribute('customHeight', '1');
- $objWriter->writeAttribute('ht', PHPExcel_Shared_String::FormatNumber($rowDimension->getRowHeight()));
+ $objWriter->writeAttribute('ht', Shared_String::FormatNumber($rowDimension->getRowHeight()));
}
// Row visibility
@@ -1033,21 +1035,21 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
$objWriter->endElement();
} else {
- throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+ throw new Writer_Exception("Invalid parameters passed.");
}
}
/**
* Write Cell
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @param PHPExcel_Cell $pCellAddress Cell Address
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @param PHPExcel\Cell $pCellAddress Cell Address
* @param string[] $pStringTable String table
* @param string[] $pFlippedStringTable String table (flipped), for faster index searching
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeCell(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pCellAddress = null, $pStringTable = null, $pFlippedStringTable = null)
+ private function _writeCell(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null, $pCellAddress = null, $pStringTable = null, $pFlippedStringTable = null)
{
if (is_array($pStringTable) && is_array($pFlippedStringTable)) {
// Cell
@@ -1088,9 +1090,9 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
// Write data depending on its type
switch (strtolower($mappedType)) {
case 'inlinestr': // Inline string
- if (! $cellValue instanceof PHPExcel_RichText) {
- $objWriter->writeElement('t', PHPExcel_Shared_String::ControlCharacterPHP2OOXML( htmlspecialchars($cellValue) ) );
- } else if ($cellValue instanceof PHPExcel_RichText) {
+ if (! $cellValue instanceof RichText) {
+ $objWriter->writeElement('t', Shared_String::ControlCharacterPHP2OOXML( htmlspecialchars($cellValue) ) );
+ } else if ($cellValue instanceof RichText) {
$objWriter->startElement('is');
$this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $cellValue);
$objWriter->endElement();
@@ -1098,11 +1100,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
break;
case 's': // String
- if (! $cellValue instanceof PHPExcel_RichText) {
+ if (! $cellValue instanceof RichText) {
if (isset($pFlippedStringTable[$cellValue])) {
$objWriter->writeElement('v', $pFlippedStringTable[$cellValue]);
}
- } else if ($cellValue instanceof PHPExcel_RichText) {
+ } else if ($cellValue instanceof RichText) {
$objWriter->writeElement('v', $pFlippedStringTable[$cellValue->getHashCode()]);
}
@@ -1124,7 +1126,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
if ($this->getParentWriter()->getPreCalculateFormulas()) {
// $calculatedValue = $pCell->getCalculatedValue();
if (!is_array($calculatedValue) && substr($calculatedValue, 0, 1) != '#') {
- $objWriter->writeElement('v', PHPExcel_Shared_String::FormatNumber($calculatedValue));
+ $objWriter->writeElement('v', Shared_String::FormatNumber($calculatedValue));
} else {
$objWriter->writeElement('v', '0');
}
@@ -1154,19 +1156,19 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
$objWriter->endElement();
} else {
- throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+ throw new Writer_Exception("Invalid parameters passed.");
}
}
/**
* Write Drawings
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
* @param boolean $includeCharts Flag indicating if we should include drawing details for charts
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeDrawings(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $includeCharts = FALSE)
+ private function _writeDrawings(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null, $includeCharts = FALSE)
{
$chartCount = ($includeCharts) ? $pSheet->getChartCollection()->count() : 0;
// If sheet contains drawings, add the relationships
@@ -1181,11 +1183,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write LegacyDrawing
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeLegacyDrawing(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeLegacyDrawing(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// If sheet contains comments, add the relationships
if (count($pSheet->getComments()) > 0) {
@@ -1198,11 +1200,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
/**
* Write LegacyDrawingHF
*
- * @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
- * @param PHPExcel_Worksheet $pSheet Worksheet
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Shared_XMLWriter $objWriter XML Writer
+ * @param PHPExcel\Worksheet $pSheet Worksheet
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeLegacyDrawingHF(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+ private function _writeLegacyDrawingHF(Shared_XMLWriter $objWriter = null, Worksheet $pSheet = null)
{
// If sheet contains images, add the relationships
if (count($pSheet->getHeaderFooter()->getImages()) > 0) {
diff --git a/Classes/PHPExcel/Writer/Excel2007/WriterPart.php b/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
index 0667ed4..bc0e56c 100644
--- a/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
+++ b/Classes/PHPExcel/Writer/Excel2007/WriterPart.php
@@ -19,60 +19,62 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel2007_WriterPart
+ * PHPExcel\Writer_Excel2007_WriterPart
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel2007
+ * @package PHPExcel\Writer_Excel2007
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-abstract class PHPExcel_Writer_Excel2007_WriterPart
+abstract class Writer_Excel2007_WriterPart
{
/**
* Parent IWriter object
*
- * @var PHPExcel_Writer_IWriter
+ * @var PHPExcel\Writer_IWriter
*/
private $_parentWriter;
/**
* Set parent IWriter object
*
- * @param PHPExcel_Writer_IWriter $pWriter
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Writer_IWriter $pWriter
+ * @throws PHPExcel\Writer_Exception
*/
- public function setParentWriter(PHPExcel_Writer_IWriter $pWriter = null) {
+ public function setParentWriter(Writer_IWriter $pWriter = null) {
$this->_parentWriter = $pWriter;
}
/**
* Get parent IWriter object
*
- * @return PHPExcel_Writer_IWriter
- * @throws PHPExcel_Writer_Exception
+ * @return PHPExcel\Writer_IWriter
+ * @throws PHPExcel\Writer_Exception
*/
public function getParentWriter() {
if (!is_null($this->_parentWriter)) {
return $this->_parentWriter;
} else {
- throw new PHPExcel_Writer_Exception("No parent PHPExcel_Writer_IWriter assigned.");
+ throw new Writer_Exception("No parent PHPExcel\Writer_IWriter assigned.");
}
}
/**
* Set parent IWriter object
*
- * @param PHPExcel_Writer_IWriter $pWriter
- * @throws PHPExcel_Writer_Exception
+ * @param PHPExcel\Writer_IWriter $pWriter
+ * @throws PHPExcel\Writer_Exception
*/
- public function __construct(PHPExcel_Writer_IWriter $pWriter = null) {
+ public function __construct(Writer_IWriter $pWriter = null) {
if (!is_null($pWriter)) {
$this->_parentWriter = $pWriter;
}
diff --git a/Classes/PHPExcel/Writer/Excel5.php b/Classes/PHPExcel/Writer/Excel5.php
index 5ba73f0..0c2f42f 100644
--- a/Classes/PHPExcel/Writer/Excel5.php
+++ b/Classes/PHPExcel/Writer/Excel5.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel5
+ * PHPExcel\Writer_Excel5
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter
+class Writer_Excel5 extends Writer_Abstract implements Writer_IWriter
{
/**
* PHPExcel object
@@ -73,7 +75,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
/**
* Formula parser
*
- * @var PHPExcel_Writer_Excel5_Parser
+ * @var PHPExcel\Writer_Excel5_Parser
*/
private $_parser;
@@ -99,48 +101,48 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
private $_documentSummaryInformation;
/**
- * Create a new PHPExcel_Writer_Excel5
+ * Create a new PHPExcel\Writer_Excel5
*
- * @param PHPExcel $phpExcel PHPExcel object
+ * @param PHPExcel\Workbook $phpExcel PHPExcel object
*/
- public function __construct(PHPExcel $phpExcel) {
- $this->_phpExcel = $phpExcel;
+ public function __construct(Workbook $phpExcel) {
+ $this->_phpExcel = $phpExcel;
- $this->_parser = new PHPExcel_Writer_Excel5_Parser();
+ $this->_parser = new Writer_Excel5_Parser();
}
/**
* Save PHPExcel to file
*
* @param string $pFilename
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function save($pFilename = null) {
// garbage collect
$this->_phpExcel->garbageCollect();
- $saveDebugLog = PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->getWriteDebugLog();
- PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog(FALSE);
- $saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType();
- PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
+ $saveDebugLog = Calculation::getInstance($this->_phpExcel)->getDebugLog()->getWriteDebugLog();
+ Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog(FALSE);
+ $saveDateReturnType = Calculation_Functions::getReturnDateType();
+ Calculation_Functions::setReturnDateType(Calculation_Functions::RETURNDATE_EXCEL);
// initialize colors array
$this->_colors = array();
// Initialise workbook writer
- $this->_writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->_phpExcel,
- $this->_str_total, $this->_str_unique, $this->_str_table,
- $this->_colors, $this->_parser);
+ $this->_writerWorkbook = new Writer_Excel5_Workbook($this->_phpExcel,
+ $this->_str_total, $this->_str_unique, $this->_str_table,
+ $this->_colors, $this->_parser);
// Initialise worksheet writers
$countSheets = $this->_phpExcel->getSheetCount();
for ($i = 0; $i < $countSheets; ++$i) {
- $this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_str_total, $this->_str_unique,
- $this->_str_table, $this->_colors,
- $this->_parser,
- $this->_preCalculateFormulas,
- $this->_phpExcel->getSheet($i));
+ $this->_writerWorksheets[$i] = new Writer_Excel5_Worksheet($this->_str_total, $this->_str_unique,
+ $this->_str_table, $this->_colors,
+ $this->_parser,
+ $this->_preCalculateFormulas,
+ $this->_phpExcel->getSheet($i));
}
// build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook.
@@ -164,10 +166,10 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
foreach ($this->_writerWorksheets[$i]->_phpSheet->getCellCollection() as $cellID) {
$cell = $this->_writerWorksheets[$i]->_phpSheet->getCell($cellID);
$cVal = $cell->getValue();
- if ($cVal instanceof PHPExcel_RichText) {
+ if ($cVal instanceof RichText) {
$elements = $cVal->getRichTextElements();
foreach ($elements as $element) {
- if ($element instanceof PHPExcel_RichText_Run) {
+ if ($element instanceof RichText_Run) {
$font = $element->getFont();
$this->_writerWorksheets[$i]->_fntHashIndex[$font->getHashCode()] = $this->_writerWorkbook->_addFont($font);
}
@@ -178,7 +180,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
// initialize OLE file
$workbookStreamName = 'Workbook';
- $OLE = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs($workbookStreamName));
+ $OLE = new Shared_OLE_PPS_File(Shared_OLE::Asc2Ucs($workbookStreamName));
// Write the worksheet streams before the global workbook stream,
// because the byte sizes of these are needed in the global workbook stream
@@ -199,14 +201,14 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$this->_documentSummaryInformation = $this->_writeDocumentSummaryInformation();
// initialize OLE Document Summary Information
if(isset($this->_documentSummaryInformation) && !empty($this->_documentSummaryInformation)){
- $OLE_DocumentSummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'DocumentSummaryInformation'));
+ $OLE_DocumentSummaryInformation = new Shared_OLE_PPS_File(Shared_OLE::Asc2Ucs(chr(5) . 'DocumentSummaryInformation'));
$OLE_DocumentSummaryInformation->append($this->_documentSummaryInformation);
}
$this->_summaryInformation = $this->_writeSummaryInformation();
// initialize OLE Summary Information
if(isset($this->_summaryInformation) && !empty($this->_summaryInformation)){
- $OLE_SummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'SummaryInformation'));
+ $OLE_SummaryInformation = new Shared_OLE_PPS_File(Shared_OLE::Asc2Ucs(chr(5) . 'SummaryInformation'));
$OLE_SummaryInformation->append($this->_summaryInformation);
}
@@ -221,12 +223,12 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$arrRootData[] = $OLE_DocumentSummaryInformation;
}
- $root = new PHPExcel_Shared_OLE_PPS_Root(time(), time(), $arrRootData);
+ $root = new Shared_OLE_PPS_Root(time(), time(), $arrRootData);
// save the OLE file
$res = $root->save($pFilename);
- PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType);
- PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+ Calculation_Functions::setReturnDateType($saveDateReturnType);
+ Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
}
/**
@@ -234,8 +236,8 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
*
* @deprecated
* @param string $pValue Temporary storage directory
- * @throws PHPExcel_Writer_Exception when directory does not exist
- * @return PHPExcel_Writer_Excel5
+ * @throws PHPExcel\Writer_Exception when directory does not exist
+ * @return PHPExcel\Writer_Excel5
*/
public function setTempDir($pValue = '') {
return $this;
@@ -265,10 +267,10 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
}
// create intermediate Escher object
- $escher = new PHPExcel_Shared_Escher();
+ $escher = new Shared_Escher();
// dgContainer
- $dgContainer = new PHPExcel_Shared_Escher_DgContainer();
+ $dgContainer = new Shared_Escher_DgContainer();
// set the drawing index (we use sheet index + 1)
$dgId = $sheet->getParent()->getIndex($sheet) + 1;
@@ -276,11 +278,11 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$escher->setDgContainer($dgContainer);
// spgrContainer
- $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer();
+ $spgrContainer = new Shared_Escher_DgContainer_SpgrContainer();
$dgContainer->setSpgrContainer($spgrContainer);
// add one shape which is the group shape
- $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
+ $spContainer = new Shared_Escher_DgContainer_SpgrContainer_SpContainer();
$spContainer->setSpgr(true);
$spContainer->setSpType(0);
$spContainer->setSpId(($sheet->getParent()->getIndex($sheet) + 1) << 10);
@@ -296,7 +298,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
++$countShapes[$sheetIndex];
// add the shape
- $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
+ $spContainer = new Shared_Escher_DgContainer_SpgrContainer_SpContainer();
// set the shape type
$spContainer->setSpType(0x004B);
@@ -325,7 +327,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$width = $drawing->getWidth();
$height = $drawing->getHeight();
- $twoAnchor = PHPExcel_Shared_Excel5::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height);
+ $twoAnchor = Shared_Excel5::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height);
$spContainer->setStartCoordinates($twoAnchor['startCoordinates']);
$spContainer->setStartOffsetX($twoAnchor['startOffsetX']);
@@ -339,7 +341,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
// AutoFilters
if(!empty($filterRange)){
- $rangeBounds = PHPExcel_Cell::rangeBoundaries($filterRange);
+ $rangeBounds = Cell::rangeBoundaries($filterRange);
$iNumColStart = $rangeBounds[0][0];
$iNumColEnd = $rangeBounds[1][0];
@@ -348,14 +350,14 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
++$countShapes[$sheetIndex];
// create an Drawing Object for the dropdown
- $oDrawing = new PHPExcel_Worksheet_BaseDrawing();
+ $oDrawing = new Worksheet_BaseDrawing();
// get the coordinates of drawing
- $cDrawing = PHPExcel_Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
+ $cDrawing = Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
$oDrawing->setCoordinates($cDrawing);
$oDrawing->setWorksheet($sheet);
// add the shape
- $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
+ $spContainer = new Shared_Escher_DgContainer_SpgrContainer_SpContainer();
// set the shape type
$spContainer->setSpType(0x00C9);
// set the shape flag
@@ -380,7 +382,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$spContainer->setOPT(0x03BF, 0x000A0000); // Group Shape -> fPrint
// set coordinates and offsets, client anchor
- $endCoordinates = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::stringFromColumnIndex($iInc - 1));
+ $endCoordinates = Cell::stringFromColumnIndex(Cell::stringFromColumnIndex($iInc - 1));
$endCoordinates .= $rangeBounds[0][1] + 1;
$spContainer->setStartCoordinates($cDrawing);
@@ -428,10 +430,10 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
}
// if we reach here, then there are drawings in the workbook
- $escher = new PHPExcel_Shared_Escher();
+ $escher = new Shared_Escher();
// dggContainer
- $dggContainer = new PHPExcel_Shared_Escher_DggContainer();
+ $dggContainer = new Shared_Escher_DggContainer();
$escher->setDggContainer($dggContainer);
// set IDCLs (identifier clusters)
@@ -464,13 +466,13 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing
// bstoreContainer
- $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer();
+ $bstoreContainer = new Shared_Escher_DggContainer_BstoreContainer();
$dggContainer->setBstoreContainer($bstoreContainer);
// the BSE's (all the images)
foreach ($this->_phpExcel->getAllsheets() as $sheet) {
foreach ($sheet->getDrawingCollection() as $drawing) {
- if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
+ if ($drawing instanceof Worksheet_Drawing) {
$filename = $drawing->getPath();
@@ -479,7 +481,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
switch ($imageFormat) {
case 1: // GIF, not supported by BIFF8, we convert to PNG
- $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+ $blipType = Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
ob_start();
imagepng(imagecreatefromgif($filename));
$blipData = ob_get_contents();
@@ -487,19 +489,19 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
break;
case 2: // JPEG
- $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
+ $blipType = Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
$blipData = file_get_contents($filename);
break;
case 3: // PNG
- $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+ $blipType = Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
$blipData = file_get_contents($filename);
break;
case 6: // Windows DIB (BMP), we convert to PNG
- $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+ $blipType = Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
ob_start();
- imagepng(PHPExcel_Shared_Drawing::imagecreatefrombmp($filename));
+ imagepng(Shared_Drawing::imagecreatefrombmp($filename));
$blipData = ob_get_contents();
ob_end_clean();
break;
@@ -508,28 +510,28 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
}
- $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
+ $blip = new Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
$blip->setData($blipData);
- $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
+ $BSE = new Shared_Escher_DggContainer_BstoreContainer_BSE();
$BSE->setBlipType($blipType);
$BSE->setBlip($blip);
$bstoreContainer->addBSE($BSE);
- } else if ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) {
+ } else if ($drawing instanceof Worksheet_MemoryDrawing) {
switch ($drawing->getRenderingFunction()) {
- case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG:
- $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
+ case Worksheet_MemoryDrawing::RENDERING_JPEG:
+ $blipType = Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
$renderingFunction = 'imagejpeg';
break;
- case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF:
- case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG:
- case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT:
- $blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+ case Worksheet_MemoryDrawing::RENDERING_GIF:
+ case Worksheet_MemoryDrawing::RENDERING_PNG:
+ case Worksheet_MemoryDrawing::RENDERING_DEFAULT:
+ $blipType = Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
$renderingFunction = 'imagepng';
break;
@@ -540,10 +542,10 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$blipData = ob_get_contents();
ob_end_clean();
- $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
+ $blip = new Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
$blip->setData($blipData);
- $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
+ $BSE = new Shared_Escher_DggContainer_BstoreContainer_BSE();
$BSE->setBlipType($blipType);
$BSE->setBlip($blip);
@@ -853,7 +855,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
'offset' => array('pack' => 'V'),
'type' => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
- 'data' => array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
+ 'data' => array('data' => Shared_OLE::LocalDate2OLE($dataProp)));
$dataSection_NumProps++;
}
// Modified Date/Time
@@ -862,7 +864,7 @@ class PHPExcel_Writer_Excel5 extends PHPExcel_Writer_Abstract implements PHPExce
$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
'offset' => array('pack' => 'V'),
'type' => array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
- 'data' => array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
+ 'data' => array('data' => Shared_OLE::LocalDate2OLE($dataProp)));
$dataSection_NumProps++;
}
// Security
diff --git a/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php b/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
index d75c33b..58acb50 100644
--- a/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
+++ b/Classes/PHPExcel/Writer/Excel5/BIFFwriter.php
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @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##
@@ -60,14 +60,16 @@
// */
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel5_BIFFwriter
+ * PHPExcel\Writer_Excel5_BIFFwriter
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel5_BIFFwriter
+class Writer_Excel5_BIFFwriter
{
/**
* The byte order of this architecture. 0 => little endian, 1 => big endian
@@ -122,7 +124,7 @@ class PHPExcel_Writer_Excel5_BIFFwriter
$byte_order = 1; // Big Endian
} else {
// Give up. I'll fix this in a later version.
- throw new PHPExcel_Writer_Exception("Required floating point format not supported on this platform.");
+ throw new Writer_Exception("Required floating point format not supported on this platform.");
}
self::$_byte_order = $byte_order;
}
diff --git a/Classes/PHPExcel/Writer/Excel5/Escher.php b/Classes/PHPExcel/Writer/Excel5/Escher.php
index 8286bc1..9b68859 100644
--- a/Classes/PHPExcel/Writer/Excel5/Escher.php
+++ b/Classes/PHPExcel/Writer/Excel5/Escher.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer
+ * PHPExcel\Shared_Escher_DggContainer_BstoreContainer
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel5_Escher
+class Writer_Excel5_Escher
{
/**
* The object we are writing
@@ -79,19 +81,19 @@ class PHPExcel_Writer_Excel5_Escher
switch (get_class($this->_object)) {
- case 'PHPExcel_Shared_Escher':
+ case __NAMESPACE__ . '\Shared_Escher':
if ($dggContainer = $this->_object->getDggContainer()) {
- $writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
+ $writer = new Writer_Excel5_Escher($dggContainer);
$this->_data = $writer->close();
} else if ($dgContainer = $this->_object->getDgContainer()) {
- $writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
+ $writer = new Writer_Excel5_Escher($dgContainer);
$this->_data = $writer->close();
$this->_spOffsets = $writer->getSpOffsets();
$this->_spTypes = $writer->getSpTypes();
}
break;
- case 'PHPExcel_Shared_Escher_DggContainer':
+ case __NAMESPACE__ . '\Shared_Escher_DggContainer':
// this is a container record
// initialize
@@ -126,7 +128,7 @@ class PHPExcel_Writer_Excel5_Escher
// write the bstoreContainer
if ($bstoreContainer = $this->_object->getBstoreContainer()) {
- $writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
+ $writer = new Writer_Excel5_Escher($bstoreContainer);
$innerData .= $writer->close();
}
@@ -144,7 +146,7 @@ class PHPExcel_Writer_Excel5_Escher
$this->_data = $header . $innerData;
break;
- case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
+ case __NAMESPACE__ . '\Shared_Escher_DggContainer_BstoreContainer':
// this is a container record
// initialize
@@ -153,7 +155,7 @@ class PHPExcel_Writer_Excel5_Escher
// treat the inner data
if ($BSECollection = $this->_object->getBSECollection()) {
foreach ($BSECollection as $BSE) {
- $writer = new PHPExcel_Writer_Excel5_Escher($BSE);
+ $writer = new Writer_Excel5_Escher($BSE);
$innerData .= $writer->close();
}
}
@@ -172,7 +174,7 @@ class PHPExcel_Writer_Excel5_Escher
$this->_data = $header . $innerData;
break;
- case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
+ case __NAMESPACE__ . '\Shared_Escher_DggContainer_BstoreContainer_BSE':
// this is a semi-container record
// initialize
@@ -180,7 +182,7 @@ class PHPExcel_Writer_Excel5_Escher
// here we treat the inner data
if ($blip = $this->_object->getBlip()) {
- $writer = new PHPExcel_Writer_Excel5_Escher($blip);
+ $writer = new Writer_Excel5_Escher($blip);
$innerData .= $writer->close();
}
@@ -222,13 +224,13 @@ class PHPExcel_Writer_Excel5_Escher
$this->_data .= $data;
break;
- case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
+ case __NAMESPACE__ . '\Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
// this is an atom record
// write the record
switch ($this->_object->getParent()->getBlipType()) {
- case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
+ case Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
// initialize
$innerData = '';
@@ -255,7 +257,7 @@ class PHPExcel_Writer_Excel5_Escher
$this->_data .= $innerData;
break;
- case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
+ case Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
// initialize
$innerData = '';
@@ -285,7 +287,7 @@ class PHPExcel_Writer_Excel5_Escher
}
break;
- case 'PHPExcel_Shared_Escher_DgContainer':
+ case __NAMESPACE__ . '\Shared_Escher_DgContainer':
// this is a container record
// initialize
@@ -309,7 +311,7 @@ class PHPExcel_Writer_Excel5_Escher
// write the spgrContainer
if ($spgrContainer = $this->_object->getSpgrContainer()) {
- $writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
+ $writer = new Writer_Excel5_Escher($spgrContainer);
$innerData .= $writer->close();
// get the shape offsets relative to the spgrContainer record
@@ -339,7 +341,7 @@ class PHPExcel_Writer_Excel5_Escher
$this->_data = $header . $innerData;
break;
- case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
+ case __NAMESPACE__ . '\Shared_Escher_DgContainer_SpgrContainer':
// this is a container record
// initialize
@@ -352,7 +354,7 @@ class PHPExcel_Writer_Excel5_Escher
// treat the inner data
foreach ($this->_object->getChildren() as $spContainer) {
- $writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
+ $writer = new Writer_Excel5_Escher($spContainer);
$spData = $writer->close();
$innerData .= $spData;
@@ -379,7 +381,7 @@ class PHPExcel_Writer_Excel5_Escher
$this->_spTypes = $spTypes;
break;
- case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
+ case __NAMESPACE__ . '\Shared_Escher_DgContainer_SpgrContainer_SpContainer':
// initialize
$data = '';
@@ -443,8 +445,8 @@ class PHPExcel_Writer_Excel5_Escher
$recType = 0xF010;
// start coordinates
- list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
- $c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+ list($column, $row) = Cell::coordinateFromString($this->_object->getStartCoordinates());
+ $c1 = Cell::columnIndexFromString($column) - 1;
$r1 = $row - 1;
// start offsetX
@@ -454,8 +456,8 @@ class PHPExcel_Writer_Excel5_Escher
$startOffsetY = $this->_object->getStartOffsetY();
// end coordinates
- list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
- $c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+ list($column, $row) = Cell::coordinateFromString($this->_object->getEndCoordinates());
+ $c2 = Cell::columnIndexFromString($column) - 1;
$r2 = $row - 1;
// end offsetX
diff --git a/Classes/PHPExcel/Writer/Excel5/Font.php b/Classes/PHPExcel/Writer/Excel5/Font.php
index a0936eb..8955bf2 100644
--- a/Classes/PHPExcel/Writer/Excel5/Font.php
+++ b/Classes/PHPExcel/Writer/Excel5/Font.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel5_Font
+ * PHPExcel\Writer_Excel5_Font
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel5_Font
+class Writer_Excel5_Font
{
/**
* Color index
@@ -45,16 +47,16 @@ class PHPExcel_Writer_Excel5_Font
/**
* Font
*
- * @var PHPExcel_Style_Font
+ * @var PHPExcel\Style_Font
*/
private $_font;
/**
* Constructor
*
- * @param PHPExcel_Style_Font $font
+ * @param PHPExcel\Style_Font $font
*/
- public function __construct(PHPExcel_Style_Font $font = null)
+ public function __construct(Style_Font $font = null)
{
$this->_colorIndex = 0x7FFF;
$this->_font = $font;
@@ -89,7 +91,7 @@ class PHPExcel_Writer_Excel5_Font
$sss = 0;
}
$bFamily = 0; // Font family
- $bCharSet = PHPExcel_Shared_Font::getCharsetFromFontName($this->_font->getName()); // Character set
+ $bCharSet = Shared_Font::getCharsetFromFontName($this->_font->getName()); // Character set
$record = 0x31; // Record identifier
$reserved = 0x00; // Reserved
@@ -118,7 +120,7 @@ class PHPExcel_Writer_Excel5_Font
$bCharSet,
$reserved
);
- $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($this->_font->getName());
+ $data .= Shared_String::UTF8toBIFF8UnicodeShort($this->_font->getName());
$length = strlen($data);
$header = pack("vv", $record, $length);
@@ -144,11 +146,11 @@ class PHPExcel_Writer_Excel5_Font
* @static array of int
*
*/
- private static $_mapUnderline = array( PHPExcel_Style_Font::UNDERLINE_NONE => 0x00,
- PHPExcel_Style_Font::UNDERLINE_SINGLE => 0x01,
- PHPExcel_Style_Font::UNDERLINE_DOUBLE => 0x02,
- PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING => 0x21,
- PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING => 0x22,
+ private static $_mapUnderline = array( Style_Font::UNDERLINE_NONE => 0x00,
+ Style_Font::UNDERLINE_SINGLE => 0x01,
+ Style_Font::UNDERLINE_DOUBLE => 0x02,
+ Style_Font::UNDERLINE_SINGLEACCOUNTING => 0x21,
+ Style_Font::UNDERLINE_DOUBLEACCOUNTING => 0x22,
);
/**
* Map underline
diff --git a/Classes/PHPExcel/Writer/Excel5/Parser.php b/Classes/PHPExcel/Writer/Excel5/Parser.php
index 2018c5b..e7e2524 100644
--- a/Classes/PHPExcel/Writer/Excel5/Parser.php
+++ b/Classes/PHPExcel/Writer/Excel5/Parser.php
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @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##
@@ -50,14 +50,16 @@
// */
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel5_Parser
+ * PHPExcel\Writer_Excel5_Parser
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel5_Parser
+class Writer_Excel5_Parser
{
/** Constants */
// Sheet title in unquoted form
@@ -564,7 +566,7 @@ class PHPExcel_Writer_Excel5_Parser
}
// TODO: use real error codes
- throw new PHPExcel_Writer_Exception("Unknown token $token");
+ throw new Writer_Exception("Unknown token $token");
}
/**
@@ -579,7 +581,7 @@ class PHPExcel_Writer_Excel5_Parser
if ((preg_match("/^\d+$/", $num)) and ($num <= 65535)) {
return pack("Cv", $this->ptg['ptgInt'], $num);
} else { // A float
- if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
+ if (Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
$num = strrev($num);
}
return pack("Cd", $this->ptg['ptgNum'], $num);
@@ -598,10 +600,10 @@ class PHPExcel_Writer_Excel5_Parser
// chop away beggining and ending quotes
$string = substr($string, 1, strlen($string) - 2);
if (strlen($string) > 255) {
- throw new PHPExcel_Writer_Exception("String is too long");
+ throw new Writer_Exception("String is too long");
}
- return pack('C', $this->ptg['ptgStr']) . PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($string);
+ return pack('C', $this->ptg['ptgStr']) . Shared_String::UTF8toBIFF8UnicodeShort($string);
}
/**
@@ -644,7 +646,7 @@ class PHPExcel_Writer_Excel5_Parser
list($cell1, $cell2) = explode(':', $range);
} else {
// TODO: use real error codes
- throw new PHPExcel_Writer_Exception("Unknown range separator");
+ throw new Writer_Exception("Unknown range separator");
}
// Convert the cell references
@@ -660,7 +662,7 @@ class PHPExcel_Writer_Excel5_Parser
$ptgArea = pack("C", $this->ptg['ptgAreaA']);
} else {
// TODO: use real error codes
- throw new PHPExcel_Writer_Exception("Unknown class $class");
+ throw new Writer_Exception("Unknown class $class");
}
return $ptgArea . $row1 . $row2 . $col1. $col2;
}
@@ -702,7 +704,7 @@ class PHPExcel_Writer_Excel5_Parser
// } elseif ($class == 2) {
// $ptgArea = pack("C", $this->ptg['ptgArea3dA']);
// } else {
-// throw new PHPExcel_Writer_Exception("Unknown class $class");
+// throw new Writer_Exception("Unknown class $class");
// }
return $ptgArea . $ext_ref . $row1 . $row2 . $col1. $col2;
@@ -732,7 +734,7 @@ class PHPExcel_Writer_Excel5_Parser
$ptgRef = pack("C", $this->ptg['ptgRefA']);
// } else {
// // TODO: use real error codes
-// throw new PHPExcel_Writer_Exception("Unknown class $class");
+// throw new Writer_Exception("Unknown class $class");
// }
return $ptgRef.$row.$col;
}
@@ -766,7 +768,7 @@ class PHPExcel_Writer_Excel5_Parser
// } elseif ($class == 2) {
$ptgRef = pack("C", $this->ptg['ptgRef3dA']);
// } else {
-// throw new PHPExcel_Writer_Exception("Unknown class $class");
+// throw new Writer_Exception("Unknown class $class");
// }
return $ptgRef . $ext_ref. $row . $col;
@@ -812,11 +814,11 @@ class PHPExcel_Writer_Excel5_Parser
$sheet1 = $this->_getSheetIndex($sheet_name1);
if ($sheet1 == -1) {
- throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name1 in formula");
+ throw new Writer_Exception("Unknown sheet name $sheet_name1 in formula");
}
$sheet2 = $this->_getSheetIndex($sheet_name2);
if ($sheet2 == -1) {
- throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name2 in formula");
+ throw new Writer_Exception("Unknown sheet name $sheet_name2 in formula");
}
// Reverse max and min sheet numbers if necessary
@@ -826,7 +828,7 @@ class PHPExcel_Writer_Excel5_Parser
} else { // Single sheet name only.
$sheet1 = $this->_getSheetIndex($ext_ref);
if ($sheet1 == -1) {
- throw new PHPExcel_Writer_Exception("Unknown sheet name $ext_ref in formula");
+ throw new Writer_Exception("Unknown sheet name $ext_ref in formula");
}
$sheet2 = $sheet1;
}
@@ -858,11 +860,11 @@ class PHPExcel_Writer_Excel5_Parser
$sheet1 = $this->_getSheetIndex($sheet_name1);
if ($sheet1 == -1) {
- throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name1 in formula");
+ throw new Writer_Exception("Unknown sheet name $sheet_name1 in formula");
}
$sheet2 = $this->_getSheetIndex($sheet_name2);
if ($sheet2 == -1) {
- throw new PHPExcel_Writer_Exception("Unknown sheet name $sheet_name2 in formula");
+ throw new Writer_Exception("Unknown sheet name $sheet_name2 in formula");
}
// Reverse max and min sheet numbers if necessary
@@ -872,7 +874,7 @@ class PHPExcel_Writer_Excel5_Parser
} else { // Single sheet name only.
$sheet1 = $this->_getSheetIndex($ext_ref);
if ($sheet1 == -1) {
- throw new PHPExcel_Writer_Exception("Unknown sheet name $ext_ref in formula");
+ throw new Writer_Exception("Unknown sheet name $ext_ref in formula");
}
$sheet2 = $sheet1;
}
@@ -900,7 +902,7 @@ class PHPExcel_Writer_Excel5_Parser
/**
* Look up the index that corresponds to an external sheet name. The hash of
* sheet names is updated by the addworksheet() method of the
- * PHPExcel_Writer_Excel5_Workbook class.
+ * PHPExcel\Writer_Excel5_Workbook class.
*
* @access private
* @param string $sheet_name Sheet name
@@ -918,10 +920,10 @@ class PHPExcel_Writer_Excel5_Parser
/**
* This method is used to update the array of sheet names. It is
* called by the addWorksheet() method of the
- * PHPExcel_Writer_Excel5_Workbook class.
+ * PHPExcel\Writer_Excel5_Workbook class.
*
* @access public
- * @see PHPExcel_Writer_Excel5_Workbook::addWorksheet()
+ * @see PHPExcel\Writer_Excel5_Workbook::addWorksheet()
* @param string $name The name of the worksheet being added
* @param integer $index The index of the worksheet being added
*/
@@ -942,10 +944,10 @@ class PHPExcel_Writer_Excel5_Parser
$cell = strtoupper($cell);
list($row, $col, $row_rel, $col_rel) = $this->_cellToRowcol($cell);
if ($col >= 256) {
- throw new PHPExcel_Writer_Exception("Column in: $cell greater than 255");
+ throw new Writer_Exception("Column in: $cell greater than 255");
}
if ($row >= 65536) {
- throw new PHPExcel_Writer_Exception("Row in: $cell greater than 65536 ");
+ throw new Writer_Exception("Row in: $cell greater than 65536 ");
}
// Set the high bits to indicate if row or col are relative.
@@ -983,7 +985,7 @@ class PHPExcel_Writer_Excel5_Parser
// FIXME: this changes for BIFF8
if (($row1 >= 65536) or ($row2 >= 65536)) {
- throw new PHPExcel_Writer_Exception("Row in: $range greater than 65536 ");
+ throw new Writer_Exception("Row in: $range greater than 65536 ");
}
// Set the high bits to indicate if rows are relative.
@@ -1372,7 +1374,7 @@ class PHPExcel_Writer_Excel5_Parser
$this->_advance(); // eat the "("
$result = $this->_parenthesizedExpression();
if ($this->_current_token != ")") {
- throw new PHPExcel_Writer_Exception("')' token expected.");
+ throw new Writer_Exception("')' token expected.");
}
$this->_advance(); // eat the ")"
return $result;
@@ -1442,7 +1444,7 @@ class PHPExcel_Writer_Excel5_Parser
$result = $this->_func();
return $result;
}
- throw new PHPExcel_Writer_Exception("Syntax error: ".$this->_current_token.
+ throw new Writer_Exception("Syntax error: ".$this->_current_token.
", lookahead: ".$this->_lookahead.
", current char: ".$this->_current_char);
}
@@ -1469,7 +1471,7 @@ class PHPExcel_Writer_Excel5_Parser
{
$this->_advance(); // eat the "," or ";"
} else {
- throw new PHPExcel_Writer_Exception("Syntax error: comma expected in ".
+ throw new Writer_Exception("Syntax error: comma expected in ".
"function $function, arg #{$num_args}");
}
$result2 = $this->_condition();
@@ -1481,12 +1483,12 @@ class PHPExcel_Writer_Excel5_Parser
++$num_args;
}
if (!isset($this->_functions[$function])) {
- throw new PHPExcel_Writer_Exception("Function $function() doesn't exist");
+ throw new Writer_Exception("Function $function() doesn't exist");
}
$args = $this->_functions[$function][1];
// If fixed number of args eg. TIME($i,$j,$k). Check that the number of args is valid.
if (($args >= 0) and ($args != $num_args)) {
- throw new PHPExcel_Writer_Exception("Incorrect number of arguments in function $function() ");
+ throw new Writer_Exception("Incorrect number of arguments in function $function() ");
}
$result = $this->_createTree($function, $result, $num_args);
diff --git a/Classes/PHPExcel/Writer/Excel5/Workbook.php b/Classes/PHPExcel/Writer/Excel5/Workbook.php
index 915096f..aa2c517 100644
--- a/Classes/PHPExcel/Writer/Excel5/Workbook.php
+++ b/Classes/PHPExcel/Writer/Excel5/Workbook.php
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @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##
@@ -61,19 +61,21 @@
// */
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel5_Workbook
+ * PHPExcel\Writer_Excel5_Workbook
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
+class Writer_Excel5_Workbook extends Writer_Excel5_BIFFwriter
{
/**
* Formula parser
*
- * @var PHPExcel_Writer_Excel5_Parser
+ * @var PHPExcel\Writer_Excel5_Parser
*/
private $_parser;
@@ -86,7 +88,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* XF Writers
- * @var PHPExcel_Writer_Excel5_Xf[]
+ * @var PHPExcel\Writer_Excel5_Xf[]
*/
private $_xfWriters = array();
@@ -117,7 +119,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Fonts writers
*
- * @var PHPExcel_Writer_Excel5_Font[]
+ * @var PHPExcel\Writer_Excel5_Font[]
*/
private $_fontWriters = array();
@@ -185,7 +187,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Escher object corresponding to MSODRAWINGGROUP
*
- * @var PHPExcel_Shared_Escher
+ * @var PHPExcel\Shared_Escher
*/
private $_escher;
@@ -193,14 +195,14 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Class constructor
*
- * @param PHPExcel $phpExcel The Workbook
- * @param int &$str_total Total number of strings
- * @param int &$str_unique Total number of unique strings
- * @param array &$str_table String Table
- * @param array &$colors Colour Table
- * @param mixed $parser The formula parser created for the Workbook
+ * @param PHPExcel\Workbook $phpExcel The Workbook
+ * @param int &$str_total Total number of strings
+ * @param int &$str_unique Total number of unique strings
+ * @param array &$str_table String Table
+ * @param array &$colors Colour Table
+ * @param mixed $parser The formula parser created for the Workbook
*/
- public function __construct(PHPExcel $phpExcel = null,
+ public function __construct(Workbook $phpExcel = null,
&$str_total, &$str_unique, &$str_table, &$colors,
$parser )
{
@@ -246,13 +248,13 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Add a new XF writer
*
- * @param PHPExcel_Style
+ * @param PHPExcel\Style
* @param boolean Is it a style XF?
* @return int Index to XF record
*/
public function addXfWriter($style, $isStyleXf = false)
{
- $xfWriter = new PHPExcel_Writer_Excel5_Xf($style);
+ $xfWriter = new Writer_Excel5_Xf($style);
$xfWriter->setIsStyleXf($isStyleXf);
// Add the font if not already added
@@ -297,10 +299,10 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Add a font to added fonts
*
- * @param PHPExcel_Style_Font $font
+ * @param PHPExcel\Style_Font $font
* @return int Index to FONT record
*/
- public function _addFont(PHPExcel_Style_Font $font)
+ public function _addFont(Style_Font $font)
{
$fontHashCode = $font->getHashCode();
if(isset($this->_addedFonts[$fontHashCode])){
@@ -309,7 +311,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$countFonts = count($this->_fontWriters);
$fontIndex = ($countFonts < 4) ? $countFonts : $countFonts + 1;
- $fontWriter = new PHPExcel_Writer_Excel5_Font($font);
+ $fontWriter = new Writer_Excel5_Font($font);
$fontWriter->setColorIndex($this->_addColor($font->getColor()->getRGB()));
$this->_fontWriters[] = $fontWriter;
@@ -487,7 +489,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
// add size of Workbook globals part 2, the length of the SHEET records
$total_worksheets = count($this->_phpExcel->getAllSheets());
foreach ($this->_phpExcel->getWorksheetIterator() as $sheet) {
- $offset += $boundsheet_length + strlen(PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheet->getTitle()));
+ $offset += $boundsheet_length + strlen(Shared_String::UTF8toBIFF8UnicodeShort($sheet->getTitle()));
}
// add the sizes of each of the Sheet substreams, respectively
@@ -566,15 +568,15 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
// Write a Name record if the print area has been defined
if ($sheetSetup->isPrintAreaSet()) {
// Print area
- $printArea = PHPExcel_Cell::splitRange($sheetSetup->getPrintArea());
+ $printArea = Cell::splitRange($sheetSetup->getPrintArea());
$printArea = $printArea[0];
- $printArea[0] = PHPExcel_Cell::coordinateFromString($printArea[0]);
- $printArea[1] = PHPExcel_Cell::coordinateFromString($printArea[1]);
+ $printArea[0] = Cell::coordinateFromString($printArea[0]);
+ $printArea[1] = Cell::coordinateFromString($printArea[1]);
$print_rowmin = $printArea[0][1] - 1;
$print_rowmax = $printArea[1][1] - 1;
- $print_colmin = PHPExcel_Cell::columnIndexFromString($printArea[0][0]) - 1;
- $print_colmax = PHPExcel_Cell::columnIndexFromString($printArea[1][0]) - 1;
+ $print_colmin = Cell::columnIndexFromString($printArea[0][0]) - 1;
+ $print_colmax = Cell::columnIndexFromString($printArea[1][0]) - 1;
$this->_writeNameShort(
$i, // sheet index
@@ -594,8 +596,8 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
// simultaneous repeatColumns repeatRows
if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
- $colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
- $colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
+ $colmin = Cell::columnIndexFromString($repeat[0]) - 1;
+ $colmax = Cell::columnIndexFromString($repeat[1]) - 1;
$repeat = $sheetSetup->getRowsToRepeatAtTop();
$rowmin = $repeat[0] - 1;
@@ -616,8 +618,8 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
// Columns to repeat
if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
- $colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
- $colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
+ $colmin = Cell::columnIndexFromString($repeat[0]) - 1;
+ $colmax = Cell::columnIndexFromString($repeat[1]) - 1;
} else {
$colmin = 0;
$colmax = 255;
@@ -660,14 +662,14 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
foreach ($namedRanges as $namedRange) {
// Create absolute coordinate
- $range = PHPExcel_Cell::splitRange($namedRange->getRange());
+ $range = Cell::splitRange($namedRange->getRange());
for ($i = 0; $i < count($range); $i++) {
- $range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteCoordinate($range[$i][0]);
+ $range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . Cell::absoluteCoordinate($range[$i][0]);
if (isset($range[$i][1])) {
- $range[$i][1] = PHPExcel_Cell::absoluteCoordinate($range[$i][1]);
+ $range[$i][1] = Cell::absoluteCoordinate($range[$i][1]);
}
}
- $range = PHPExcel_Cell::buildRange($range); // e.g. Sheet1!$A$1:$B$2
+ $range = Cell::buildRange($range); // e.g. Sheet1!$A$1:$B$2
// parse formula
try {
@@ -688,7 +690,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
}
$chunk .= $this->writeData($this->_writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
- } catch(PHPExcel_Exception $e) {
+ } catch(Exception $e) {
// do nothing
}
}
@@ -703,8 +705,8 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
// simultaneous repeatColumns repeatRows
if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
- $colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
- $colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
+ $colmin = Cell::columnIndexFromString($repeat[0]) - 1;
+ $colmax = Cell::columnIndexFromString($repeat[1]) - 1;
$repeat = $sheetSetup->getRowsToRepeatAtTop();
$rowmin = $repeat[0] - 1;
@@ -725,8 +727,8 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
// Columns to repeat
if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
- $colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
- $colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
+ $colmin = Cell::columnIndexFromString($repeat[0]) - 1;
+ $colmax = Cell::columnIndexFromString($repeat[1]) - 1;
} else {
$colmin = 0;
$colmax = 255;
@@ -754,19 +756,19 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
if ($sheetSetup->isPrintAreaSet()) {
// Print area, e.g. A3:J6,H1:X20
- $printArea = PHPExcel_Cell::splitRange($sheetSetup->getPrintArea());
+ $printArea = Cell::splitRange($sheetSetup->getPrintArea());
$countPrintArea = count($printArea);
$formulaData = '';
for ($j = 0; $j < $countPrintArea; ++$j) {
$printAreaRect = $printArea[$j]; // e.g. A3:J6
- $printAreaRect[0] = PHPExcel_Cell::coordinateFromString($printAreaRect[0]);
- $printAreaRect[1] = PHPExcel_Cell::coordinateFromString($printAreaRect[1]);
+ $printAreaRect[0] = Cell::coordinateFromString($printAreaRect[0]);
+ $printAreaRect[1] = Cell::coordinateFromString($printAreaRect[1]);
$print_rowmin = $printAreaRect[0][1] - 1;
$print_rowmax = $printAreaRect[1][1] - 1;
- $print_colmin = PHPExcel_Cell::columnIndexFromString($printAreaRect[0][0]) - 1;
- $print_colmax = PHPExcel_Cell::columnIndexFromString($printAreaRect[1][0]) - 1;
+ $print_colmin = Cell::columnIndexFromString($printAreaRect[0][0]) - 1;
+ $print_colmax = Cell::columnIndexFromString($printAreaRect[1][0]) - 1;
// construct formula data manually because parser does not recognize absolute 3d cell references
$formulaData .= pack('Cvvvvv', 0x3B, $i, $print_rowmin, $print_rowmax, $print_colmin, $print_colmax);
@@ -786,7 +788,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$sheetAutoFilter = $this->_phpExcel->getSheet($i)->getAutoFilter();
$autoFilterRange = $sheetAutoFilter->getRange();
if(!empty($autoFilterRange)) {
- $rangeBounds = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
+ $rangeBounds = Cell::rangeBoundaries($autoFilterRange);
//Autofilter built in name
$name = pack('C', 0x0D);
@@ -815,10 +817,10 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$options = $isBuiltIn ? 0x20 : 0x00;
// length of the name, character count
- $nlen = PHPExcel_Shared_String::CountCharacters($name);
+ $nlen = Shared_String::CountCharacters($name);
// name with stripped length field
- $name = substr(PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($name), 2);
+ $name = substr(Shared_String::UTF8toBIFF8UnicodeLong($name), 2);
// size of the formula (in bytes)
$sz = strlen($formulaData);
@@ -919,7 +921,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Writes Excel BIFF BOUNDSHEET record.
*
- * @param PHPExcel_Worksheet $sheet Worksheet name
+ * @param PHPExcel\Worksheet $sheet Worksheet name
* @param integer $offset Location of worksheet BOF
*/
private function _writeBoundsheet($sheet, $offset)
@@ -929,9 +931,9 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
// sheet state
switch ($sheet->getSheetState()) {
- case PHPExcel_Worksheet::SHEETSTATE_VISIBLE: $ss = 0x00; break;
- case PHPExcel_Worksheet::SHEETSTATE_HIDDEN: $ss = 0x01; break;
- case PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN: $ss = 0x02; break;
+ case Worksheet::SHEETSTATE_VISIBLE: $ss = 0x00; break;
+ case Worksheet::SHEETSTATE_HIDDEN: $ss = 0x01; break;
+ case Worksheet::SHEETSTATE_VERYHIDDEN: $ss = 0x02; break;
default: $ss = 0x00; break;
}
@@ -941,7 +943,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$grbit = 0x0000; // Visibility and sheet type
$data = pack("VCC", $offset, $ss, $st);
- $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
+ $data .= Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
$length = strlen($data);
$header = pack("vv", $record, $length);
@@ -1008,7 +1010,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
{
$record = 0x041E; // Record identifier
- $numberFormatString = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($format);
+ $numberFormatString = Shared_String::UTF8toBIFF8UnicodeLong($format);
$length = 2 + strlen($numberFormatString); // Number of bytes to follow
@@ -1025,7 +1027,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$record = 0x0022; // Record identifier
$length = 0x0002; // Bytes to follow
- $f1904 = (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) ?
+ $f1904 = (Shared_Date::getExcelCalendar() == Shared_Date::CALENDAR_MAC_1904) ?
1 : 0; // Flag for 1904 date system
$header = pack("vv", $record, $length);
@@ -1414,7 +1416,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
{
// write the Escher stream if necessary
if (isset($this->_escher)) {
- $writer = new PHPExcel_Writer_Excel5_Escher($this->_escher);
+ $writer = new Writer_Excel5_Escher($this->_escher);
$data = $writer->close();
$record = 0x00EB;
@@ -1431,7 +1433,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Get Escher object
*
- * @return PHPExcel_Shared_Escher
+ * @return PHPExcel\Shared_Escher
*/
public function getEscher()
{
@@ -1441,9 +1443,9 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Set Escher object
*
- * @param PHPExcel_Shared_Escher $pValue
+ * @param PHPExcel\Shared_Escher $pValue
*/
- public function setEscher(PHPExcel_Shared_Escher $pValue = null)
+ public function setEscher(Shared_Escher $pValue = null)
{
$this->_escher = $pValue;
}
diff --git a/Classes/PHPExcel/Writer/Excel5/Worksheet.php b/Classes/PHPExcel/Writer/Excel5/Worksheet.php
index cc39513..7ad827a 100644
--- a/Classes/PHPExcel/Writer/Excel5/Worksheet.php
+++ b/Classes/PHPExcel/Writer/Excel5/Worksheet.php
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @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##
@@ -61,19 +61,21 @@
// */
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel5_Worksheet
+ * PHPExcel\Writer_Excel5_Worksheet
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
+class Writer_Excel5_Worksheet extends Writer_Excel5_BIFFwriter
{
/**
* Formula parser
*
- * @var PHPExcel_Writer_Excel5_Parser
+ * @var PHPExcel\Writer_Excel5_Parser
*/
private $_parser;
@@ -174,7 +176,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Sheet object
- * @var PHPExcel_Worksheet
+ * @var PHPExcel\Worksheet
*/
public $_phpSheet;
@@ -188,7 +190,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Escher object corresponding to MSODRAWING
*
- * @var PHPExcel_Shared_Escher
+ * @var PHPExcel\Shared_Escher
*/
private $_escher;
@@ -209,7 +211,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
* @param mixed $parser The formula parser created for the Workbook
* @param boolean $preCalculateFormulas Flag indicating whether formulas should be calculated or just written
* @param string $phpSheet The worksheet to write
- * @param PHPExcel_Worksheet $phpSheet
+ * @param PHPExcel\Worksheet $phpSheet
*/
public function __construct(&$str_total, &$str_unique, &$str_table, &$colors,
$parser, $preCalculateFormulas, $phpSheet)
@@ -257,8 +259,8 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// $this->_firstRowIndex = ($minR > 65535) ? 65535 : $minR;
$this->_lastRowIndex = ($maxR > 65535) ? 65535 : $maxR ;
- $this->_firstColumnIndex = PHPExcel_Cell::columnIndexFromString($minC);
- $this->_lastColumnIndex = PHPExcel_Cell::columnIndexFromString($maxC);
+ $this->_firstColumnIndex = Cell::columnIndexFromString($minC);
+ $this->_lastColumnIndex = Cell::columnIndexFromString($maxC);
// if ($this->_firstColumnIndex > 255) $this->_firstColumnIndex = 255;
if ($this->_lastColumnIndex > 255) $this->_lastColumnIndex = 255;
@@ -271,7 +273,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
* and to the end of the workbook.
*
* @access public
- * @see PHPExcel_Writer_Excel5_Workbook::storeWorkbook()
+ * @see PHPExcel\Writer_Excel5_Workbook::storeWorkbook()
*/
function close()
{
@@ -296,7 +298,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Column dimensions
if (($defaultWidth = $_phpSheet->getDefaultColumnDimension()->getWidth()) < 0) {
- $defaultWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($_phpSheet->getParent()->getDefaultStyle()->getFont());
+ $defaultWidth = Shared_Font::getDefaultColumnWidthByFont($_phpSheet->getParent()->getDefaultStyle()->getFont());
}
$columnDimensions = $_phpSheet->getColumnDimensions();
@@ -308,7 +310,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$width = $defaultWidth;
- $columnLetter = PHPExcel_Cell::stringFromColumnIndex($i);
+ $columnLetter = Cell::stringFromColumnIndex($i);
if (isset($columnDimensions[$columnLetter])) {
$columnDimension = $columnDimensions[$columnLetter];
if ($columnDimension->getWidth() >= 0) {
@@ -409,7 +411,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
foreach ($_phpSheet->getCellCollection() as $cellID) {
$cell = $_phpSheet->getCell($cellID);
$row = $cell->getRow() - 1;
- $column = PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1;
+ $column = Cell::columnIndexFromString($cell->getColumn()) - 1;
// Don't break Excel!
// if ($row + 1 > 65536 or $column + 1 > 256) {
@@ -421,15 +423,15 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$xfIndex = $cell->getXfIndex() + 15; // there are 15 cell style Xfs
$cVal = $cell->getValue();
- if ($cVal instanceof PHPExcel_RichText) {
+ if ($cVal instanceof RichText) {
// $this->_writeString($row, $column, $cVal->getPlainText(), $xfIndex);
$arrcRun = array();
- $str_len = PHPExcel_Shared_String::CountCharacters($cVal->getPlainText(), 'UTF-8');
+ $str_len = Shared_String::CountCharacters($cVal->getPlainText(), 'UTF-8');
$str_pos = 0;
$elements = $cVal->getRichTextElements();
foreach ($elements as $element) {
// FONT Index
- if ($element instanceof PHPExcel_RichText_Run) {
+ if ($element instanceof RichText_Run) {
$str_fontidx = $this->_fntHashIndex[$element->getFont()->getHashCode()];
}
else {
@@ -437,13 +439,13 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
}
$arrcRun[] = array('strlen' => $str_pos, 'fontidx' => $str_fontidx);
// Position FROM
- $str_pos += PHPExcel_Shared_String::CountCharacters($element->getText(), 'UTF-8');
+ $str_pos += Shared_String::CountCharacters($element->getText(), 'UTF-8');
}
$this->_writeRichTextString($row, $column, $cVal->getPlainText(), $xfIndex, $arrcRun);
} else {
switch ($cell->getDatatype()) {
- case PHPExcel_Cell_DataType::TYPE_STRING:
- case PHPExcel_Cell_DataType::TYPE_NULL:
+ case Cell_DataType::TYPE_STRING:
+ case Cell_DataType::TYPE_NULL:
if ($cVal === '' || $cVal === null) {
$this->_writeBlank($row, $column, $xfIndex);
} else {
@@ -451,21 +453,21 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
}
break;
- case PHPExcel_Cell_DataType::TYPE_NUMERIC:
+ case Cell_DataType::TYPE_NUMERIC:
$this->_writeNumber($row, $column, $cVal, $xfIndex);
break;
- case PHPExcel_Cell_DataType::TYPE_FORMULA:
+ case Cell_DataType::TYPE_FORMULA:
$calculatedValue = $this->_preCalculateFormulas ?
$cell->getCalculatedValue() : null;
$this->_writeFormula($row, $column, $cVal, $xfIndex, $calculatedValue);
break;
- case PHPExcel_Cell_DataType::TYPE_BOOL:
+ case Cell_DataType::TYPE_BOOL:
$this->_writeBoolErr($row, $column, $cVal, 0, $xfIndex);
break;
- case PHPExcel_Cell_DataType::TYPE_ERROR:
+ case Cell_DataType::TYPE_ERROR:
$this->_writeBoolErr($row, $column, self::_mapErrorCode($cVal), 1, $xfIndex);
break;
@@ -496,7 +498,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Hyperlinks
foreach ($_phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
- list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinate);
+ list($column, $row) = Cell::coordinateFromString($coordinate);
$url = $hyperlink->getUrl();
@@ -513,7 +515,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$url = 'external:' . $url;
}
- $this->_writeUrl($row - 1, PHPExcel_Cell::columnIndexFromString($column) - 1, $url);
+ $this->_writeUrl($row - 1, Cell::columnIndexFromString($column) - 1, $url);
}
$this->_writeDataValidity();
@@ -532,8 +534,8 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Write ConditionalFormattingTable records
foreach ($arrConditionalStyles as $cellCoordinate => $conditionalStyles) {
foreach ($conditionalStyles as $conditional) {
- if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
- || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS){
+ if($conditional->getConditionType() == Style_Conditional::CONDITION_EXPRESSION
+ || $conditional->getConditionType() == Style_Conditional::CONDITION_CELLIS){
if(!in_array($conditional->getHashCode(), $arrConditional)){
$arrConditional[] = $conditional->getHashCode();
// Write CFRULE record
@@ -569,14 +571,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$lastCell = $explodes[1];
}
- $firstCellCoordinates = PHPExcel_Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
- $lastCellCoordinates = PHPExcel_Cell::coordinateFromString($lastCell); // e.g. array(1, 6)
+ $firstCellCoordinates = Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
+ $lastCellCoordinates = Cell::coordinateFromString($lastCell); // e.g. array(1, 6)
return(pack('vvvv',
$firstCellCoordinates[1] - 1,
$lastCellCoordinates[1] - 1,
- PHPExcel_Cell::columnIndexFromString($firstCellCoordinates[0]) - 1,
- PHPExcel_Cell::columnIndexFromString($lastCellCoordinates[0]) - 1
+ Cell::columnIndexFromString($firstCellCoordinates[0]) - 1,
+ Cell::columnIndexFromString($lastCellCoordinates[0]) - 1
));
}
@@ -688,7 +690,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
private function _writeRichTextString($row, $col, $str, $xfIndex, $arrcRun){
$record = 0x00FD; // Record identifier
$length = 0x000A; // Bytes to follow
- $str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($str, $arrcRun);
+ $str = Shared_String::UTF8toBIFF8UnicodeShort($str, $arrcRun);
/* check if string is already present */
if (!isset($this->_str_table[$str])) {
@@ -757,7 +759,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$record = 0x00FD; // Record identifier
$length = 0x000A; // Bytes to follow
- $str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($str);
+ $str = Shared_String::UTF8toBIFF8UnicodeLong($str);
/* check if string is already present */
if (!isset($this->_str_table[$str])) {
@@ -881,7 +883,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Numeric value
$num = pack('d', $calculatedValue);
} elseif (is_string($calculatedValue)) {
- if (array_key_exists($calculatedValue, PHPExcel_Cell_DataType::getErrorCodes())) {
+ if (array_key_exists($calculatedValue, Cell_DataType::getErrorCodes())) {
// Error value
$num = pack('CCCvCv', 0x02, 0x00, self::_mapErrorCode($calculatedValue), 0x00, 0x00, 0xFFFF);
} elseif ($calculatedValue === '') {
@@ -934,7 +936,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
return 0;
- } catch (PHPExcel_Exception $e) {
+ } catch (Exception $e) {
// do nothing
}
@@ -948,7 +950,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
private function _writeStringRecord($stringValue)
{
$record = 0x0207; // Record identifier
- $data = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($stringValue);
+ $data = Shared_String::UTF8toBIFF8UnicodeLong($stringValue);
$length = strlen($data);
$header = pack('vv', $record, $length);
@@ -1086,10 +1088,10 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$url .= "\0";
// character count
- $url_len = PHPExcel_Shared_String::CountCharacters($url);
+ $url_len = Shared_String::CountCharacters($url);
$url_len = pack('V', $url_len);
- $url = PHPExcel_Shared_String::ConvertEncoding($url, 'UTF-16LE', 'UTF-8');
+ $url = Shared_String::ConvertEncoding($url, 'UTF-16LE', 'UTF-8');
// Calculate the data length
$length = 0x24 + strlen($url);
@@ -1309,7 +1311,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// no support in PHPExcel for selected sheet, therefore sheet is only selected if it is the active sheet
$fSelected = ($this->_phpSheet === $this->_phpSheet->getParent()->getActiveSheet()) ? 1 : 0;
$fPaged = 1; // 2
- $fPageBreakPreview = $this->_phpSheet->getSheetView()->getView() === PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW;
+ $fPageBreakPreview = $this->_phpSheet->getSheetView()->getView() === Worksheet_SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW;
$grbit = $fDspFmla;
$grbit |= $fDspGrid << 1;
@@ -1440,7 +1442,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
{
// look up the selected cell range
$selectedCells = $this->_phpSheet->getSelectedCells();
- $selectedCells = PHPExcel_Cell::splitRange($this->_phpSheet->getSelectedCells());
+ $selectedCells = Cell::splitRange($this->_phpSheet->getSelectedCells());
$selectedCells = $selectedCells[0];
if (count($selectedCells) == 2) {
list($first, $last) = $selectedCells;
@@ -1449,12 +1451,12 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$last = $selectedCells[0];
}
- list($colFirst, $rwFirst) = PHPExcel_Cell::coordinateFromString($first);
- $colFirst = PHPExcel_Cell::columnIndexFromString($colFirst) - 1; // base 0 column index
+ list($colFirst, $rwFirst) = Cell::coordinateFromString($first);
+ $colFirst = Cell::columnIndexFromString($colFirst) - 1; // base 0 column index
--$rwFirst; // base 0 row index
- list($colLast, $rwLast) = PHPExcel_Cell::coordinateFromString($last);
- $colLast = PHPExcel_Cell::columnIndexFromString($colLast) - 1; // base 0 column index
+ list($colLast, $rwLast) = Cell::coordinateFromString($last);
+ $colLast = Cell::columnIndexFromString($colLast) - 1; // base 0 column index
--$rwLast; // base 0 row index
// make sure we are not out of bounds
@@ -1530,12 +1532,12 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
++$j;
// extract the row and column indexes
- $range = PHPExcel_Cell::splitRange($mergeCell);
+ $range = Cell::splitRange($mergeCell);
list($first, $last) = $range[0];
- list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($first);
- list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($last);
+ list($firstColumn, $firstRow) = Cell::coordinateFromString($first);
+ list($lastColumn, $lastRow) = Cell::coordinateFromString($last);
- $recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, PHPExcel_Cell::columnIndexFromString($firstColumn) - 1, PHPExcel_Cell::columnIndexFromString($lastColumn) - 1);
+ $recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, Cell::columnIndexFromString($firstColumn) - 1, Cell::columnIndexFromString($lastColumn) - 1);
// flush record if we have reached limit for number of merged cells, or reached final merged cell
if ($j == $maxCountMergeCellsPerRecord or $i == $countMergeCells) {
@@ -1660,7 +1662,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
hexdec($password)
);
- $recordData .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
+ $recordData .= Shared_String::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
$length = strlen($recordData);
@@ -1733,9 +1735,9 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
{
$panes = array();
if ($freezePane = $this->_phpSheet->getFreezePane()) {
- list($column, $row) = PHPExcel_Cell::coordinateFromString($freezePane);
+ list($column, $row) = Cell::coordinateFromString($freezePane);
$panes[0] = $row - 1;
- $panes[1] = PHPExcel_Cell::columnIndexFromString($column) - 1;
+ $panes[1] = Cell::columnIndexFromString($column) - 1;
} else {
// thaw panes
return;
@@ -1834,7 +1836,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$fLeftToRight = 0x0; // Print over then down
// Page orientation
- $fLandscape = ($this->_phpSheet->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ?
+ $fLandscape = ($this->_phpSheet->getPageSetup()->getOrientation() == Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ?
0x0 : 0x1;
$fNoPls = 0x0; // Setup not read from printer
@@ -1890,7 +1892,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
}
*/
- $recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddHeader());
+ $recordData = Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddHeader());
$length = strlen($recordData);
$header = pack("vv", $record, $length);
@@ -1914,7 +1916,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
}
*/
- $recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddFooter());
+ $recordData = Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddFooter());
$length = strlen($recordData);
$header = pack("vv", $record, $length);
@@ -2085,7 +2087,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$record = 0x009D; // Record identifier
$length = 0x0002; // Bytes to follow
- $rangeBounds = PHPExcel_Cell::rangeBoundaries($this->_phpSheet->getAutoFilter()->getRange());
+ $rangeBounds = Cell::rangeBoundaries($this->_phpSheet->getAutoFilter()->getRange());
$iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
$header = pack("vv", $record, $length);
@@ -2187,21 +2189,21 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
foreach ($this->_phpSheet->getBreaks() as $cell => $breakType) {
// Fetch coordinates
- $coordinates = PHPExcel_Cell::coordinateFromString($cell);
+ $coordinates = Cell::coordinateFromString($cell);
// Decide what to do by the type of break
switch ($breakType) {
- case PHPExcel_Worksheet::BREAK_COLUMN:
+ case Worksheet::BREAK_COLUMN:
// Add to list of vertical breaks
- $vbreaks[] = PHPExcel_Cell::columnIndexFromString($coordinates[0]) - 1;
+ $vbreaks[] = Cell::columnIndexFromString($coordinates[0]) - 1;
break;
- case PHPExcel_Worksheet::BREAK_ROW:
+ case Worksheet::BREAK_ROW:
// Add to list of horizontal breaks
$hbreaks[] = $coordinates[1];
break;
- case PHPExcel_Worksheet::BREAK_NONE:
+ case Worksheet::BREAK_NONE:
default:
// Nothing to do
break;
@@ -2444,10 +2446,10 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$row_end = $row_start; // Row containing bottom right corner of object
// Zero the specified offset if greater than the cell dimensions
- if ($x1 >= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
+ if ($x1 >= Shared_Excel5::sizeCol($this->_phpSheet, Cell::stringFromColumnIndex($col_start))) {
$x1 = 0;
}
- if ($y1 >= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1)) {
+ if ($y1 >= Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1)) {
$y1 = 0;
}
@@ -2455,38 +2457,38 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$height = $height + $y1 -1;
// Subtract the underlying cell widths to find the end cell of the image
- while ($width >= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
- $width -= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end));
+ while ($width >= Shared_Excel5::sizeCol($this->_phpSheet, Cell::stringFromColumnIndex($col_end))) {
+ $width -= Shared_Excel5::sizeCol($this->_phpSheet, Cell::stringFromColumnIndex($col_end));
++$col_end;
}
// Subtract the underlying cell heights to find the end cell of the image
- while ($height >= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)) {
- $height -= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1);
+ while ($height >= Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)) {
+ $height -= Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1);
++$row_end;
}
// Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
// with zero eight or width.
//
- if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
+ if (Shared_Excel5::sizeCol($this->_phpSheet, Cell::stringFromColumnIndex($col_start)) == 0) {
return;
}
- if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end)) == 0) {
+ if (Shared_Excel5::sizeCol($this->_phpSheet, Cell::stringFromColumnIndex($col_end)) == 0) {
return;
}
- if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1) == 0) {
+ if (Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1) == 0) {
return;
}
- if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1) == 0) {
+ if (Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1) == 0) {
return;
}
// Convert the pixel values to the percentage value expected by Excel
- $x1 = $x1 / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) * 1024;
- $y1 = $y1 / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1) * 256;
- $x2 = $width / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
- $y2 = $height / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1) * 256; // Distance to bottom of object
+ $x1 = $x1 / Shared_Excel5::sizeCol($this->_phpSheet, Cell::stringFromColumnIndex($col_start)) * 1024;
+ $y1 = $y1 / Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1) * 256;
+ $x2 = $width / Shared_Excel5::sizeCol($this->_phpSheet, Cell::stringFromColumnIndex($col_end)) * 1024; // Distance to right side of object
+ $y2 = $height / Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1) * 256; // Distance to bottom of object
$this->_writeObjPicture($col_start, $x1,
$row_start, $y1,
@@ -2615,7 +2617,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Open file.
$bmp_fd = @fopen($bitmap,"rb");
if (!$bmp_fd) {
- throw new PHPExcel_Writer_Exception("Couldn't import $bitmap");
+ throw new Writer_Exception("Couldn't import $bitmap");
}
// Slurp the file into a string.
@@ -2623,13 +2625,13 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Check that the file is big enough to be a bitmap.
if (strlen($data) <= 0x36) {
- throw new PHPExcel_Writer_Exception("$bitmap doesn't contain enough data.\n");
+ throw new Writer_Exception("$bitmap doesn't contain enough data.\n");
}
// The first 2 bytes are used to identify the bitmap.
$identity = unpack("A2ident", $data);
if ($identity['ident'] != "BM") {
- throw new PHPExcel_Writer_Exception("$bitmap doesn't appear to be a valid bitmap image.\n");
+ throw new Writer_Exception("$bitmap doesn't appear to be a valid bitmap image.\n");
}
// Remove bitmap data: ID.
@@ -2653,20 +2655,20 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$height = $width_and_height[2];
$data = substr($data, 8);
if ($width > 0xFFFF) {
- throw new PHPExcel_Writer_Exception("$bitmap: largest image width supported is 65k.\n");
+ throw new Writer_Exception("$bitmap: largest image width supported is 65k.\n");
}
if ($height > 0xFFFF) {
- throw new PHPExcel_Writer_Exception("$bitmap: largest image height supported is 65k.\n");
+ throw new Writer_Exception("$bitmap: largest image height supported is 65k.\n");
}
// Read and remove the bitmap planes and bpp data. Verify them.
$planes_and_bitcount = unpack("v2", substr($data, 0, 4));
$data = substr($data, 4);
if ($planes_and_bitcount[2] != 24) { // Bitcount
- throw new PHPExcel_Writer_Exception("$bitmap isn't a 24bit true color bitmap.\n");
+ throw new Writer_Exception("$bitmap isn't a 24bit true color bitmap.\n");
}
if ($planes_and_bitcount[1] != 1) {
- throw new PHPExcel_Writer_Exception("$bitmap: only 1 plane supported in bitmap image.\n");
+ throw new Writer_Exception("$bitmap: only 1 plane supported in bitmap image.\n");
}
// Read and remove the bitmap compression. Verify compression.
@@ -2675,7 +2677,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
//$compression = 0;
if ($compression['comp'] != 0) {
- throw new PHPExcel_Writer_Exception("$bitmap: compression not supported in bitmap image.\n");
+ throw new Writer_Exception("$bitmap: compression not supported in bitmap image.\n");
}
// Remove bitmap data: data size, hres, vres, colours, imp. colours.
@@ -2710,7 +2712,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Get Escher object
*
- * @return PHPExcel_Shared_Escher
+ * @return PHPExcel\Shared_Escher
*/
public function getEscher()
{
@@ -2720,9 +2722,9 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Set Escher object
*
- * @param PHPExcel_Shared_Escher $pValue
+ * @param PHPExcel\Shared_Escher $pValue
*/
- public function setEscher(PHPExcel_Shared_Escher $pValue = null)
+ public function setEscher(Shared_Escher $pValue = null)
{
$this->_escher = $pValue;
}
@@ -2734,7 +2736,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
{
// write the Escher stream if necessary
if (isset($this->_escher)) {
- $writer = new PHPExcel_Writer_Excel5_Escher($this->_escher);
+ $writer = new Writer_Excel5_Escher($this->_escher);
$data = $writer->close();
$spOffsets = $writer->getSpOffsets();
$spTypes = $writer->getSpTypes();
@@ -2848,23 +2850,23 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// data type
$type = $dataValidation->getType();
switch ($type) {
- case PHPExcel_Cell_DataValidation::TYPE_NONE: $type = 0x00; break;
- case PHPExcel_Cell_DataValidation::TYPE_WHOLE: $type = 0x01; break;
- case PHPExcel_Cell_DataValidation::TYPE_DECIMAL: $type = 0x02; break;
- case PHPExcel_Cell_DataValidation::TYPE_LIST: $type = 0x03; break;
- case PHPExcel_Cell_DataValidation::TYPE_DATE: $type = 0x04; break;
- case PHPExcel_Cell_DataValidation::TYPE_TIME: $type = 0x05; break;
- case PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH: $type = 0x06; break;
- case PHPExcel_Cell_DataValidation::TYPE_CUSTOM: $type = 0x07; break;
+ case Cell_DataValidation::TYPE_NONE: $type = 0x00; break;
+ case Cell_DataValidation::TYPE_WHOLE: $type = 0x01; break;
+ case Cell_DataValidation::TYPE_DECIMAL: $type = 0x02; break;
+ case Cell_DataValidation::TYPE_LIST: $type = 0x03; break;
+ case Cell_DataValidation::TYPE_DATE: $type = 0x04; break;
+ case Cell_DataValidation::TYPE_TIME: $type = 0x05; break;
+ case Cell_DataValidation::TYPE_TEXTLENGTH: $type = 0x06; break;
+ case Cell_DataValidation::TYPE_CUSTOM: $type = 0x07; break;
}
$options |= $type << 0;
// error style
$errorStyle = $dataValidation->getType();
switch ($errorStyle) {
- case PHPExcel_Cell_DataValidation::STYLE_STOP: $errorStyle = 0x00; break;
- case PHPExcel_Cell_DataValidation::STYLE_WARNING: $errorStyle = 0x01; break;
- case PHPExcel_Cell_DataValidation::STYLE_INFORMATION: $errorStyle = 0x02; break;
+ case Cell_DataValidation::STYLE_STOP: $errorStyle = 0x00; break;
+ case Cell_DataValidation::STYLE_WARNING: $errorStyle = 0x01; break;
+ case Cell_DataValidation::STYLE_INFORMATION: $errorStyle = 0x02; break;
}
$options |= $errorStyle << 4;
@@ -2888,14 +2890,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// condition operator
$operator = $dataValidation->getOperator();
switch ($operator) {
- case PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN: $operator = 0x00 ; break;
- case PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN: $operator = 0x01 ; break;
- case PHPExcel_Cell_DataValidation::OPERATOR_EQUAL: $operator = 0x02 ; break;
- case PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL: $operator = 0x03 ; break;
- case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN: $operator = 0x04 ; break;
- case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN: $operator = 0x05 ; break;
- case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL: $operator = 0x06; break;
- case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL: $operator = 0x07 ; break;
+ case Cell_DataValidation::OPERATOR_BETWEEN: $operator = 0x00 ; break;
+ case Cell_DataValidation::OPERATOR_NOTBETWEEN: $operator = 0x01 ; break;
+ case Cell_DataValidation::OPERATOR_EQUAL: $operator = 0x02 ; break;
+ case Cell_DataValidation::OPERATOR_NOTEQUAL: $operator = 0x03 ; break;
+ case Cell_DataValidation::OPERATOR_GREATERTHAN: $operator = 0x04 ; break;
+ case Cell_DataValidation::OPERATOR_LESSTHAN: $operator = 0x05 ; break;
+ case Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL: $operator = 0x06; break;
+ case Cell_DataValidation::OPERATOR_LESSTHANOREQUAL: $operator = 0x07 ; break;
}
$options |= $operator << 20;
@@ -2904,22 +2906,22 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// prompt title
$promptTitle = $dataValidation->getPromptTitle() !== '' ?
$dataValidation->getPromptTitle() : chr(0);
- $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($promptTitle);
+ $data .= Shared_String::UTF8toBIFF8UnicodeLong($promptTitle);
// error title
$errorTitle = $dataValidation->getErrorTitle() !== '' ?
$dataValidation->getErrorTitle() : chr(0);
- $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($errorTitle);
+ $data .= Shared_String::UTF8toBIFF8UnicodeLong($errorTitle);
// prompt text
$prompt = $dataValidation->getPrompt() !== '' ?
$dataValidation->getPrompt() : chr(0);
- $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($prompt);
+ $data .= Shared_String::UTF8toBIFF8UnicodeLong($prompt);
// error text
$error = $dataValidation->getError() !== '' ?
$dataValidation->getError() : chr(0);
- $data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($error);
+ $data .= Shared_String::UTF8toBIFF8UnicodeLong($error);
// formula 1
try {
@@ -2931,7 +2933,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$formula1 = $this->_parser->toReversePolish();
$sz1 = strlen($formula1);
- } catch(PHPExcel_Exception $e) {
+ } catch(Exception $e) {
$sz1 = 0;
$formula1 = '';
}
@@ -2942,13 +2944,13 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
try {
$formula2 = $dataValidation->getFormula2();
if ($formula2 === '') {
- throw new PHPExcel_Writer_Exception('No formula2');
+ throw new Writer_Exception('No formula2');
}
$this->_parser->parse($formula2);
$formula2 = $this->_parser->toReversePolish();
$sz2 = strlen($formula2);
- } catch(PHPExcel_Exception $e) {
+ } catch(Exception $e) {
$sz2 = 0;
$formula2 = '';
}
@@ -3000,7 +3002,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$wScalvePLV = $this->_phpSheet->getSheetView()->getZoomScale(); // 2
// The options flags that comprise $grbit
- if($this->_phpSheet->getSheetView()->getView() == PHPExcel_Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT){
+ if($this->_phpSheet->getSheetView()->getView() == Worksheet_SheetView::SHEETVIEW_PAGE_LAYOUT){
$fPageLayoutView = 1;
} else {
$fPageLayoutView = 0;
@@ -3019,42 +3021,42 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
/**
* Write CFRule Record
- * @param PHPExcel_Style_Conditional $conditional
+ * @param PHPExcel\Style_Conditional $conditional
*/
- private function _writeCFRule(PHPExcel_Style_Conditional $conditional){
+ private function _writeCFRule(Style_Conditional $conditional){
$record = 0x01B1; // Record identifier
// $type : Type of the CF
// $operatorType : Comparison operator
- if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION){
+ if($conditional->getConditionType() == Style_Conditional::CONDITION_EXPRESSION){
$type = 0x02;
$operatorType = 0x00;
- } else if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS){
+ } else if($conditional->getConditionType() == Style_Conditional::CONDITION_CELLIS){
$type = 0x01;
switch ($conditional->getOperatorType()){
- case PHPExcel_Style_Conditional::OPERATOR_NONE:
+ case Style_Conditional::OPERATOR_NONE:
$operatorType = 0x00;
break;
- case PHPExcel_Style_Conditional::OPERATOR_EQUAL:
+ case Style_Conditional::OPERATOR_EQUAL:
$operatorType = 0x03;
break;
- case PHPExcel_Style_Conditional::OPERATOR_GREATERTHAN:
+ case Style_Conditional::OPERATOR_GREATERTHAN:
$operatorType = 0x05;
break;
- case PHPExcel_Style_Conditional::OPERATOR_GREATERTHANOREQUAL:
+ case Style_Conditional::OPERATOR_GREATERTHANOREQUAL:
$operatorType = 0x07;
break;
- case PHPExcel_Style_Conditional::OPERATOR_LESSTHAN:
+ case Style_Conditional::OPERATOR_LESSTHAN:
$operatorType = 0x06;
break;
- case PHPExcel_Style_Conditional::OPERATOR_LESSTHANOREQUAL:
+ case Style_Conditional::OPERATOR_LESSTHANOREQUAL:
$operatorType = 0x08;
break;
- case PHPExcel_Style_Conditional::OPERATOR_NOTEQUAL:
+ case Style_Conditional::OPERATOR_NOTEQUAL:
$operatorType = 0x04;
break;
- case PHPExcel_Style_Conditional::OPERATOR_BETWEEN:
+ case Style_Conditional::OPERATOR_BETWEEN:
$operatorType = 0x01;
break;
// not OPERATOR_NOTBETWEEN 0x02
@@ -3070,7 +3072,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$szValue2 = 0x0000;
$operand1 = pack('Cv', 0x1E, $arrConditions[0]);
$operand2 = null;
- } else if($numConditions == 2 && ($conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_BETWEEN)){
+ } else if($numConditions == 2 && ($conditional->getOperatorType() == Style_Conditional::OPERATOR_BETWEEN)){
$szValue1 = ($arrConditions[0] <= 65535 ? 3 : 0x0000);
$szValue2 = ($arrConditions[1] <= 65535 ? 3 : 0x0000);
$operand1 = pack('Cv', 0x1E, $arrConditions[0]);
@@ -3104,14 +3106,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$bFormatProt = 0;
}
// Border
- $bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
- && $conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
- $bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
- && $conditional->getStyle()->getBorders()->getRight()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
- $bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
- && $conditional->getStyle()->getBorders()->getTop()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
- $bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getColor()->getARGB() == PHPExcel_Style_Color::COLOR_BLACK
- && $conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() == PHPExcel_Style_Border::BORDER_NONE ? 1 : 0);
+ $bBorderLeft = ($conditional->getStyle()->getBorders()->getLeft()->getColor()->getARGB() == Style_Color::COLOR_BLACK
+ && $conditional->getStyle()->getBorders()->getLeft()->getBorderStyle() == Style_Border::BORDER_NONE ? 1 : 0);
+ $bBorderRight = ($conditional->getStyle()->getBorders()->getRight()->getColor()->getARGB() == Style_Color::COLOR_BLACK
+ && $conditional->getStyle()->getBorders()->getRight()->getBorderStyle() == Style_Border::BORDER_NONE ? 1 : 0);
+ $bBorderTop = ($conditional->getStyle()->getBorders()->getTop()->getColor()->getARGB() == Style_Color::COLOR_BLACK
+ && $conditional->getStyle()->getBorders()->getTop()->getBorderStyle() == Style_Border::BORDER_NONE ? 1 : 0);
+ $bBorderBottom = ($conditional->getStyle()->getBorders()->getBottom()->getColor()->getARGB() == Style_Color::COLOR_BLACK
+ && $conditional->getStyle()->getBorders()->getBottom()->getBorderStyle() == Style_Border::BORDER_NONE ? 1 : 0);
if($bBorderLeft == 0 || $bBorderRight == 0 || $bBorderTop == 0 || $bBorderBottom == 0){
$bFormatBorder = 1;
} else {
@@ -3187,7 +3189,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$dataBlockFont = pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
$dataBlockFont .= pack('VVVVVVVV', 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
} else {
- $dataBlockFont = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($conditional->getStyle()->getFont()->getName());
+ $dataBlockFont = Shared_String::UTF8toBIFF8UnicodeLong($conditional->getStyle()->getFont()->getName());
}
// Font Size
if($conditional->getStyle()->getFont()->getSize() == null){
@@ -3216,11 +3218,11 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
}
// Underline type
switch ($conditional->getStyle()->getFont()->getUnderline()){
- case PHPExcel_Style_Font::UNDERLINE_NONE : $dataBlockFont .= pack('C', 0x00); $fontUnderline = 0; break;
- case PHPExcel_Style_Font::UNDERLINE_DOUBLE : $dataBlockFont .= pack('C', 0x02); $fontUnderline = 0; break;
- case PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING : $dataBlockFont .= pack('C', 0x22); $fontUnderline = 0; break;
- case PHPExcel_Style_Font::UNDERLINE_SINGLE : $dataBlockFont .= pack('C', 0x01); $fontUnderline = 0; break;
- case PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING : $dataBlockFont .= pack('C', 0x21); $fontUnderline = 0; break;
+ case Style_Font::UNDERLINE_NONE : $dataBlockFont .= pack('C', 0x00); $fontUnderline = 0; break;
+ case Style_Font::UNDERLINE_DOUBLE : $dataBlockFont .= pack('C', 0x02); $fontUnderline = 0; break;
+ case Style_Font::UNDERLINE_DOUBLEACCOUNTING : $dataBlockFont .= pack('C', 0x22); $fontUnderline = 0; break;
+ case Style_Font::UNDERLINE_SINGLE : $dataBlockFont .= pack('C', 0x01); $fontUnderline = 0; break;
+ case Style_Font::UNDERLINE_SINGLEACCOUNTING : $dataBlockFont .= pack('C', 0x21); $fontUnderline = 0; break;
default : $dataBlockFont .= pack('C', 0x00); $fontUnderline = 1; break;
}
// Not used (3)
@@ -3314,12 +3316,12 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$blockAlign = 0;
// Alignment and text break
switch ($conditional->getStyle()->getAlignment()->getHorizontal()){
- case PHPExcel_Style_Alignment::HORIZONTAL_GENERAL : $blockAlign = 0; break;
- case PHPExcel_Style_Alignment::HORIZONTAL_LEFT : $blockAlign = 1; break;
- case PHPExcel_Style_Alignment::HORIZONTAL_RIGHT : $blockAlign = 3; break;
- case PHPExcel_Style_Alignment::HORIZONTAL_CENTER : $blockAlign = 2; break;
- case PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS : $blockAlign = 6; break;
- case PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY : $blockAlign = 5; break;
+ case Style_Alignment::HORIZONTAL_GENERAL : $blockAlign = 0; break;
+ case Style_Alignment::HORIZONTAL_LEFT : $blockAlign = 1; break;
+ case Style_Alignment::HORIZONTAL_RIGHT : $blockAlign = 3; break;
+ case Style_Alignment::HORIZONTAL_CENTER : $blockAlign = 2; break;
+ case Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS : $blockAlign = 6; break;
+ case Style_Alignment::HORIZONTAL_JUSTIFY : $blockAlign = 5; break;
}
if($conditional->getStyle()->getAlignment()->getWrapText() == true){
$blockAlign |= 1 << 3;
@@ -3327,10 +3329,10 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$blockAlign |= 0 << 3;
}
switch ($conditional->getStyle()->getAlignment()->getVertical()){
- case PHPExcel_Style_Alignment::VERTICAL_BOTTOM : $blockAlign = 2 << 4; break;
- case PHPExcel_Style_Alignment::VERTICAL_TOP : $blockAlign = 0 << 4; break;
- case PHPExcel_Style_Alignment::VERTICAL_CENTER : $blockAlign = 1 << 4; break;
- case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY : $blockAlign = 3 << 4; break;
+ case Style_Alignment::VERTICAL_BOTTOM : $blockAlign = 2 << 4; break;
+ case Style_Alignment::VERTICAL_TOP : $blockAlign = 0 << 4; break;
+ case Style_Alignment::VERTICAL_CENTER : $blockAlign = 1 << 4; break;
+ case Style_Alignment::VERTICAL_JUSTIFY : $blockAlign = 3 << 4; break;
}
$blockAlign |= 0 << 7;
@@ -3354,68 +3356,68 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
if($bFormatBorder == 1){
$blockLineStyle = 0;
switch ($conditional->getStyle()->getBorders()->getLeft()->getBorderStyle()){
- case PHPExcel_Style_Border::BORDER_NONE : $blockLineStyle |= 0x00; break;
- case PHPExcel_Style_Border::BORDER_THIN : $blockLineStyle |= 0x01; break;
- case PHPExcel_Style_Border::BORDER_MEDIUM : $blockLineStyle |= 0x02; break;
- case PHPExcel_Style_Border::BORDER_DASHED : $blockLineStyle |= 0x03; break;
- case PHPExcel_Style_Border::BORDER_DOTTED : $blockLineStyle |= 0x04; break;
- case PHPExcel_Style_Border::BORDER_THICK : $blockLineStyle |= 0x05; break;
- case PHPExcel_Style_Border::BORDER_DOUBLE : $blockLineStyle |= 0x06; break;
- case PHPExcel_Style_Border::BORDER_HAIR : $blockLineStyle |= 0x07; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHED : $blockLineStyle |= 0x08; break;
- case PHPExcel_Style_Border::BORDER_DASHDOT : $blockLineStyle |= 0x09; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT : $blockLineStyle |= 0x0A; break;
- case PHPExcel_Style_Border::BORDER_DASHDOTDOT : $blockLineStyle |= 0x0B; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockLineStyle |= 0x0C; break;
- case PHPExcel_Style_Border::BORDER_SLANTDASHDOT : $blockLineStyle |= 0x0D; break;
+ case Style_Border::BORDER_NONE : $blockLineStyle |= 0x00; break;
+ case Style_Border::BORDER_THIN : $blockLineStyle |= 0x01; break;
+ case Style_Border::BORDER_MEDIUM : $blockLineStyle |= 0x02; break;
+ case Style_Border::BORDER_DASHED : $blockLineStyle |= 0x03; break;
+ case Style_Border::BORDER_DOTTED : $blockLineStyle |= 0x04; break;
+ case Style_Border::BORDER_THICK : $blockLineStyle |= 0x05; break;
+ case Style_Border::BORDER_DOUBLE : $blockLineStyle |= 0x06; break;
+ case Style_Border::BORDER_HAIR : $blockLineStyle |= 0x07; break;
+ case Style_Border::BORDER_MEDIUMDASHED : $blockLineStyle |= 0x08; break;
+ case Style_Border::BORDER_DASHDOT : $blockLineStyle |= 0x09; break;
+ case Style_Border::BORDER_MEDIUMDASHDOT : $blockLineStyle |= 0x0A; break;
+ case Style_Border::BORDER_DASHDOTDOT : $blockLineStyle |= 0x0B; break;
+ case Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockLineStyle |= 0x0C; break;
+ case Style_Border::BORDER_SLANTDASHDOT : $blockLineStyle |= 0x0D; break;
}
switch ($conditional->getStyle()->getBorders()->getRight()->getBorderStyle()){
- case PHPExcel_Style_Border::BORDER_NONE : $blockLineStyle |= 0x00 << 4; break;
- case PHPExcel_Style_Border::BORDER_THIN : $blockLineStyle |= 0x01 << 4; break;
- case PHPExcel_Style_Border::BORDER_MEDIUM : $blockLineStyle |= 0x02 << 4; break;
- case PHPExcel_Style_Border::BORDER_DASHED : $blockLineStyle |= 0x03 << 4; break;
- case PHPExcel_Style_Border::BORDER_DOTTED : $blockLineStyle |= 0x04 << 4; break;
- case PHPExcel_Style_Border::BORDER_THICK : $blockLineStyle |= 0x05 << 4; break;
- case PHPExcel_Style_Border::BORDER_DOUBLE : $blockLineStyle |= 0x06 << 4; break;
- case PHPExcel_Style_Border::BORDER_HAIR : $blockLineStyle |= 0x07 << 4; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHED : $blockLineStyle |= 0x08 << 4; break;
- case PHPExcel_Style_Border::BORDER_DASHDOT : $blockLineStyle |= 0x09 << 4; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT : $blockLineStyle |= 0x0A << 4; break;
- case PHPExcel_Style_Border::BORDER_DASHDOTDOT : $blockLineStyle |= 0x0B << 4; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockLineStyle |= 0x0C << 4; break;
- case PHPExcel_Style_Border::BORDER_SLANTDASHDOT : $blockLineStyle |= 0x0D << 4; break;
+ case Style_Border::BORDER_NONE : $blockLineStyle |= 0x00 << 4; break;
+ case Style_Border::BORDER_THIN : $blockLineStyle |= 0x01 << 4; break;
+ case Style_Border::BORDER_MEDIUM : $blockLineStyle |= 0x02 << 4; break;
+ case Style_Border::BORDER_DASHED : $blockLineStyle |= 0x03 << 4; break;
+ case Style_Border::BORDER_DOTTED : $blockLineStyle |= 0x04 << 4; break;
+ case Style_Border::BORDER_THICK : $blockLineStyle |= 0x05 << 4; break;
+ case Style_Border::BORDER_DOUBLE : $blockLineStyle |= 0x06 << 4; break;
+ case Style_Border::BORDER_HAIR : $blockLineStyle |= 0x07 << 4; break;
+ case Style_Border::BORDER_MEDIUMDASHED : $blockLineStyle |= 0x08 << 4; break;
+ case Style_Border::BORDER_DASHDOT : $blockLineStyle |= 0x09 << 4; break;
+ case Style_Border::BORDER_MEDIUMDASHDOT : $blockLineStyle |= 0x0A << 4; break;
+ case Style_Border::BORDER_DASHDOTDOT : $blockLineStyle |= 0x0B << 4; break;
+ case Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockLineStyle |= 0x0C << 4; break;
+ case Style_Border::BORDER_SLANTDASHDOT : $blockLineStyle |= 0x0D << 4; break;
}
switch ($conditional->getStyle()->getBorders()->getTop()->getBorderStyle()){
- case PHPExcel_Style_Border::BORDER_NONE : $blockLineStyle |= 0x00 << 8; break;
- case PHPExcel_Style_Border::BORDER_THIN : $blockLineStyle |= 0x01 << 8; break;
- case PHPExcel_Style_Border::BORDER_MEDIUM : $blockLineStyle |= 0x02 << 8; break;
- case PHPExcel_Style_Border::BORDER_DASHED : $blockLineStyle |= 0x03 << 8; break;
- case PHPExcel_Style_Border::BORDER_DOTTED : $blockLineStyle |= 0x04 << 8; break;
- case PHPExcel_Style_Border::BORDER_THICK : $blockLineStyle |= 0x05 << 8; break;
- case PHPExcel_Style_Border::BORDER_DOUBLE : $blockLineStyle |= 0x06 << 8; break;
- case PHPExcel_Style_Border::BORDER_HAIR : $blockLineStyle |= 0x07 << 8; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHED : $blockLineStyle |= 0x08 << 8; break;
- case PHPExcel_Style_Border::BORDER_DASHDOT : $blockLineStyle |= 0x09 << 8; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT : $blockLineStyle |= 0x0A << 8; break;
- case PHPExcel_Style_Border::BORDER_DASHDOTDOT : $blockLineStyle |= 0x0B << 8; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockLineStyle |= 0x0C << 8; break;
- case PHPExcel_Style_Border::BORDER_SLANTDASHDOT : $blockLineStyle |= 0x0D << 8; break;
+ case Style_Border::BORDER_NONE : $blockLineStyle |= 0x00 << 8; break;
+ case Style_Border::BORDER_THIN : $blockLineStyle |= 0x01 << 8; break;
+ case Style_Border::BORDER_MEDIUM : $blockLineStyle |= 0x02 << 8; break;
+ case Style_Border::BORDER_DASHED : $blockLineStyle |= 0x03 << 8; break;
+ case Style_Border::BORDER_DOTTED : $blockLineStyle |= 0x04 << 8; break;
+ case Style_Border::BORDER_THICK : $blockLineStyle |= 0x05 << 8; break;
+ case Style_Border::BORDER_DOUBLE : $blockLineStyle |= 0x06 << 8; break;
+ case Style_Border::BORDER_HAIR : $blockLineStyle |= 0x07 << 8; break;
+ case Style_Border::BORDER_MEDIUMDASHED : $blockLineStyle |= 0x08 << 8; break;
+ case Style_Border::BORDER_DASHDOT : $blockLineStyle |= 0x09 << 8; break;
+ case Style_Border::BORDER_MEDIUMDASHDOT : $blockLineStyle |= 0x0A << 8; break;
+ case Style_Border::BORDER_DASHDOTDOT : $blockLineStyle |= 0x0B << 8; break;
+ case Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockLineStyle |= 0x0C << 8; break;
+ case Style_Border::BORDER_SLANTDASHDOT : $blockLineStyle |= 0x0D << 8; break;
}
switch ($conditional->getStyle()->getBorders()->getBottom()->getBorderStyle()){
- case PHPExcel_Style_Border::BORDER_NONE : $blockLineStyle |= 0x00 << 12; break;
- case PHPExcel_Style_Border::BORDER_THIN : $blockLineStyle |= 0x01 << 12; break;
- case PHPExcel_Style_Border::BORDER_MEDIUM : $blockLineStyle |= 0x02 << 12; break;
- case PHPExcel_Style_Border::BORDER_DASHED : $blockLineStyle |= 0x03 << 12; break;
- case PHPExcel_Style_Border::BORDER_DOTTED : $blockLineStyle |= 0x04 << 12; break;
- case PHPExcel_Style_Border::BORDER_THICK : $blockLineStyle |= 0x05 << 12; break;
- case PHPExcel_Style_Border::BORDER_DOUBLE : $blockLineStyle |= 0x06 << 12; break;
- case PHPExcel_Style_Border::BORDER_HAIR : $blockLineStyle |= 0x07 << 12; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHED : $blockLineStyle |= 0x08 << 12; break;
- case PHPExcel_Style_Border::BORDER_DASHDOT : $blockLineStyle |= 0x09 << 12; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT : $blockLineStyle |= 0x0A << 12; break;
- case PHPExcel_Style_Border::BORDER_DASHDOTDOT : $blockLineStyle |= 0x0B << 12; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockLineStyle |= 0x0C << 12; break;
- case PHPExcel_Style_Border::BORDER_SLANTDASHDOT : $blockLineStyle |= 0x0D << 12; break;
+ case Style_Border::BORDER_NONE : $blockLineStyle |= 0x00 << 12; break;
+ case Style_Border::BORDER_THIN : $blockLineStyle |= 0x01 << 12; break;
+ case Style_Border::BORDER_MEDIUM : $blockLineStyle |= 0x02 << 12; break;
+ case Style_Border::BORDER_DASHED : $blockLineStyle |= 0x03 << 12; break;
+ case Style_Border::BORDER_DOTTED : $blockLineStyle |= 0x04 << 12; break;
+ case Style_Border::BORDER_THICK : $blockLineStyle |= 0x05 << 12; break;
+ case Style_Border::BORDER_DOUBLE : $blockLineStyle |= 0x06 << 12; break;
+ case Style_Border::BORDER_HAIR : $blockLineStyle |= 0x07 << 12; break;
+ case Style_Border::BORDER_MEDIUMDASHED : $blockLineStyle |= 0x08 << 12; break;
+ case Style_Border::BORDER_DASHDOT : $blockLineStyle |= 0x09 << 12; break;
+ case Style_Border::BORDER_MEDIUMDASHDOT : $blockLineStyle |= 0x0A << 12; break;
+ case Style_Border::BORDER_DASHDOTDOT : $blockLineStyle |= 0x0B << 12; break;
+ case Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockLineStyle |= 0x0C << 12; break;
+ case Style_Border::BORDER_SLANTDASHDOT : $blockLineStyle |= 0x0D << 12; break;
}
//@todo _writeCFRule() => $blockLineStyle => Index Color for left line
//@todo _writeCFRule() => $blockLineStyle => Index Color for right line
@@ -3426,20 +3428,20 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
//@todo _writeCFRule() => $blockColor => Index Color for bottom line
//@todo _writeCFRule() => $blockColor => Index Color for diagonal line
switch ($conditional->getStyle()->getBorders()->getDiagonal()->getBorderStyle()){
- case PHPExcel_Style_Border::BORDER_NONE : $blockColor |= 0x00 << 21; break;
- case PHPExcel_Style_Border::BORDER_THIN : $blockColor |= 0x01 << 21; break;
- case PHPExcel_Style_Border::BORDER_MEDIUM : $blockColor |= 0x02 << 21; break;
- case PHPExcel_Style_Border::BORDER_DASHED : $blockColor |= 0x03 << 21; break;
- case PHPExcel_Style_Border::BORDER_DOTTED : $blockColor |= 0x04 << 21; break;
- case PHPExcel_Style_Border::BORDER_THICK : $blockColor |= 0x05 << 21; break;
- case PHPExcel_Style_Border::BORDER_DOUBLE : $blockColor |= 0x06 << 21; break;
- case PHPExcel_Style_Border::BORDER_HAIR : $blockColor |= 0x07 << 21; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHED : $blockColor |= 0x08 << 21; break;
- case PHPExcel_Style_Border::BORDER_DASHDOT : $blockColor |= 0x09 << 21; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT : $blockColor |= 0x0A << 21; break;
- case PHPExcel_Style_Border::BORDER_DASHDOTDOT : $blockColor |= 0x0B << 21; break;
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockColor |= 0x0C << 21; break;
- case PHPExcel_Style_Border::BORDER_SLANTDASHDOT : $blockColor |= 0x0D << 21; break;
+ case Style_Border::BORDER_NONE : $blockColor |= 0x00 << 21; break;
+ case Style_Border::BORDER_THIN : $blockColor |= 0x01 << 21; break;
+ case Style_Border::BORDER_MEDIUM : $blockColor |= 0x02 << 21; break;
+ case Style_Border::BORDER_DASHED : $blockColor |= 0x03 << 21; break;
+ case Style_Border::BORDER_DOTTED : $blockColor |= 0x04 << 21; break;
+ case Style_Border::BORDER_THICK : $blockColor |= 0x05 << 21; break;
+ case Style_Border::BORDER_DOUBLE : $blockColor |= 0x06 << 21; break;
+ case Style_Border::BORDER_HAIR : $blockColor |= 0x07 << 21; break;
+ case Style_Border::BORDER_MEDIUMDASHED : $blockColor |= 0x08 << 21; break;
+ case Style_Border::BORDER_DASHDOT : $blockColor |= 0x09 << 21; break;
+ case Style_Border::BORDER_MEDIUMDASHDOT : $blockColor |= 0x0A << 21; break;
+ case Style_Border::BORDER_DASHDOTDOT : $blockColor |= 0x0B << 21; break;
+ case Style_Border::BORDER_MEDIUMDASHDOTDOT : $blockColor |= 0x0C << 21; break;
+ case Style_Border::BORDER_SLANTDASHDOT : $blockColor |= 0x0D << 21; break;
}
$dataBlockBorder = pack('vv', $blockLineStyle, $blockColor);
}
@@ -3447,27 +3449,27 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Fill Patern Style
$blockFillPatternStyle = 0;
switch ($conditional->getStyle()->getFill()->getFillType()){
- case PHPExcel_Style_Fill::FILL_NONE : $blockFillPatternStyle = 0x00; break;
- case PHPExcel_Style_Fill::FILL_SOLID : $blockFillPatternStyle = 0x01; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY : $blockFillPatternStyle = 0x02; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY : $blockFillPatternStyle = 0x03; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY : $blockFillPatternStyle = 0x04; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL : $blockFillPatternStyle = 0x05; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL : $blockFillPatternStyle = 0x06; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN : $blockFillPatternStyle = 0x07; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_DARKUP : $blockFillPatternStyle = 0x08; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID : $blockFillPatternStyle = 0x09; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS : $blockFillPatternStyle = 0x0A; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL : $blockFillPatternStyle = 0x0B; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL : $blockFillPatternStyle = 0x0C; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN : $blockFillPatternStyle = 0x0D; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP : $blockFillPatternStyle = 0x0E; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID : $blockFillPatternStyle = 0x0F; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS : $blockFillPatternStyle = 0x10; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_GRAY125 : $blockFillPatternStyle = 0x11; break;
- case PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625 : $blockFillPatternStyle = 0x12; break;
- case PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR : $blockFillPatternStyle = 0x00; break; // does not exist in BIFF8
- case PHPExcel_Style_Fill::FILL_GRADIENT_PATH : $blockFillPatternStyle = 0x00; break; // does not exist in BIFF8
+ case Style_Fill::FILL_NONE : $blockFillPatternStyle = 0x00; break;
+ case Style_Fill::FILL_SOLID : $blockFillPatternStyle = 0x01; break;
+ case Style_Fill::FILL_PATTERN_MEDIUMGRAY : $blockFillPatternStyle = 0x02; break;
+ case Style_Fill::FILL_PATTERN_DARKGRAY : $blockFillPatternStyle = 0x03; break;
+ case Style_Fill::FILL_PATTERN_LIGHTGRAY : $blockFillPatternStyle = 0x04; break;
+ case Style_Fill::FILL_PATTERN_DARKHORIZONTAL : $blockFillPatternStyle = 0x05; break;
+ case Style_Fill::FILL_PATTERN_DARKVERTICAL : $blockFillPatternStyle = 0x06; break;
+ case Style_Fill::FILL_PATTERN_DARKDOWN : $blockFillPatternStyle = 0x07; break;
+ case Style_Fill::FILL_PATTERN_DARKUP : $blockFillPatternStyle = 0x08; break;
+ case Style_Fill::FILL_PATTERN_DARKGRID : $blockFillPatternStyle = 0x09; break;
+ case Style_Fill::FILL_PATTERN_DARKTRELLIS : $blockFillPatternStyle = 0x0A; break;
+ case Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL : $blockFillPatternStyle = 0x0B; break;
+ case Style_Fill::FILL_PATTERN_LIGHTVERTICAL : $blockFillPatternStyle = 0x0C; break;
+ case Style_Fill::FILL_PATTERN_LIGHTDOWN : $blockFillPatternStyle = 0x0D; break;
+ case Style_Fill::FILL_PATTERN_LIGHTUP : $blockFillPatternStyle = 0x0E; break;
+ case Style_Fill::FILL_PATTERN_LIGHTGRID : $blockFillPatternStyle = 0x0F; break;
+ case Style_Fill::FILL_PATTERN_LIGHTTRELLIS : $blockFillPatternStyle = 0x10; break;
+ case Style_Fill::FILL_PATTERN_GRAY125 : $blockFillPatternStyle = 0x11; break;
+ case Style_Fill::FILL_PATTERN_GRAY0625 : $blockFillPatternStyle = 0x12; break;
+ case Style_Fill::FILL_GRADIENT_LINEAR : $blockFillPatternStyle = 0x00; break; // does not exist in BIFF8
+ case Style_Fill::FILL_GRADIENT_PATH : $blockFillPatternStyle = 0x00; break; // does not exist in BIFF8
default : $blockFillPatternStyle = 0x00; break;
}
// Color
@@ -3595,10 +3597,10 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
}
if($bFormatProt == 1){
$dataBlockProtection = 0;
- if($conditional->getStyle()->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED){
+ if($conditional->getStyle()->getProtection()->getLocked() == Style_Protection::PROTECTION_PROTECTED){
$dataBlockProtection = 1;
}
- if($conditional->getStyle()->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED){
+ if($conditional->getStyle()->getProtection()->getHidden() == Style_Protection::PROTECTION_PROTECTED){
$dataBlockProtection = 1 << 1;
}
}
@@ -3643,15 +3645,15 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$arrConditional = array();
foreach ($this->_phpSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
foreach ($conditionalStyles as $conditional) {
- if($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
- || $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS){
+ if($conditional->getConditionType() == Style_Conditional::CONDITION_EXPRESSION
+ || $conditional->getConditionType() == Style_Conditional::CONDITION_CELLIS){
if(!in_array($conditional->getHashCode(), $arrConditional)){
$arrConditional[] = $conditional->getHashCode();
}
// Cells
- $arrCoord = PHPExcel_Cell::coordinateFromString($cellCoordinate);
+ $arrCoord = Cell::coordinateFromString($cellCoordinate);
if(!is_numeric($arrCoord[0])){
- $arrCoord[0] = PHPExcel_Cell::columnIndexFromString($arrCoord[0]);
+ $arrCoord[0] = Cell::columnIndexFromString($arrCoord[0]);
}
if(is_null($numColumnMin) || ($numColumnMin > $arrCoord[0])){
$numColumnMin = $arrCoord[0];
diff --git a/Classes/PHPExcel/Writer/Excel5/Xf.php b/Classes/PHPExcel/Writer/Excel5/Xf.php
index 241b5f8..4a1bdfa 100644
--- a/Classes/PHPExcel/Writer/Excel5/Xf.php
+++ b/Classes/PHPExcel/Writer/Excel5/Xf.php
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @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##
@@ -61,14 +61,16 @@
// */
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Excel5_Xf
+ * PHPExcel\Writer_Excel5_Xf
*
* @category PHPExcel
- * @package PHPExcel_Writer_Excel5
+ * @package PHPExcel\Writer_Excel5
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Excel5_Xf
+class Writer_Excel5_Xf
{
/**
* Style XF or a cell XF ?
@@ -135,9 +137,9 @@ class PHPExcel_Writer_Excel5_Xf
* Constructor
*
* @access public
- * @param PHPExcel_Style The XF format
+ * @param PHPExcel\Style The XF format
*/
- public function __construct(PHPExcel_Style $style = null)
+ public function __construct(Style $style = null)
{
$this->_isStyleXf = false;
$this->_fontIndex = 0;
@@ -236,10 +238,10 @@ class PHPExcel_Writer_Excel5_Xf
$border1 |= $this->_right_color << 23;
$diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
- $diag_tl_to_rb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
- || $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_DOWN;
- $diag_tr_to_lb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
- || $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_UP;
+ $diag_tl_to_rb = $diagonalDirection == Style_Borders::DIAGONAL_BOTH
+ || $diagonalDirection == Style_Borders::DIAGONAL_DOWN;
+ $diag_tr_to_lb = $diagonalDirection == Style_Borders::DIAGONAL_BOTH
+ || $diagonalDirection == Style_Borders::DIAGONAL_UP;
$border1 |= $diag_tl_to_rb << 30;
$border1 |= $diag_tr_to_lb << 31;
@@ -381,20 +383,20 @@ class PHPExcel_Writer_Excel5_Xf
* @static array of int
*
*/
- private static $_mapBorderStyle = array ( PHPExcel_Style_Border::BORDER_NONE => 0x00,
- PHPExcel_Style_Border::BORDER_THIN => 0x01,
- PHPExcel_Style_Border::BORDER_MEDIUM => 0x02,
- PHPExcel_Style_Border::BORDER_DASHED => 0x03,
- PHPExcel_Style_Border::BORDER_DOTTED => 0x04,
- PHPExcel_Style_Border::BORDER_THICK => 0x05,
- PHPExcel_Style_Border::BORDER_DOUBLE => 0x06,
- PHPExcel_Style_Border::BORDER_HAIR => 0x07,
- PHPExcel_Style_Border::BORDER_MEDIUMDASHED => 0x08,
- PHPExcel_Style_Border::BORDER_DASHDOT => 0x09,
- PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT => 0x0A,
- PHPExcel_Style_Border::BORDER_DASHDOTDOT => 0x0B,
- PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT => 0x0C,
- PHPExcel_Style_Border::BORDER_SLANTDASHDOT => 0x0D,
+ private static $_mapBorderStyle = array ( Style_Border::BORDER_NONE => 0x00,
+ Style_Border::BORDER_THIN => 0x01,
+ Style_Border::BORDER_MEDIUM => 0x02,
+ Style_Border::BORDER_DASHED => 0x03,
+ Style_Border::BORDER_DOTTED => 0x04,
+ Style_Border::BORDER_THICK => 0x05,
+ Style_Border::BORDER_DOUBLE => 0x06,
+ Style_Border::BORDER_HAIR => 0x07,
+ Style_Border::BORDER_MEDIUMDASHED => 0x08,
+ Style_Border::BORDER_DASHDOT => 0x09,
+ Style_Border::BORDER_MEDIUMDASHDOT => 0x0A,
+ Style_Border::BORDER_DASHDOTDOT => 0x0B,
+ Style_Border::BORDER_MEDIUMDASHDOTDOT => 0x0C,
+ Style_Border::BORDER_SLANTDASHDOT => 0x0D,
);
/**
@@ -414,27 +416,27 @@ class PHPExcel_Writer_Excel5_Xf
* @static array of int
*
*/
- private static $_mapFillType = array( PHPExcel_Style_Fill::FILL_NONE => 0x00,
- PHPExcel_Style_Fill::FILL_SOLID => 0x01,
- PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY => 0x02,
- PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY => 0x03,
- PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY => 0x04,
- PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL => 0x05,
- PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL => 0x06,
- PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN => 0x07,
- PHPExcel_Style_Fill::FILL_PATTERN_DARKUP => 0x08,
- PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID => 0x09,
- PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS => 0x0A,
- PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL => 0x0B,
- PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL => 0x0C,
- PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN => 0x0D,
- PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP => 0x0E,
- PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID => 0x0F,
- PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS => 0x10,
- PHPExcel_Style_Fill::FILL_PATTERN_GRAY125 => 0x11,
- PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625 => 0x12,
- PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8
- PHPExcel_Style_Fill::FILL_GRADIENT_PATH => 0x00, // does not exist in BIFF8
+ private static $_mapFillType = array( Style_Fill::FILL_NONE => 0x00,
+ Style_Fill::FILL_SOLID => 0x01,
+ Style_Fill::FILL_PATTERN_MEDIUMGRAY => 0x02,
+ Style_Fill::FILL_PATTERN_DARKGRAY => 0x03,
+ Style_Fill::FILL_PATTERN_LIGHTGRAY => 0x04,
+ Style_Fill::FILL_PATTERN_DARKHORIZONTAL => 0x05,
+ Style_Fill::FILL_PATTERN_DARKVERTICAL => 0x06,
+ Style_Fill::FILL_PATTERN_DARKDOWN => 0x07,
+ Style_Fill::FILL_PATTERN_DARKUP => 0x08,
+ Style_Fill::FILL_PATTERN_DARKGRID => 0x09,
+ Style_Fill::FILL_PATTERN_DARKTRELLIS => 0x0A,
+ Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL => 0x0B,
+ Style_Fill::FILL_PATTERN_LIGHTVERTICAL => 0x0C,
+ Style_Fill::FILL_PATTERN_LIGHTDOWN => 0x0D,
+ Style_Fill::FILL_PATTERN_LIGHTUP => 0x0E,
+ Style_Fill::FILL_PATTERN_LIGHTGRID => 0x0F,
+ Style_Fill::FILL_PATTERN_LIGHTTRELLIS => 0x10,
+ Style_Fill::FILL_PATTERN_GRAY125 => 0x11,
+ Style_Fill::FILL_PATTERN_GRAY0625 => 0x12,
+ Style_Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8
+ Style_Fill::FILL_GRADIENT_PATH => 0x00, // does not exist in BIFF8
);
/**
* Map fill type
@@ -453,12 +455,12 @@ class PHPExcel_Writer_Excel5_Xf
* @static array of int
*
*/
- private static $_mapHAlign = array( PHPExcel_Style_Alignment::HORIZONTAL_GENERAL => 0,
- PHPExcel_Style_Alignment::HORIZONTAL_LEFT => 1,
- PHPExcel_Style_Alignment::HORIZONTAL_CENTER => 2,
- PHPExcel_Style_Alignment::HORIZONTAL_RIGHT => 3,
- PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY => 5,
- PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS => 6,
+ private static $_mapHAlign = array( Style_Alignment::HORIZONTAL_GENERAL => 0,
+ Style_Alignment::HORIZONTAL_LEFT => 1,
+ Style_Alignment::HORIZONTAL_CENTER => 2,
+ Style_Alignment::HORIZONTAL_RIGHT => 3,
+ Style_Alignment::HORIZONTAL_JUSTIFY => 5,
+ Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS => 6,
);
/**
* Map to BIFF2-BIFF8 codes for horizontal alignment
@@ -478,10 +480,10 @@ class PHPExcel_Writer_Excel5_Xf
* @static array of int
*
*/
- private static $_mapVAlign = array( PHPExcel_Style_Alignment::VERTICAL_TOP => 0,
- PHPExcel_Style_Alignment::VERTICAL_CENTER => 1,
- PHPExcel_Style_Alignment::VERTICAL_BOTTOM => 2,
- PHPExcel_Style_Alignment::VERTICAL_JUSTIFY => 3,
+ private static $_mapVAlign = array( Style_Alignment::VERTICAL_TOP => 0,
+ Style_Alignment::VERTICAL_CENTER => 1,
+ Style_Alignment::VERTICAL_BOTTOM => 2,
+ Style_Alignment::VERTICAL_JUSTIFY => 3,
);
/**
* Map to BIFF2-BIFF8 codes for vertical alignment
@@ -521,9 +523,9 @@ class PHPExcel_Writer_Excel5_Xf
*/
private static function _mapLocked($locked) {
switch ($locked) {
- case PHPExcel_Style_Protection::PROTECTION_INHERIT: return 1;
- case PHPExcel_Style_Protection::PROTECTION_PROTECTED: return 1;
- case PHPExcel_Style_Protection::PROTECTION_UNPROTECTED: return 0;
+ case Style_Protection::PROTECTION_INHERIT: return 1;
+ case Style_Protection::PROTECTION_PROTECTED: return 1;
+ case Style_Protection::PROTECTION_UNPROTECTED: return 0;
default: return 1;
}
}
@@ -536,9 +538,9 @@ class PHPExcel_Writer_Excel5_Xf
*/
private static function _mapHidden($hidden) {
switch ($hidden) {
- case PHPExcel_Style_Protection::PROTECTION_INHERIT: return 0;
- case PHPExcel_Style_Protection::PROTECTION_PROTECTED: return 1;
- case PHPExcel_Style_Protection::PROTECTION_UNPROTECTED: return 0;
+ case Style_Protection::PROTECTION_INHERIT: return 0;
+ case Style_Protection::PROTECTION_PROTECTED: return 1;
+ case Style_Protection::PROTECTION_UNPROTECTED: return 0;
default: return 0;
}
}
diff --git a/Classes/PHPExcel/Writer/Exception.php b/Classes/PHPExcel/Writer/Exception.php
index b5d437d..d0e0adf 100644
--- a/Classes/PHPExcel/Writer/Exception.php
+++ b/Classes/PHPExcel/Writer/Exception.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer
+ * @package PHPExcel\Writer
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_Exception
+ * PHPExcel\Writer_Exception
*
* @category PHPExcel
- * @package PHPExcel_Writer
+ * @package PHPExcel\Writer
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_Exception extends PHPExcel_Exception {
+class Writer_Exception extends Exception {
/**
* Error handler callback
*
diff --git a/Classes/PHPExcel/Writer/HTML.php b/Classes/PHPExcel/Writer/HTML.php
index 3affa7e..55a8591 100644
--- a/Classes/PHPExcel/Writer/HTML.php
+++ b/Classes/PHPExcel/Writer/HTML.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_HTML
+ * @package PHPExcel\Writer_HTML
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_HTML
+ * PHPExcel\Writer_HTML
*
* @category PHPExcel
- * @package PHPExcel_Writer_HTML
+ * @package PHPExcel\Writer_HTML
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter {
+class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
/**
* PHPExcel object
*
@@ -86,7 +88,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
/**
* Default font
*
- * @var PHPExcel_Style_Font
+ * @var PHPExcel\Style_Font
*/
private $_defaultFont;
@@ -133,11 +135,11 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
private $_generateSheetNavigationBlock = true;
/**
- * Create a new PHPExcel_Writer_HTML
+ * Create a new PHPExcel\Writer_HTML
*
- * @param PHPExcel $phpExcel PHPExcel object
+ * @param PHPExcel\Workbook $phpExcel PHPExcel object
*/
- public function __construct(PHPExcel $phpExcel) {
+ public function __construct(Workbook $phpExcel) {
$this->_phpExcel = $phpExcel;
$this->_defaultFont = $this->_phpExcel->getDefaultStyle()->getFont();
}
@@ -146,16 +148,16 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
* Save PHPExcel to file
*
* @param string $pFilename
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function save($pFilename = null) {
// garbage collect
$this->_phpExcel->garbageCollect();
- $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 = Calculation::getInstance($this->_phpExcel)->getDebugLog()->getWriteDebugLog();
+ Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog(FALSE);
+ $saveArrayReturnType = Calculation::getArrayReturnType();
+ Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
// Build CSS
$this->buildCSS(!$this->_useInlineCss);
@@ -163,7 +165,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// Open file
$fileHandle = fopen($pFilename, 'wb+');
if ($fileHandle === false) {
- throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing.");
+ throw new Writer_Exception("Could not open file $pFilename for writing.");
}
// Write headers
@@ -183,8 +185,8 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// Close file
fclose($fileHandle);
- PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
- PHPExcel_Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+ Calculation::setArrayReturnType($saveArrayReturnType);
+ Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
}
/**
@@ -195,10 +197,10 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
*/
private function _mapVAlign($vAlign) {
switch ($vAlign) {
- case PHPExcel_Style_Alignment::VERTICAL_BOTTOM: return 'bottom';
- case PHPExcel_Style_Alignment::VERTICAL_TOP: return 'top';
- case PHPExcel_Style_Alignment::VERTICAL_CENTER:
- case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY: return 'middle';
+ case Style_Alignment::VERTICAL_BOTTOM: return 'bottom';
+ case Style_Alignment::VERTICAL_TOP: return 'top';
+ case Style_Alignment::VERTICAL_CENTER:
+ case Style_Alignment::VERTICAL_JUSTIFY: return 'middle';
default: return 'baseline';
}
}
@@ -211,12 +213,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
*/
private function _mapHAlign($hAlign) {
switch ($hAlign) {
- case PHPExcel_Style_Alignment::HORIZONTAL_GENERAL: return false;
- case PHPExcel_Style_Alignment::HORIZONTAL_LEFT: return 'left';
- case PHPExcel_Style_Alignment::HORIZONTAL_RIGHT: return 'right';
- case PHPExcel_Style_Alignment::HORIZONTAL_CENTER:
- case PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS: return 'center';
- case PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY: return 'justify';
+ case Style_Alignment::HORIZONTAL_GENERAL: return false;
+ case Style_Alignment::HORIZONTAL_LEFT: return 'left';
+ case Style_Alignment::HORIZONTAL_RIGHT: return 'right';
+ case Style_Alignment::HORIZONTAL_CENTER:
+ case Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS: return 'center';
+ case Style_Alignment::HORIZONTAL_JUSTIFY: return 'justify';
default: return false;
}
}
@@ -229,20 +231,20 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
*/
private function _mapBorderStyle($borderStyle) {
switch ($borderStyle) {
- case PHPExcel_Style_Border::BORDER_NONE: return 'none';
- case PHPExcel_Style_Border::BORDER_DASHDOT: return '1px dashed';
- case PHPExcel_Style_Border::BORDER_DASHDOTDOT: return '1px dotted';
- case PHPExcel_Style_Border::BORDER_DASHED: return '1px dashed';
- case PHPExcel_Style_Border::BORDER_DOTTED: return '1px dotted';
- case PHPExcel_Style_Border::BORDER_DOUBLE: return '3px double';
- case PHPExcel_Style_Border::BORDER_HAIR: return '1px solid';
- case PHPExcel_Style_Border::BORDER_MEDIUM: return '2px solid';
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT: return '2px dashed';
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT: return '2px dotted';
- case PHPExcel_Style_Border::BORDER_MEDIUMDASHED: return '2px dashed';
- case PHPExcel_Style_Border::BORDER_SLANTDASHDOT: return '2px dashed';
- case PHPExcel_Style_Border::BORDER_THICK: return '3px solid';
- case PHPExcel_Style_Border::BORDER_THIN: return '1px solid';
+ case Style_Border::BORDER_NONE: return 'none';
+ case Style_Border::BORDER_DASHDOT: return '1px dashed';
+ case Style_Border::BORDER_DASHDOTDOT: return '1px dotted';
+ case Style_Border::BORDER_DASHED: return '1px dashed';
+ case Style_Border::BORDER_DOTTED: return '1px dotted';
+ case Style_Border::BORDER_DOUBLE: return '3px double';
+ case Style_Border::BORDER_HAIR: return '1px solid';
+ case Style_Border::BORDER_MEDIUM: return '2px solid';
+ case Style_Border::BORDER_MEDIUMDASHDOT: return '2px dashed';
+ case Style_Border::BORDER_MEDIUMDASHDOTDOT: return '2px dotted';
+ case Style_Border::BORDER_MEDIUMDASHED: return '2px dashed';
+ case Style_Border::BORDER_SLANTDASHDOT: return '2px dashed';
+ case Style_Border::BORDER_THICK: return '3px solid';
+ case Style_Border::BORDER_THIN: return '1px solid';
default: return '1px solid'; // map others to thin
}
}
@@ -260,7 +262,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
* Set sheet index
*
* @param int $pValue Sheet index
- * @return PHPExcel_Writer_HTML
+ * @return PHPExcel\Writer_HTML
*/
public function setSheetIndex($pValue = 0) {
$this->_sheetIndex = $pValue;
@@ -280,7 +282,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
* Set sheet index
*
* @param boolean $pValue Flag indicating whether the sheet navigation block should be generated or not
- * @return PHPExcel_Writer_HTML
+ * @return PHPExcel\Writer_HTML
*/
public function setGenerateSheetNavigationBlock($pValue = true) {
$this->_generateSheetNavigationBlock = (bool) $pValue;
@@ -300,12 +302,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
*
* @param boolean $pIncludeStyles Include styles?
* @return string
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function generateHTMLHeader($pIncludeStyles = false) {
// PHPExcel object known?
if (is_null($this->_phpExcel)) {
- throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+ throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
}
// Construct HTML
@@ -351,12 +353,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
* Generate sheet data
*
* @return string
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function generateSheetData() {
// PHPExcel object known?
if (is_null($this->_phpExcel)) {
- throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+ throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
}
// Ensure that Spans have been calculated?
@@ -383,10 +385,10 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// Get worksheet dimension
$dimension = explode(':', $sheet->calculateWorksheetDimension());
- $dimension[0] = PHPExcel_Cell::coordinateFromString($dimension[0]);
- $dimension[0][0] = PHPExcel_Cell::columnIndexFromString($dimension[0][0]) - 1;
- $dimension[1] = PHPExcel_Cell::coordinateFromString($dimension[1]);
- $dimension[1][0] = PHPExcel_Cell::columnIndexFromString($dimension[1][0]) - 1;
+ $dimension[0] = Cell::coordinateFromString($dimension[0]);
+ $dimension[0][0] = Cell::columnIndexFromString($dimension[0][0]) - 1;
+ $dimension[1] = Cell::coordinateFromString($dimension[1]);
+ $dimension[1][0] = Cell::columnIndexFromString($dimension[1][0]) - 1;
// row min,max
$rowMin = $dimension[0][1];
@@ -468,13 +470,13 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
* Generate sheet tabs
*
* @return string
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function generateNavigation()
{
// PHPExcel object known?
if (is_null($this->_phpExcel)) {
- throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+ throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
}
// Fetch sheets
@@ -506,18 +508,18 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
return $html;
}
- private function _extendRowsForChartsAndImages(PHPExcel_Worksheet $pSheet, $row) {
+ private function _extendRowsForChartsAndImages(Worksheet $pSheet, $row) {
$rowMax = $row;
$colMax = 'A';
if ($this->_includeCharts) {
foreach ($pSheet->getChartCollection() as $chart) {
- if ($chart instanceof PHPExcel_Chart) {
+ if ($chart instanceof Chart) {
$chartCoordinates = $chart->getTopLeftPosition();
- $chartTL = PHPExcel_Cell::coordinateFromString($chartCoordinates['cell']);
- $chartCol = PHPExcel_Cell::columnIndexFromString($chartTL[0]);
+ $chartTL = Cell::coordinateFromString($chartCoordinates['cell']);
+ $chartCol = Cell::columnIndexFromString($chartTL[0]);
if ($chartTL[1] > $rowMax) {
$rowMax = $chartTL[1];
- if ($chartCol > PHPExcel_Cell::columnIndexFromString($colMax)) {
+ if ($chartCol > Cell::columnIndexFromString($colMax)) {
$colMax = $chartTL[0];
}
}
@@ -526,12 +528,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
}
foreach ($pSheet->getDrawingCollection() as $drawing) {
- if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
- $imageTL = PHPExcel_Cell::coordinateFromString($drawing->getCoordinates());
- $imageCol = PHPExcel_Cell::columnIndexFromString($imageTL[0]);
+ if ($drawing instanceof Worksheet_Drawing) {
+ $imageTL = Cell::coordinateFromString($drawing->getCoordinates());
+ $imageCol = Cell::columnIndexFromString($imageTL[0]);
if ($imageTL[1] > $rowMax) {
$rowMax = $imageTL[1];
- if ($imageCol > PHPExcel_Cell::columnIndexFromString($colMax)) {
+ if ($imageCol > Cell::columnIndexFromString($colMax)) {
$colMax = $imageTL[0];
}
}
@@ -559,18 +561,18 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
/**
* Generate image tag in cell
*
- * @param PHPExcel_Worksheet $pSheet PHPExcel_Worksheet
+ * @param PHPExcel\Worksheet $pSheet PHPExcel Worksheet
* @param string $coordinates Cell coordinates
* @return string
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeImageInCell(PHPExcel_Worksheet $pSheet, $coordinates) {
+ private function _writeImageInCell(Worksheet $pSheet, $coordinates) {
// Construct HTML
$html = '';
// Write images
foreach ($pSheet->getDrawingCollection() as $drawing) {
- if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
+ if ($drawing instanceof Worksheet_Drawing) {
if ($drawing->getCoordinates() == $coordinates) {
$filename = $drawing->getPath();
@@ -621,21 +623,21 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
/**
* Generate chart tag in cell
*
- * @param PHPExcel_Worksheet $pSheet PHPExcel_Worksheet
+ * @param PHPExcel\Worksheet $pSheet PHPExcel Worksheet
* @param string $coordinates Cell coordinates
* @return string
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _writeChartInCell(PHPExcel_Worksheet $pSheet, $coordinates) {
+ private function _writeChartInCell(Worksheet $pSheet, $coordinates) {
// Construct HTML
$html = '';
// Write charts
foreach ($pSheet->getChartCollection() as $chart) {
- if ($chart instanceof PHPExcel_Chart) {
+ if ($chart instanceof Chart) {
$chartCoordinates = $chart->getTopLeftPosition();
if ($chartCoordinates['cell'] == $coordinates) {
- $chartFileName = PHPExcel_Shared_File::sys_get_temp_dir().'/'.uniqid().'.png';
+ $chartFileName = Shared_File::sys_get_temp_dir().'/'.uniqid().'.png';
if (!$chart->render($chartFileName)) {
return;
}
@@ -669,12 +671,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
*
* @param boolean $generateSurroundingHTML Generate surrounding HTML tags? ()
* @return string
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function generateStyles($generateSurroundingHTML = true) {
// PHPExcel object known?
if (is_null($this->_phpExcel)) {
- throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+ throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
}
// Build CSS
@@ -710,12 +712,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
*
* @param boolean $generateSurroundingHTML Generate surrounding HTML style? (html { })
* @return array
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function buildCSS($generateSurroundingHTML = true) {
// PHPExcel object known?
if (is_null($this->_phpExcel)) {
- throw new PHPExcel_Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
+ throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
}
// Cached?
@@ -790,7 +792,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
$sheet->calculateColumnWidths();
// col elements, initialize
- $highestColumnIndex = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn()) - 1;
+ $highestColumnIndex = Cell::columnIndexFromString($sheet->getHighestColumn()) - 1;
$column = -1;
while($column++ < $highestColumnIndex) {
$this->_columnWidths[$sheetIndex][$column] = 42; // approximation
@@ -799,9 +801,9 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// col elements, loop through columnDimensions and set width
foreach ($sheet->getColumnDimensions() as $columnDimension) {
- if (($width = PHPExcel_Shared_Drawing::cellDimensionToPixels($columnDimension->getWidth(), $this->_defaultFont)) >= 0) {
- $width = PHPExcel_Shared_Drawing::pixelsToPoints($width);
- $column = PHPExcel_Cell::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
+ if (($width = Shared_Drawing::cellDimensionToPixels($columnDimension->getWidth(), $this->_defaultFont)) >= 0) {
+ $width = Shared_Drawing::pixelsToPoints($width);
+ $column = Cell::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
$this->_columnWidths[$sheetIndex][$column] = $width;
$css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
@@ -819,7 +821,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
$css['table.sheet' . $sheetIndex . ' tr'] = array();
if ($rowDimension->getRowHeight() == -1) {
- $pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
+ $pt_height = Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
} else {
$pt_height = $rowDimension->getRowHeight();
}
@@ -837,7 +839,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
$css['table.sheet' . $sheetIndex . ' tr.row' . $row] = array();
if ($rowDimension->getRowHeight() == -1) {
- $pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
+ $pt_height = Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
} else {
$pt_height = $rowDimension->getRowHeight();
}
@@ -861,10 +863,10 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
/**
* Create CSS style
*
- * @param PHPExcel_Style $pStyle PHPExcel_Style
+ * @param PHPExcel\Style $pStyle PHPExcel Style
* @return array
*/
- private function _createCSSStyle(PHPExcel_Style $pStyle) {
+ private function _createCSSStyle(Style $pStyle) {
// Construct CSS
$css = '';
@@ -881,12 +883,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
}
/**
- * Create CSS style (PHPExcel_Style_Alignment)
+ * Create CSS style (PHPExcel\Style_Alignment)
*
- * @param PHPExcel_Style_Alignment $pStyle PHPExcel_Style_Alignment
+ * @param PHPExcel\Style_Alignment $pStyle PHPExcel Style Alignment
* @return array
*/
- private function _createCSSStyleAlignment(PHPExcel_Style_Alignment $pStyle) {
+ private function _createCSSStyleAlignment(Style_Alignment $pStyle) {
// Construct CSS
$css = array();
@@ -903,12 +905,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
}
/**
- * Create CSS style (PHPExcel_Style_Font)
+ * Create CSS style (PHPExcel\Style_Font)
*
- * @param PHPExcel_Style_Font $pStyle PHPExcel_Style_Font
+ * @param PHPExcel\Style_Font $pStyle Font Style
* @return array
*/
- private function _createCSSStyleFont(PHPExcel_Style_Font $pStyle) {
+ private function _createCSSStyleFont(Style_Font $pStyle) {
// Construct CSS
$css = array();
@@ -916,9 +918,9 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
if ($pStyle->getBold()) {
$css['font-weight'] = 'bold';
}
- if ($pStyle->getUnderline() != PHPExcel_Style_Font::UNDERLINE_NONE && $pStyle->getStrikethrough()) {
+ if ($pStyle->getUnderline() != Style_Font::UNDERLINE_NONE && $pStyle->getStrikethrough()) {
$css['text-decoration'] = 'underline line-through';
- } else if ($pStyle->getUnderline() != PHPExcel_Style_Font::UNDERLINE_NONE) {
+ } else if ($pStyle->getUnderline() != Style_Font::UNDERLINE_NONE) {
$css['text-decoration'] = 'underline';
} else if ($pStyle->getStrikethrough()) {
$css['text-decoration'] = 'line-through';
@@ -936,12 +938,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
}
/**
- * Create CSS style (PHPExcel_Style_Borders)
+ * Create CSS style (PHPExcel\Style_Borders)
*
- * @param PHPExcel_Style_Borders $pStyle PHPExcel_Style_Borders
+ * @param PHPExcel\Style_Borders $pStyle Cell Borders Style
* @return array
*/
- private function _createCSSStyleBorders(PHPExcel_Style_Borders $pStyle) {
+ private function _createCSSStyleBorders(Style_Borders $pStyle) {
// Construct CSS
$css = array();
@@ -956,12 +958,12 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
}
/**
- * Create CSS style (PHPExcel_Style_Border)
+ * Create CSS style (PHPExcel\Style_Border)
*
- * @param PHPExcel_Style_Border $pStyle PHPExcel_Style_Border
+ * @param PHPExcel\Style_Border $pStyle Border Style
* @return string
*/
- private function _createCSSStyleBorder(PHPExcel_Style_Border $pStyle) {
+ private function _createCSSStyleBorder(Style_Border $pStyle) {
// Create CSS
// $css = $this->_mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
// Create CSS - add !important to non-none border styles for merged cells
@@ -973,17 +975,17 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
}
/**
- * Create CSS style (PHPExcel_Style_Fill)
+ * Create CSS style (PHPExcel\Style_Fill)
*
- * @param PHPExcel_Style_Fill $pStyle PHPExcel_Style_Fill
+ * @param PHPExcel\Style_Fill $pStyle Fill Style
* @return array
*/
- private function _createCSSStyleFill(PHPExcel_Style_Fill $pStyle) {
+ private function _createCSSStyleFill(Style_Fill $pStyle) {
// Construct HTML
$css = array();
// Create CSS
- $value = $pStyle->getFillType() == PHPExcel_Style_Fill::FILL_NONE ?
+ $value = $pStyle->getFillType() == Style_Fill::FILL_NONE ?
'white' : '#' . $pStyle->getStartColor()->getRGB();
$css['background-color'] = $value;
@@ -1007,9 +1009,9 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
/**
* Generate table header
*
- * @param PHPExcel_Worksheet $pSheet The worksheet for the table we are writing
+ * @param PHPExcel\Worksheet $pSheet The worksheet for the table we are writing
* @return string
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
private function _generateTableHeader($pSheet) {
$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
@@ -1033,7 +1035,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
}
// Write elements
- $highestColumnIndex = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn()) - 1;
+ $highestColumnIndex = Cell::columnIndexFromString($pSheet->getHighestColumn()) - 1;
$i = -1;
while($i++ < $highestColumnIndex) {
if (!$this->_isPdf) {
@@ -1054,7 +1056,6 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
/**
* Generate table footer
*
- * @throws PHPExcel_Writer_Exception
*/
private function _generateTableFooter() {
// Construct HTML
@@ -1068,13 +1069,13 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
/**
* Generate row
*
- * @param PHPExcel_Worksheet $pSheet PHPExcel_Worksheet
+ * @param PHPExcel\Worksheet $pSheet Worksheet
* @param array $pValues Array containing cells in a row
* @param int $pRow Row number (0-based)
* @return string
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
- private function _generateRow(PHPExcel_Worksheet $pSheet, $pValues = null, $pRow = 0) {
+ private function _generateRow(Worksheet $pSheet, $pValues = null, $pRow = 0) {
if (is_array($pValues)) {
// Construct HTML
$html = '';
@@ -1112,7 +1113,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// Write cells
$colNum = 0;
foreach ($pValues as $cell) {
- $coordinate = PHPExcel_Cell::stringFromColumnIndex($colNum) . ($pRow + 1);
+ $coordinate = Cell::stringFromColumnIndex($colNum) . ($pRow + 1);
if (!$this->_useInlineCss) {
$cssClass = '';
@@ -1129,19 +1130,19 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// initialize
$cellData = ' ';
- // PHPExcel_Cell
- if ($cell instanceof PHPExcel_Cell) {
+ // PHPExcel Cell
+ if ($cell instanceof Cell) {
$cellData = '';
if (is_null($cell->getParent())) {
$cell->attach($pSheet);
}
// Value
- if ($cell->getValue() instanceof PHPExcel_RichText) {
+ if ($cell->getValue() instanceof RichText) {
// Loop through rich text elements
$elements = $cell->getValue()->getRichTextElements();
foreach ($elements as $element) {
// Rich text start?
- if ($element instanceof PHPExcel_RichText_Run) {
+ if ($element instanceof RichText_Run) {
$cellData .= '';
if ($element->getFont()->getSuperScript()) {
@@ -1155,7 +1156,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
$cellText = $element->getText();
$cellData .= htmlspecialchars($cellText);
- if ($element instanceof PHPExcel_RichText_Run) {
+ if ($element instanceof RichText_Run) {
if ($element->getFont()->getSuperScript()) {
$cellData .= '';
} else if ($element->getFont()->getSubScript()) {
@@ -1167,13 +1168,13 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
}
} else {
if ($this->_preCalculateFormulas) {
- $cellData = PHPExcel_Style_NumberFormat::toFormattedString(
+ $cellData = Style_NumberFormat::toFormattedString(
$cell->getCalculatedValue(),
$pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
array($this, 'formatColor')
);
} else {
- $cellData = PHPExcel_Style_NumberFormat::ToFormattedString(
+ $cellData = Style_NumberFormat::ToFormattedString(
$cell->getValue(),
$pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
array($this, 'formatColor')
@@ -1205,7 +1206,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// General horizontal alignment: Actual horizontal alignment depends on dataType
$sharedStyle = $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() );
- if ($sharedStyle->getAlignment()->getHorizontal() == PHPExcel_Style_Alignment::HORIZONTAL_GENERAL
+ if ($sharedStyle->getAlignment()->getHorizontal() == Style_Alignment::HORIZONTAL_GENERAL
&& isset($this->_cssStyles['.' . $cell->getDataType()]['text-align']))
{
$cssClass['text-align'] = $this->_cssStyles['.' . $cell->getDataType()]['text-align'];
@@ -1232,7 +1233,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// Also apply style from last cell in merge to fix borders -
// relies on !important for non-none border declarations in _createCSSStyleBorder
- $endCellCoord = PHPExcel_Cell::stringFromColumnIndex($colNum + $colSpan - 1) . ($pRow + $rowSpan);
+ $endCellCoord = Cell::stringFromColumnIndex($colNum + $colSpan - 1) . ($pRow + $rowSpan);
if (!$this->_useInlineCss) {
$cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex();
}
@@ -1245,7 +1246,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
if (!$this->_useInlineCss) {
$html .= ' class="' . $cssClass . '"';
} else {
- //** Necessary redundant code for the sake of PHPExcel_Writer_PDF **
+ //** Necessary redundant code for the sake of PHPExcel\Writer_PDF **
// We must explicitly write the width of the element because TCPDF
// does not recognize e.g.
$width = 0;
@@ -1301,7 +1302,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// Return
return $html;
} else {
- throw new PHPExcel_Writer_Exception("Invalid parameters passed.");
+ throw new Writer_Exception("Invalid parameters passed.");
}
}
@@ -1335,7 +1336,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
* Set images root
*
* @param string $pValue
- * @return PHPExcel_Writer_HTML
+ * @return PHPExcel\Writer_HTML
*/
public function setImagesRoot($pValue = '.') {
$this->_imagesRoot = $pValue;
@@ -1355,7 +1356,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
* Set embed images
*
* @param boolean $pValue
- * @return PHPExcel_Writer_HTML
+ * @return PHPExcel\Writer_HTML
*/
public function setEmbedImages($pValue = '.') {
$this->_embedImages = $pValue;
@@ -1375,7 +1376,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
* Set use inline CSS?
*
* @param boolean $pValue
- * @return PHPExcel_Writer_HTML
+ * @return PHPExcel\Writer_HTML
*/
public function setUseInlineCss($pValue = false) {
$this->_useInlineCss = $pValue;
@@ -1431,15 +1432,15 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// loop through all Excel merged cells
foreach ($sheet->getMergeCells() as $cells) {
- list($cells, ) = PHPExcel_Cell::splitRange($cells);
+ list($cells, ) = Cell::splitRange($cells);
$first = $cells[0];
$last = $cells[1];
- list($fc, $fr) = PHPExcel_Cell::coordinateFromString($first);
- $fc = PHPExcel_Cell::columnIndexFromString($fc) - 1;
+ list($fc, $fr) = Cell::coordinateFromString($first);
+ $fc = Cell::columnIndexFromString($fc) - 1;
- list($lc, $lr) = PHPExcel_Cell::coordinateFromString($last);
- $lc = PHPExcel_Cell::columnIndexFromString($lc) - 1;
+ list($lc, $lr) = Cell::coordinateFromString($last);
+ $lc = Cell::columnIndexFromString($lc) - 1;
// loop through the individual cells in the individual merge
$r = $fr - 1;
@@ -1469,7 +1470,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
// Identify which rows should be omitted in HTML. These are the rows where all the cells
// participate in a merge and the where base cells are somewhere above.
- $countColumns = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn());
+ $countColumns = Cell::columnIndexFromString($sheet->getHighestColumn());
foreach ($candidateSpannedRow as $rowIndex) {
if (isset($this->_isSpannedCell[$sheetIndex][$rowIndex])) {
if (count($this->_isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
@@ -1503,20 +1504,20 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
$this->_spansAreCalculated = true;
}
- private function _setMargins(PHPExcel_Worksheet $pSheet) {
+ private function _setMargins(Worksheet $pSheet) {
$htmlPage = '@page { ';
$htmlBody = 'body { ';
- $left = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()) . 'in; ';
+ $left = Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()) . 'in; ';
$htmlPage .= 'left-margin: ' . $left;
$htmlBody .= 'left-margin: ' . $left;
- $right = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()) . 'in; ';
+ $right = Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()) . 'in; ';
$htmlPage .= 'right-margin: ' . $right;
$htmlBody .= 'right-margin: ' . $right;
- $top = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()) . 'in; ';
+ $top = Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()) . 'in; ';
$htmlPage .= 'top-margin: ' . $top;
$htmlBody .= 'top-margin: ' . $top;
- $bottom = PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()) . 'in; ';
+ $bottom = Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()) . 'in; ';
$htmlPage .= 'bottom-margin: ' . $bottom;
$htmlBody .= 'bottom-margin: ' . $bottom;
diff --git a/Classes/PHPExcel/Writer/IWriter.php b/Classes/PHPExcel/Writer/IWriter.php
index 6bb8a39..36f08f6 100644
--- a/Classes/PHPExcel/Writer/IWriter.php
+++ b/Classes/PHPExcel/Writer/IWriter.php
@@ -19,27 +19,29 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer
+ * @package PHPExcel\Writer
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_IWriter
+ * PHPExcel\Writer_IWriter
*
* @category PHPExcel
- * @package PHPExcel_Writer
+ * @package PHPExcel\Writer
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-interface PHPExcel_Writer_IWriter
+interface Writer_IWriter
{
/**
* Save PHPExcel to file
*
* @param string $pFilename Name of the file to save
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function save($pFilename = NULL);
diff --git a/Classes/PHPExcel/Writer/PDF.php b/Classes/PHPExcel/Writer/PDF.php
index a2524d4..214f135 100644
--- a/Classes/PHPExcel/Writer/PDF.php
+++ b/Classes/PHPExcel/Writer/PDF.php
@@ -19,46 +19,48 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_PDF
+ * PHPExcel\Writer_PDF
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_PDF
+class Writer_PDF
{
/**
* The wrapper for the requested PDF rendering engine
*
- * @var PHPExcel_Writer_PDF_Core
+ * @var PHPExcel\Writer_PDF_Core
*/
private $_renderer = NULL;
/**
* Instantiate a new renderer of the configured type within this container class
*
- * @param PHPExcel $phpExcel PHPExcel object
- * @throws PHPExcel_Writer_Exception when PDF library is not configured
+ * @param PHPExcel\Workbook $phpExcel PHPExcel object
+ * @throws PHPExcel\Writer_Exception when PDF library is not configured
*/
- public function __construct(PHPExcel $phpExcel)
+ public function __construct(Workbook $phpExcel)
{
- $pdfLibraryName = PHPExcel_Settings::getPdfRendererName();
+ $pdfLibraryName = Settings::getPdfRendererName();
if (is_null($pdfLibraryName)) {
- throw new PHPExcel_Writer_Exception("PDF Rendering library has not been defined.");
+ throw new Writer_Exception("PDF Rendering library has not been defined.");
}
- $pdfLibraryPath = PHPExcel_Settings::getPdfRendererPath();
+ $pdfLibraryPath = Settings::getPdfRendererPath();
if (is_null($pdfLibraryName)) {
- throw new PHPExcel_Writer_Exception("PDF Rendering library path has not been defined.");
+ throw new Writer_Exception("PDF Rendering library path has not been defined.");
}
$includePath = str_replace('\\', '/', get_include_path());
$rendererPath = str_replace('\\', '/', $pdfLibraryPath);
@@ -66,7 +68,7 @@ class PHPExcel_Writer_PDF
set_include_path(get_include_path() . PATH_SEPARATOR . $pdfLibraryPath);
}
- $rendererName = 'PHPExcel_Writer_PDF_' . $pdfLibraryName;
+ $rendererName = __NAMESPACE__ . '\Writer_PDF_' . $pdfLibraryName;
$this->_renderer = new $rendererName($phpExcel);
}
@@ -81,7 +83,7 @@ class PHPExcel_Writer_PDF
public function __call($name, $arguments)
{
if ($this->_renderer === NULL) {
- throw new PHPExcel_Writer_Exception("PDF Rendering library has not been defined.");
+ throw new Writer_Exception("PDF Rendering library has not been defined.");
}
return call_user_func_array(array($this->_renderer, $name), $arguments);
diff --git a/Classes/PHPExcel/Writer/PDF/Core.php b/Classes/PHPExcel/Writer/PDF/Core.php
index 24d104c..af5b251 100644
--- a/Classes/PHPExcel/Writer/PDF/Core.php
+++ b/Classes/PHPExcel/Writer/PDF/Core.php
@@ -19,21 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @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##
*/
+namespace PHPExcel;
+
/**
- * PHPExcel_Writer_PDF_Core
+ * PHPExcel\Writer_PDF_Core
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
+abstract class Writer_PDF_Core extends Writer_HTML
{
/**
* Temporary storage directory
@@ -77,150 +79,150 @@ abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
* @var array
*/
protected static $_paperSizes = array(
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER
+ Worksheet_PageSetup::PAPERSIZE_LETTER
=> 'LETTER', // (8.5 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_SMALL
+ Worksheet_PageSetup::PAPERSIZE_LETTER_SMALL
=> 'LETTER', // (8.5 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID
+ Worksheet_PageSetup::PAPERSIZE_TABLOID
=> array(792.00, 1224.00), // (11 in. by 17 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEDGER
+ Worksheet_PageSetup::PAPERSIZE_LEDGER
=> array(1224.00, 792.00), // (17 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL
+ Worksheet_PageSetup::PAPERSIZE_LEGAL
=> 'LEGAL', // (8.5 in. by 14 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_STATEMENT
+ Worksheet_PageSetup::PAPERSIZE_STATEMENT
=> array(396.00, 612.00), // (5.5 in. by 8.5 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_EXECUTIVE
+ Worksheet_PageSetup::PAPERSIZE_EXECUTIVE
=> 'EXECUTIVE', // (7.25 in. by 10.5 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3
+ Worksheet_PageSetup::PAPERSIZE_A3
=> 'A3', // (297 mm by 420 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4
+ Worksheet_PageSetup::PAPERSIZE_A4
=> 'A4', // (210 mm by 297 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_SMALL
+ Worksheet_PageSetup::PAPERSIZE_A4_SMALL
=> 'A4', // (210 mm by 297 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5
+ Worksheet_PageSetup::PAPERSIZE_A5
=> 'A5', // (148 mm by 210 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4
+ Worksheet_PageSetup::PAPERSIZE_B4
=> 'B4', // (250 mm by 353 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5
+ Worksheet_PageSetup::PAPERSIZE_B5
=> 'B5', // (176 mm by 250 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_FOLIO
+ Worksheet_PageSetup::PAPERSIZE_FOLIO
=> 'FOLIO', // (8.5 in. by 13 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_QUARTO
+ Worksheet_PageSetup::PAPERSIZE_QUARTO
=> array(609.45, 779.53), // (215 mm by 275 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_1
+ Worksheet_PageSetup::PAPERSIZE_STANDARD_1
=> array(720.00, 1008.00), // (10 in. by 14 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_2
+ Worksheet_PageSetup::PAPERSIZE_STANDARD_2
=> array(792.00, 1224.00), // (11 in. by 17 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_NOTE
+ Worksheet_PageSetup::PAPERSIZE_NOTE
=> 'LETTER', // (8.5 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO9_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_NO9_ENVELOPE
=> array(279.00, 639.00), // (3.875 in. by 8.875 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO10_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_NO10_ENVELOPE
=> array(297.00, 684.00), // (4.125 in. by 9.5 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO11_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_NO11_ENVELOPE
=> array(324.00, 747.00), // (4.5 in. by 10.375 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO12_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_NO12_ENVELOPE
=> array(342.00, 792.00), // (4.75 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO14_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_NO14_ENVELOPE
=> array(360.00, 828.00), // (5 in. by 11.5 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_C
+ Worksheet_PageSetup::PAPERSIZE_C
=> array(1224.00, 1584.00), // (17 in. by 22 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_D
+ Worksheet_PageSetup::PAPERSIZE_D
=> array(1584.00, 2448.00), // (22 in. by 34 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_E
+ Worksheet_PageSetup::PAPERSIZE_E
=> array(2448.00, 3168.00), // (34 in. by 44 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_DL_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_DL_ENVELOPE
=> array(311.81, 623.62), // (110 mm by 220 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_C5_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_C5_ENVELOPE
=> 'C5', // (162 mm by 229 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_C3_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_C3_ENVELOPE
=> 'C3', // (324 mm by 458 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_C4_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_C4_ENVELOPE
=> 'C4', // (229 mm by 324 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_C6_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_C6_ENVELOPE
=> 'C6', // (114 mm by 162 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_C65_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_C65_ENVELOPE
=> array(323.15, 649.13), // (114 mm by 229 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_B4_ENVELOPE
=> 'B4', // (250 mm by 353 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_B5_ENVELOPE
=> 'B5', // (176 mm by 250 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_B6_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_B6_ENVELOPE
=> array(498.90, 354.33), // (176 mm by 125 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_ITALY_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_ITALY_ENVELOPE
=> array(311.81, 651.97), // (110 mm by 230 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_MONARCH_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_MONARCH_ENVELOPE
=> array(279.00, 540.00), // (3.875 in. by 7.5 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_6_3_4_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_6_3_4_ENVELOPE
=> array(261.00, 468.00), // (3.625 in. by 6.5 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_US_STANDARD_FANFOLD
+ Worksheet_PageSetup::PAPERSIZE_US_STANDARD_FANFOLD
=> array(1071.00, 792.00), // (14.875 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD
+ Worksheet_PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD
=> array(612.00, 864.00), // (8.5 in. by 12 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD
+ Worksheet_PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD
=> 'FOLIO', // (8.5 in. by 13 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B4
+ Worksheet_PageSetup::PAPERSIZE_ISO_B4
=> 'B4', // (250 mm by 353 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD
+ Worksheet_PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD
=> array(566.93, 419.53), // (200 mm by 148 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_1
+ Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_1
=> array(648.00, 792.00), // (9 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_2
+ Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_2
=> array(720.00, 792.00), // (10 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_3
+ Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_3
=> array(1080.00, 792.00), // (15 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_INVITE_ENVELOPE
+ Worksheet_PageSetup::PAPERSIZE_INVITE_ENVELOPE
=> array(623.62, 623.62), // (220 mm by 220 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER
+ Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER
=> array(667.80, 864.00), // (9.275 in. by 12 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER
+ Worksheet_PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER
=> array(667.80, 1080.00), // (9.275 in. by 15 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER
+ Worksheet_PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER
=> array(841.68, 1296.00), // (11.69 in. by 18 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_EXTRA_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A4_EXTRA_PAPER
=> array(668.98, 912.76), // (236 mm by 322 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER
+ Worksheet_PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER
=> array(595.80, 792.00), // (8.275 in. by 11 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER
=> 'A4', // (210 mm by 297 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER
+ Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER
=> array(667.80, 864.00), // (9.275 in. by 12 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER
+ Worksheet_PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER
=> array(643.46, 1009.13), // (227 mm by 356 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER
+ Worksheet_PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER
=> array(864.57, 1380.47), // (305 mm by 487 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_PLUS_PAPER
+ Worksheet_PageSetup::PAPERSIZE_LETTER_PLUS_PAPER
=> array(612.00, 913.68), // (8.5 in. by 12.69 in.)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_PLUS_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A4_PLUS_PAPER
=> array(595.28, 935.43), // (210 mm by 330 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER
=> 'A5', // (148 mm by 210 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER
+ Worksheet_PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER
=> array(515.91, 728.50), // (182 mm by 257 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_PAPER
=> array(912.76, 1261.42), // (322 mm by 445 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_EXTRA_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A5_EXTRA_PAPER
=> array(493.23, 666.14), // (174 mm by 235 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER
+ Worksheet_PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER
=> array(569.76, 782.36), // (201 mm by 276 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A2_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A2_PAPER
=> 'A2', // (420 mm by 594 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER
=> 'A3', // (297 mm by 420 mm)
- PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER
+ Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER
=> array(912.76, 1261.42) // (322 mm by 445 mm)
);
/**
- * Create a new PHPExcel_Writer_PDF
+ * Create a new PHPExcel\Writer_PDF
*
- * @param PHPExcel $phpExcel PHPExcel object
+ * @param PHPExcel\Workbook $phpExcel Workbook object
*/
- public function __construct(PHPExcel $phpExcel)
+ public function __construct(Workbook $phpExcel)
{
parent::__construct($phpExcel);
$this->setUseInlineCss(TRUE);
- $this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
+ $this->_tempDir = Shared_File::sys_get_temp_dir();
}
/**
@@ -262,9 +264,9 @@ abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
* Set Paper Size
*
* @param string $pValue Paper size
- * @return PHPExcel_Writer_PDF
+ * @return PHPExcel\Writer_PDF
*/
- public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER)
+ public function setPaperSize($pValue = Worksheet_PageSetup::PAPERSIZE_LETTER)
{
$this->_paperSize = $pValue;
return $this;
@@ -284,9 +286,9 @@ abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
* Set Orientation
*
* @param string $pValue Page orientation
- * @return PHPExcel_Writer_PDF
+ * @return PHPExcel\Writer_PDF
*/
- public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
+ public function setOrientation($pValue = Worksheet_PageSetup::ORIENTATION_DEFAULT)
{
$this->_orientation = $pValue;
return $this;
@@ -306,15 +308,15 @@ abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
* Set temporary storage directory
*
* @param string $pValue Temporary storage directory
- * @throws PHPExcel_Writer_Exception when directory does not exist
- * @return PHPExcel_Writer_PDF
+ * @throws PHPExcel\Writer_Exception when directory does not exist
+ * @return PHPExcel\Writer_PDF
*/
public function setTempDir($pValue = '')
{
if (is_dir($pValue)) {
$this->_tempDir = $pValue;
} else {
- throw new PHPExcel_Writer_Exception("Directory does not exist: $pValue");
+ throw new Writer_Exception("Directory does not exist: $pValue");
}
return $this;
}
@@ -323,20 +325,20 @@ abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
* Save PHPExcel to PDF file, pre-save
*
* @param string $pFilename Name of the file to save as
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
protected function prepareForSave($pFilename = NULL)
{
// garbage collect
$this->_phpExcel->garbageCollect();
- $this->_saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
- PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
+ $this->_saveArrayReturnType = Calculation::getArrayReturnType();
+ Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
// Open file
$fileHandle = fopen($pFilename, 'w');
if ($fileHandle === FALSE) {
- throw new PHPExcel_Writer_Exception("Could not open file $pFilename for writing.");
+ throw new Writer_Exception("Could not open file $pFilename for writing.");
}
// Set PDF
@@ -351,14 +353,14 @@ abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML
* Save PHPExcel to PDF file, post-save
*
* @param resource $fileHandle
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
protected function restoreStateAfterSave($fileHandle)
{
// Close file
fclose($fileHandle);
- PHPExcel_Calculation::setArrayReturnType($this->_saveArrayReturnType);
+ Calculation::setArrayReturnType($this->_saveArrayReturnType);
}
}
diff --git a/Classes/PHPExcel/Writer/PDF/DomPDF.php b/Classes/PHPExcel/Writer/PDF/DomPDF.php
index 4563a95..9c797f5 100644
--- a/Classes/PHPExcel/Writer/PDF/DomPDF.php
+++ b/Classes/PHPExcel/Writer/PDF/DomPDF.php
@@ -19,32 +19,34 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @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##
*/
+namespace PHPExcel;
+
/** Require DomPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/dompdf_config.inc.php';
+$pdfRendererClassFile = Settings::getPdfRendererPath() . '/dompdf_config.inc.php';
if (file_exists($pdfRendererClassFile)) {
require_once $pdfRendererClassFile;
} else {
- throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
+ throw new Writer_Exception('Unable to load PDF Rendering library');
}
/**
- * PHPExcel_Writer_PDF_DomPDF
+ * PHPExcel\Writer_PDF_DomPDF
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
+class Writer_PDF_DomPDF extends Writer_PDF_Core implements Writer_IWriter
{
/**
- * Create a new PHPExcel_Writer_PDF
+ * Create a new PHPExcel\Writer_PDF
*
* @param PHPExcel $phpExcel PHPExcel object
*/
@@ -57,7 +59,7 @@ class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHP
* Save PHPExcel to file
*
* @param string $pFilename Name of the file to save as
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function save($pFilename = NULL)
{
@@ -69,14 +71,14 @@ class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHP
// Check for paper size and page orientation
if (is_null($this->getSheetIndex())) {
$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation()
- == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
+ == Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
? 'L'
: 'P';
$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
} else {
$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
- == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
+ == Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
? 'L'
: 'P';
$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
@@ -85,8 +87,8 @@ class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHP
// Override Page Orientation
if (!is_null($this->getOrientation())) {
- $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
- ? PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT
+ $orientation = ($this->getOrientation() == Worksheet_PageSetup::ORIENTATION_DEFAULT)
+ ? Worksheet_PageSetup::ORIENTATION_PORTRAIT
: $this->getOrientation();
}
// Override Paper Size
diff --git a/Classes/PHPExcel/Writer/PDF/mPDF.php b/Classes/PHPExcel/Writer/PDF/mPDF.php
index 1e20e6f..61eeda1 100644
--- a/Classes/PHPExcel/Writer/PDF/mPDF.php
+++ b/Classes/PHPExcel/Writer/PDF/mPDF.php
@@ -19,32 +19,34 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @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##
*/
+namespace PHPExcel;
+
/** Require mPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/mpdf.php';
+$pdfRendererClassFile = Settings::getPdfRendererPath() . '/mpdf.php';
if (file_exists($pdfRendererClassFile)) {
require_once $pdfRendererClassFile;
} else {
- throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
+ throw new Writer_Exception('Unable to load PDF Rendering library');
}
/**
- * PHPExcel_Writer_PDF_mPDF
+ * PHPExcel\Writer_PDF_mPDF
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_PDF_mPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
+class Writer_PDF_mPDF extends Writer_PDF_Core implements Writer_IWriter
{
/**
- * Create a new PHPExcel_Writer_PDF
+ * Create a new PHPExcel\Writer_PDF
*
* @param PHPExcel $phpExcel PHPExcel object
*/
@@ -57,7 +59,7 @@ class PHPExcel_Writer_PDF_mPDF extends PHPExcel_Writer_PDF_Core implements PHPEx
* Save PHPExcel to file
*
* @param string $pFilename Name of the file to save as
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function save($pFilename = NULL)
{
@@ -69,14 +71,14 @@ class PHPExcel_Writer_PDF_mPDF extends PHPExcel_Writer_PDF_Core implements PHPEx
// Check for paper size and page orientation
if (is_null($this->getSheetIndex())) {
$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation()
- == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
+ == Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
? 'L'
: 'P';
$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
} else {
$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
- == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
+ == Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
? 'L'
: 'P';
$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
@@ -86,8 +88,8 @@ class PHPExcel_Writer_PDF_mPDF extends PHPExcel_Writer_PDF_Core implements PHPEx
// Override Page Orientation
if (!is_null($this->getOrientation())) {
- $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT)
- ? PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT
+ $orientation = ($this->getOrientation() == Worksheet_PageSetup::ORIENTATION_DEFAULT)
+ ? Worksheet_PageSetup::ORIENTATION_PORTRAIT
: $this->getOrientation();
}
$orientation = strtoupper($orientation);
diff --git a/Classes/PHPExcel/Writer/PDF/tcPDF.php b/Classes/PHPExcel/Writer/PDF/tcPDF.php
index 2895512..15746e6 100644
--- a/Classes/PHPExcel/Writer/PDF/tcPDF.php
+++ b/Classes/PHPExcel/Writer/PDF/tcPDF.php
@@ -19,33 +19,35 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @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##
*/
+namespace PHPExcel;
+
/** Require tcPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/tcpdf.php';
+$pdfRendererClassFile = Settings::getPdfRendererPath() . '/tcpdf.php';
if (file_exists($pdfRendererClassFile)) {
- $k_path_url = PHPExcel_Settings::getPdfRendererPath();
+ $k_path_url = Settings::getPdfRendererPath();
require_once $pdfRendererClassFile;
} else {
- throw new PHPExcel_Writer_Exception('Unable to load PDF Rendering library');
+ throw new Writer_Exception('Unable to load PDF Rendering library');
}
/**
- * PHPExcel_Writer_PDF_tcPDF
+ * PHPExcel\Writer_PDF_tcPDF
*
* @category PHPExcel
- * @package PHPExcel_Writer_PDF
+ * @package PHPExcel\Writer_PDF
* @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Writer_PDF_tcPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter
+class Writer_PDF_tcPDF extends Writer_PDF_Core implements Writer_IWriter
{
/**
- * Create a new PHPExcel_Writer_PDF
+ * Create a new PHPExcel\Writer_PDF
*
* @param PHPExcel $phpExcel PHPExcel object
*/
@@ -58,7 +60,7 @@ class PHPExcel_Writer_PDF_tcPDF extends PHPExcel_Writer_PDF_Core implements PHPE
* Save PHPExcel to file
*
* @param string $pFilename Name of the file to save as
- * @throws PHPExcel_Writer_Exception
+ * @throws PHPExcel\Writer_Exception
*/
public function save($pFilename = NULL)
{
@@ -70,14 +72,14 @@ class PHPExcel_Writer_PDF_tcPDF extends PHPExcel_Writer_PDF_Core implements PHPE
// Check for paper size and page orientation
if (is_null($this->getSheetIndex())) {
$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation()
- == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
+ == Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
? 'L'
: 'P';
$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
} else {
$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
- == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
+ == Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
? 'L'
: 'P';
$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
@@ -86,7 +88,7 @@ class PHPExcel_Writer_PDF_tcPDF extends PHPExcel_Writer_PDF_Core implements PHPE
// Override Page Orientation
if (!is_null($this->getOrientation())) {
- $orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
+ $orientation = ($this->getOrientation() == Worksheet_PageSetup::ORIENTATION_LANDSCAPE)
? 'L'
: 'P';
}
|