@@ -37,12 +37,12 @@ discard block |
||
37 | 37 | { |
38 | 38 | /* Data types */ |
39 | 39 | const TYPE_STRING2 = 'str'; |
40 | - const TYPE_STRING = 's'; |
|
40 | + const TYPE_STRING = 's'; |
|
41 | 41 | const TYPE_FORMULA = 'f'; |
42 | 42 | const TYPE_NUMERIC = 'n'; |
43 | 43 | const TYPE_BOOL = 'b'; |
44 | - const TYPE_NULL = 'null'; |
|
45 | - const TYPE_INLINE = 'inlineStr'; |
|
44 | + const TYPE_NULL = 'null'; |
|
45 | + const TYPE_INLINE = 'inlineStr'; |
|
46 | 46 | const TYPE_ERROR = 'e'; |
47 | 47 | |
48 | 48 | /** |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * |
51 | 51 | * @var array |
52 | 52 | */ |
53 | - private static $_errorCodes = array('#NULL!' => 0, '#DIV/0!' => 1, '#VALUE!' => 2, '#REF!' => 3, '#NAME?' => 4, '#NUM!' => 5, '#N/A' => 6); |
|
53 | + private static $_errorCodes = array('#NULL!' => 0, '#DIV/0!' => 1, '#VALUE!' => 2, '#REF!' => 3, '#NAME?' => 4, '#NUM!' => 5, '#N/A' => 6); |
|
54 | 54 | |
55 | 55 | /** |
56 | 56 | * Get list of error codes |
@@ -102,9 +102,9 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public static function checkErrorCode($pValue = null) |
104 | 104 | { |
105 | - $pValue = (string)$pValue; |
|
105 | + $pValue = (string) $pValue; |
|
106 | 106 | |
107 | - if ( !array_key_exists($pValue, self::$_errorCodes) ) { |
|
107 | + if ( ! array_key_exists($pValue, self::$_errorCodes)) { |
|
108 | 108 | $pValue = '#NULL!'; |
109 | 109 | } |
110 | 110 |
@@ -41,8 +41,8 @@ |
||
41 | 41 | const TYPE_FORMULA = 'f'; |
42 | 42 | const TYPE_NUMERIC = 'n'; |
43 | 43 | const TYPE_BOOL = 'b'; |
44 | - const TYPE_NULL = 'null'; |
|
45 | - const TYPE_INLINE = 'inlineStr'; |
|
44 | + const TYPE_NULL = 'null'; |
|
45 | + const TYPE_INLINE = 'inlineStr'; |
|
46 | 46 | const TYPE_ERROR = 'e'; |
47 | 47 | |
48 | 48 | /** |
@@ -60,105 +60,105 @@ discard block |
||
60 | 60 | const OPERATOR_NOTBETWEEN = 'notBetween'; |
61 | 61 | const OPERATOR_NOTEQUAL = 'notEqual'; |
62 | 62 | |
63 | - /** |
|
64 | - * Formula 1 |
|
65 | - * |
|
66 | - * @var string |
|
67 | - */ |
|
68 | - private $_formula1; |
|
69 | - |
|
70 | - /** |
|
71 | - * Formula 2 |
|
72 | - * |
|
73 | - * @var string |
|
74 | - */ |
|
75 | - private $_formula2; |
|
76 | - |
|
77 | - /** |
|
78 | - * Type |
|
79 | - * |
|
80 | - * @var string |
|
81 | - */ |
|
82 | - private $_type = PHPExcel_Cell_DataValidation::TYPE_NONE; |
|
83 | - |
|
84 | - /** |
|
85 | - * Error style |
|
86 | - * |
|
87 | - * @var string |
|
88 | - */ |
|
89 | - private $_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP; |
|
90 | - |
|
91 | - /** |
|
92 | - * Operator |
|
93 | - * |
|
94 | - * @var string |
|
95 | - */ |
|
96 | - private $_operator; |
|
97 | - |
|
98 | - /** |
|
99 | - * Allow Blank |
|
100 | - * |
|
101 | - * @var boolean |
|
102 | - */ |
|
103 | - private $_allowBlank; |
|
104 | - |
|
105 | - /** |
|
106 | - * Show DropDown |
|
107 | - * |
|
108 | - * @var boolean |
|
109 | - */ |
|
110 | - private $_showDropDown; |
|
111 | - |
|
112 | - /** |
|
113 | - * Show InputMessage |
|
114 | - * |
|
115 | - * @var boolean |
|
116 | - */ |
|
117 | - private $_showInputMessage; |
|
118 | - |
|
119 | - /** |
|
120 | - * Show ErrorMessage |
|
121 | - * |
|
122 | - * @var boolean |
|
123 | - */ |
|
124 | - private $_showErrorMessage; |
|
125 | - |
|
126 | - /** |
|
127 | - * Error title |
|
128 | - * |
|
129 | - * @var string |
|
130 | - */ |
|
131 | - private $_errorTitle; |
|
132 | - |
|
133 | - /** |
|
134 | - * Error |
|
135 | - * |
|
136 | - * @var string |
|
137 | - */ |
|
138 | - private $_error; |
|
139 | - |
|
140 | - /** |
|
141 | - * Prompt title |
|
142 | - * |
|
143 | - * @var string |
|
144 | - */ |
|
145 | - private $_promptTitle; |
|
146 | - |
|
147 | - /** |
|
148 | - * Prompt |
|
149 | - * |
|
150 | - * @var string |
|
151 | - */ |
|
152 | - private $_prompt; |
|
153 | - |
|
154 | - /** |
|
155 | - * Create a new PHPExcel_Cell_DataValidation |
|
156 | - * |
|
157 | - * @throws Exception |
|
158 | - */ |
|
159 | - public function __construct() |
|
160 | - { |
|
161 | - // Initialise member variables |
|
63 | + /** |
|
64 | + * Formula 1 |
|
65 | + * |
|
66 | + * @var string |
|
67 | + */ |
|
68 | + private $_formula1; |
|
69 | + |
|
70 | + /** |
|
71 | + * Formula 2 |
|
72 | + * |
|
73 | + * @var string |
|
74 | + */ |
|
75 | + private $_formula2; |
|
76 | + |
|
77 | + /** |
|
78 | + * Type |
|
79 | + * |
|
80 | + * @var string |
|
81 | + */ |
|
82 | + private $_type = PHPExcel_Cell_DataValidation::TYPE_NONE; |
|
83 | + |
|
84 | + /** |
|
85 | + * Error style |
|
86 | + * |
|
87 | + * @var string |
|
88 | + */ |
|
89 | + private $_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP; |
|
90 | + |
|
91 | + /** |
|
92 | + * Operator |
|
93 | + * |
|
94 | + * @var string |
|
95 | + */ |
|
96 | + private $_operator; |
|
97 | + |
|
98 | + /** |
|
99 | + * Allow Blank |
|
100 | + * |
|
101 | + * @var boolean |
|
102 | + */ |
|
103 | + private $_allowBlank; |
|
104 | + |
|
105 | + /** |
|
106 | + * Show DropDown |
|
107 | + * |
|
108 | + * @var boolean |
|
109 | + */ |
|
110 | + private $_showDropDown; |
|
111 | + |
|
112 | + /** |
|
113 | + * Show InputMessage |
|
114 | + * |
|
115 | + * @var boolean |
|
116 | + */ |
|
117 | + private $_showInputMessage; |
|
118 | + |
|
119 | + /** |
|
120 | + * Show ErrorMessage |
|
121 | + * |
|
122 | + * @var boolean |
|
123 | + */ |
|
124 | + private $_showErrorMessage; |
|
125 | + |
|
126 | + /** |
|
127 | + * Error title |
|
128 | + * |
|
129 | + * @var string |
|
130 | + */ |
|
131 | + private $_errorTitle; |
|
132 | + |
|
133 | + /** |
|
134 | + * Error |
|
135 | + * |
|
136 | + * @var string |
|
137 | + */ |
|
138 | + private $_error; |
|
139 | + |
|
140 | + /** |
|
141 | + * Prompt title |
|
142 | + * |
|
143 | + * @var string |
|
144 | + */ |
|
145 | + private $_promptTitle; |
|
146 | + |
|
147 | + /** |
|
148 | + * Prompt |
|
149 | + * |
|
150 | + * @var string |
|
151 | + */ |
|
152 | + private $_prompt; |
|
153 | + |
|
154 | + /** |
|
155 | + * Create a new PHPExcel_Cell_DataValidation |
|
156 | + * |
|
157 | + * @throws Exception |
|
158 | + */ |
|
159 | + public function __construct() |
|
160 | + { |
|
161 | + // Initialise member variables |
|
162 | 162 | $this->_formula1 = ''; |
163 | 163 | $this->_formula2 = ''; |
164 | 164 | $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE; |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | $this->_error = ''; |
173 | 173 | $this->_promptTitle = ''; |
174 | 174 | $this->_prompt = ''; |
175 | - } |
|
175 | + } |
|
176 | 176 | |
177 | 177 | /** |
178 | 178 | * Get Formula 1 |
@@ -440,23 +440,23 @@ discard block |
||
440 | 440 | * @return string Hash code |
441 | 441 | */ |
442 | 442 | public function getHashCode() { |
443 | - return md5( |
|
444 | - $this->_formula1 |
|
445 | - . $this->_formula2 |
|
446 | - . $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE |
|
447 | - . $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP |
|
448 | - . $this->_operator |
|
449 | - . ($this->_allowBlank ? 't' : 'f') |
|
450 | - . ($this->_showDropDown ? 't' : 'f') |
|
451 | - . ($this->_showInputMessage ? 't' : 'f') |
|
452 | - . ($this->_showErrorMessage ? 't' : 'f') |
|
453 | - . $this->_errorTitle |
|
454 | - . $this->_error |
|
455 | - . $this->_promptTitle |
|
456 | - . $this->_prompt |
|
457 | - . __CLASS__ |
|
458 | - ); |
|
459 | - } |
|
443 | + return md5( |
|
444 | + $this->_formula1 |
|
445 | + . $this->_formula2 |
|
446 | + . $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE |
|
447 | + . $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP |
|
448 | + . $this->_operator |
|
449 | + . ($this->_allowBlank ? 't' : 'f') |
|
450 | + . ($this->_showDropDown ? 't' : 'f') |
|
451 | + . ($this->_showInputMessage ? 't' : 'f') |
|
452 | + . ($this->_showErrorMessage ? 't' : 'f') |
|
453 | + . $this->_errorTitle |
|
454 | + . $this->_error |
|
455 | + . $this->_promptTitle |
|
456 | + . $this->_prompt |
|
457 | + . __CLASS__ |
|
458 | + ); |
|
459 | + } |
|
460 | 460 | |
461 | 461 | /** |
462 | 462 | * Implement PHP __clone to create a deep clone, not just a shallow copy. |
@@ -37,27 +37,27 @@ discard block |
||
37 | 37 | { |
38 | 38 | /* Data validation types */ |
39 | 39 | const TYPE_NONE = 'none'; |
40 | - const TYPE_CUSTOM = 'custom'; |
|
40 | + const TYPE_CUSTOM = 'custom'; |
|
41 | 41 | const TYPE_DATE = 'date'; |
42 | - const TYPE_DECIMAL = 'decimal'; |
|
42 | + const TYPE_DECIMAL = 'decimal'; |
|
43 | 43 | const TYPE_LIST = 'list'; |
44 | - const TYPE_TEXTLENGTH = 'textLength'; |
|
44 | + const TYPE_TEXTLENGTH = 'textLength'; |
|
45 | 45 | const TYPE_TIME = 'time'; |
46 | 46 | const TYPE_WHOLE = 'whole'; |
47 | 47 | |
48 | 48 | /* Data validation error styles */ |
49 | 49 | const STYLE_STOP = 'stop'; |
50 | - const STYLE_WARNING = 'warning'; |
|
51 | - const STYLE_INFORMATION = 'information'; |
|
50 | + const STYLE_WARNING = 'warning'; |
|
51 | + const STYLE_INFORMATION = 'information'; |
|
52 | 52 | |
53 | 53 | /* Data validation operators */ |
54 | - const OPERATOR_BETWEEN = 'between'; |
|
55 | - const OPERATOR_EQUAL = 'equal'; |
|
56 | - const OPERATOR_GREATERTHAN = 'greaterThan'; |
|
57 | - const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual'; |
|
54 | + const OPERATOR_BETWEEN = 'between'; |
|
55 | + const OPERATOR_EQUAL = 'equal'; |
|
56 | + const OPERATOR_GREATERTHAN = 'greaterThan'; |
|
57 | + const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual'; |
|
58 | 58 | const OPERATOR_LESSTHAN = 'lessThan'; |
59 | - const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual'; |
|
60 | - const OPERATOR_NOTBETWEEN = 'notBetween'; |
|
59 | + const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual'; |
|
60 | + const OPERATOR_NOTBETWEEN = 'notBetween'; |
|
61 | 61 | const OPERATOR_NOTEQUAL = 'notEqual'; |
62 | 62 | |
63 | 63 | /** |
@@ -161,17 +161,17 @@ discard block |
||
161 | 161 | // Initialise member variables |
162 | 162 | $this->_formula1 = ''; |
163 | 163 | $this->_formula2 = ''; |
164 | - $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE; |
|
164 | + $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE; |
|
165 | 165 | $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP; |
166 | 166 | $this->_operator = ''; |
167 | 167 | $this->_allowBlank = false; |
168 | - $this->_showDropDown = false; |
|
168 | + $this->_showDropDown = false; |
|
169 | 169 | $this->_showInputMessage = false; |
170 | 170 | $this->_showErrorMessage = false; |
171 | 171 | $this->_errorTitle = ''; |
172 | - $this->_error = ''; |
|
172 | + $this->_error = ''; |
|
173 | 173 | $this->_promptTitle = ''; |
174 | - $this->_prompt = ''; |
|
174 | + $this->_prompt = ''; |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
@@ -27,12 +27,12 @@ discard block |
||
27 | 27 | |
28 | 28 | |
29 | 29 | /** PHPExcel root directory */ |
30 | -if (!defined('PHPEXCEL_ROOT')) { |
|
30 | +if ( ! defined('PHPEXCEL_ROOT')) { |
|
31 | 31 | /** |
32 | 32 | * @ignore |
33 | 33 | */ |
34 | - define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../'); |
|
35 | - require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php'); |
|
34 | + define('PHPEXCEL_ROOT', dirname(__FILE__).'/../../'); |
|
35 | + require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | // Set value explicit |
63 | - $cell->setValueExplicit( $value, self::dataTypeForValue($value) ); |
|
63 | + $cell->setValueExplicit($value, self::dataTypeForValue($value)); |
|
64 | 64 | |
65 | 65 | // Done! |
66 | 66 | return true; |
@@ -59,8 +59,8 @@ |
||
59 | 59 | public function __construct($pUrl = '', $pTooltip = '') |
60 | 60 | { |
61 | 61 | // Initialise member variables |
62 | - $this->_url = $pUrl; |
|
63 | - $this->_tooltip = $pTooltip; |
|
62 | + $this->_url = $pUrl; |
|
63 | + $this->_tooltip = $pTooltip; |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
@@ -49,19 +49,19 @@ discard block |
||
49 | 49 | */ |
50 | 50 | private $_tooltip; |
51 | 51 | |
52 | - /** |
|
53 | - * Create a new PHPExcel_Cell_Hyperlink |
|
54 | - * |
|
55 | - * @param string $pUrl Url to link the cell to |
|
56 | - * @param string $pTooltip Tooltip to display on the hyperlink |
|
57 | - * @throws Exception |
|
58 | - */ |
|
59 | - public function __construct($pUrl = '', $pTooltip = '') |
|
60 | - { |
|
61 | - // Initialise member variables |
|
52 | + /** |
|
53 | + * Create a new PHPExcel_Cell_Hyperlink |
|
54 | + * |
|
55 | + * @param string $pUrl Url to link the cell to |
|
56 | + * @param string $pTooltip Tooltip to display on the hyperlink |
|
57 | + * @throws Exception |
|
58 | + */ |
|
59 | + public function __construct($pUrl = '', $pTooltip = '') |
|
60 | + { |
|
61 | + // Initialise member variables |
|
62 | 62 | $this->_url = $pUrl; |
63 | 63 | $this->_tooltip = $pTooltip; |
64 | - } |
|
64 | + } |
|
65 | 65 | |
66 | 66 | /** |
67 | 67 | * Get URL |
@@ -118,10 +118,10 @@ discard block |
||
118 | 118 | * @return string Hash code |
119 | 119 | */ |
120 | 120 | public function getHashCode() { |
121 | - return md5( |
|
122 | - $this->_url |
|
123 | - . $this->_tooltip |
|
124 | - . __CLASS__ |
|
125 | - ); |
|
126 | - } |
|
121 | + return md5( |
|
122 | + $this->_url |
|
123 | + . $this->_tooltip |
|
124 | + . __CLASS__ |
|
125 | + ); |
|
126 | + } |
|
127 | 127 | } |
@@ -287,11 +287,11 @@ discard block |
||
287 | 287 | * @param integer $yOffset |
288 | 288 | * @return PHPExcel_Chart |
289 | 289 | */ |
290 | - public function setTopLeftPosition($cell, $xOffset=null, $yOffset=null) { |
|
290 | + public function setTopLeftPosition($cell, $xOffset = null, $yOffset = null) { |
|
291 | 291 | $this->_topLeftCellRef = $cell; |
292 | - if (!is_null($xOffset)) |
|
292 | + if ( ! is_null($xOffset)) |
|
293 | 293 | $this->setTopLeftXOffset($xOffset); |
294 | - if (!is_null($yOffset)) |
|
294 | + if ( ! is_null($yOffset)) |
|
295 | 295 | $this->setTopLeftYOffset($yOffset); |
296 | 296 | |
297 | 297 | return $this; |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | * @return array an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell |
304 | 304 | */ |
305 | 305 | public function getTopLeftPosition() { |
306 | - return array( 'cell' => $this->_topLeftCellRef, |
|
306 | + return array('cell' => $this->_topLeftCellRef, |
|
307 | 307 | 'xOffset' => $this->_topLeftXOffset, |
308 | 308 | 'yOffset' => $this->_topLeftYOffset |
309 | 309 | ); |
@@ -330,17 +330,17 @@ discard block |
||
330 | 330 | return $this; |
331 | 331 | } |
332 | 332 | |
333 | - public function setTopLeftOffset($xOffset=null,$yOffset=null) { |
|
334 | - if (!is_null($xOffset)) |
|
333 | + public function setTopLeftOffset($xOffset = null, $yOffset = null) { |
|
334 | + if ( ! is_null($xOffset)) |
|
335 | 335 | $this->setTopLeftXOffset($xOffset); |
336 | - if (!is_null($yOffset)) |
|
336 | + if ( ! is_null($yOffset)) |
|
337 | 337 | $this->setTopLeftYOffset($yOffset); |
338 | 338 | |
339 | 339 | return $this; |
340 | 340 | } |
341 | 341 | |
342 | 342 | public function getTopLeftOffset() { |
343 | - return array( 'X' => $this->_topLeftXOffset, |
|
343 | + return array('X' => $this->_topLeftXOffset, |
|
344 | 344 | 'Y' => $this->_topLeftYOffset |
345 | 345 | ); |
346 | 346 | } |
@@ -373,11 +373,11 @@ discard block |
||
373 | 373 | * @param integer $yOffset |
374 | 374 | * @return PHPExcel_Chart |
375 | 375 | */ |
376 | - public function setBottomRightPosition($cell, $xOffset=null, $yOffset=null) { |
|
376 | + public function setBottomRightPosition($cell, $xOffset = null, $yOffset = null) { |
|
377 | 377 | $this->_bottomRightCellRef = $cell; |
378 | - if (!is_null($xOffset)) |
|
378 | + if ( ! is_null($xOffset)) |
|
379 | 379 | $this->setBottomRightXOffset($xOffset); |
380 | - if (!is_null($yOffset)) |
|
380 | + if ( ! is_null($yOffset)) |
|
381 | 381 | $this->setBottomRightYOffset($yOffset); |
382 | 382 | |
383 | 383 | return $this; |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | * @return array an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell |
390 | 390 | */ |
391 | 391 | public function getBottomRightPosition() { |
392 | - return array( 'cell' => $this->_bottomRightCellRef, |
|
392 | + return array('cell' => $this->_bottomRightCellRef, |
|
393 | 393 | 'xOffset' => $this->_bottomRightXOffset, |
394 | 394 | 'yOffset' => $this->_bottomRightYOffset |
395 | 395 | ); |
@@ -410,17 +410,17 @@ discard block |
||
410 | 410 | return $this->_bottomRightCellRef; |
411 | 411 | } |
412 | 412 | |
413 | - public function setBottomRightOffset($xOffset=null,$yOffset=null) { |
|
414 | - if (!is_null($xOffset)) |
|
413 | + public function setBottomRightOffset($xOffset = null, $yOffset = null) { |
|
414 | + if ( ! is_null($xOffset)) |
|
415 | 415 | $this->setBottomRightXOffset($xOffset); |
416 | - if (!is_null($yOffset)) |
|
416 | + if ( ! is_null($yOffset)) |
|
417 | 417 | $this->setBottomRightYOffset($yOffset); |
418 | 418 | |
419 | 419 | return $this; |
420 | 420 | } |
421 | 421 | |
422 | 422 | public function getBottomRightOffset() { |
423 | - return array( 'X' => $this->_bottomRightXOffset, |
|
423 | + return array('X' => $this->_bottomRightXOffset, |
|
424 | 424 | 'Y' => $this->_bottomRightYOffset |
425 | 425 | ); |
426 | 426 | } |
@@ -461,10 +461,10 @@ discard block |
||
461 | 461 | $this->refresh(); |
462 | 462 | |
463 | 463 | $libraryPath = PHPExcel_Settings::getChartRendererPath(); |
464 | - $includePath = str_replace('\\','/',get_include_path()); |
|
465 | - $rendererPath = str_replace('\\','/',$libraryPath); |
|
466 | - if (strpos($rendererPath,$includePath) === false) { |
|
467 | - set_include_path(get_include_path() . PATH_SEPARATOR . $libraryPath); |
|
464 | + $includePath = str_replace('\\', '/', get_include_path()); |
|
465 | + $rendererPath = str_replace('\\', '/', $libraryPath); |
|
466 | + if (strpos($rendererPath, $includePath) === false) { |
|
467 | + set_include_path(get_include_path().PATH_SEPARATOR.$libraryPath); |
|
468 | 468 | } |
469 | 469 | |
470 | 470 | $rendererName = 'PHPExcel_Chart_Renderer_'.$libraryName; |
@@ -289,10 +289,12 @@ discard block |
||
289 | 289 | */ |
290 | 290 | public function setTopLeftPosition($cell, $xOffset=null, $yOffset=null) { |
291 | 291 | $this->_topLeftCellRef = $cell; |
292 | - if (!is_null($xOffset)) |
|
293 | - $this->setTopLeftXOffset($xOffset); |
|
294 | - if (!is_null($yOffset)) |
|
295 | - $this->setTopLeftYOffset($yOffset); |
|
292 | + if (!is_null($xOffset)) { |
|
293 | + $this->setTopLeftXOffset($xOffset); |
|
294 | + } |
|
295 | + if (!is_null($yOffset)) { |
|
296 | + $this->setTopLeftYOffset($yOffset); |
|
297 | + } |
|
296 | 298 | |
297 | 299 | return $this; |
298 | 300 | } |
@@ -331,10 +333,12 @@ discard block |
||
331 | 333 | } |
332 | 334 | |
333 | 335 | public function setTopLeftOffset($xOffset=null,$yOffset=null) { |
334 | - if (!is_null($xOffset)) |
|
335 | - $this->setTopLeftXOffset($xOffset); |
|
336 | - if (!is_null($yOffset)) |
|
337 | - $this->setTopLeftYOffset($yOffset); |
|
336 | + if (!is_null($xOffset)) { |
|
337 | + $this->setTopLeftXOffset($xOffset); |
|
338 | + } |
|
339 | + if (!is_null($yOffset)) { |
|
340 | + $this->setTopLeftYOffset($yOffset); |
|
341 | + } |
|
338 | 342 | |
339 | 343 | return $this; |
340 | 344 | } |
@@ -375,10 +379,12 @@ discard block |
||
375 | 379 | */ |
376 | 380 | public function setBottomRightPosition($cell, $xOffset=null, $yOffset=null) { |
377 | 381 | $this->_bottomRightCellRef = $cell; |
378 | - if (!is_null($xOffset)) |
|
379 | - $this->setBottomRightXOffset($xOffset); |
|
380 | - if (!is_null($yOffset)) |
|
381 | - $this->setBottomRightYOffset($yOffset); |
|
382 | + if (!is_null($xOffset)) { |
|
383 | + $this->setBottomRightXOffset($xOffset); |
|
384 | + } |
|
385 | + if (!is_null($yOffset)) { |
|
386 | + $this->setBottomRightYOffset($yOffset); |
|
387 | + } |
|
382 | 388 | |
383 | 389 | return $this; |
384 | 390 | } |
@@ -411,10 +417,12 @@ discard block |
||
411 | 417 | } |
412 | 418 | |
413 | 419 | public function setBottomRightOffset($xOffset=null,$yOffset=null) { |
414 | - if (!is_null($xOffset)) |
|
415 | - $this->setBottomRightXOffset($xOffset); |
|
416 | - if (!is_null($yOffset)) |
|
417 | - $this->setBottomRightYOffset($yOffset); |
|
420 | + if (!is_null($xOffset)) { |
|
421 | + $this->setBottomRightXOffset($xOffset); |
|
422 | + } |
|
423 | + if (!is_null($yOffset)) { |
|
424 | + $this->setBottomRightYOffset($yOffset); |
|
425 | + } |
|
418 | 426 | |
419 | 427 | return $this; |
420 | 428 | } |
@@ -47,56 +47,56 @@ |
||
47 | 47 | * |
48 | 48 | * @var string |
49 | 49 | */ |
50 | - private $_xMode = null; |
|
50 | + private $_xMode = null; |
|
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Y Mode |
54 | 54 | * |
55 | 55 | * @var string |
56 | 56 | */ |
57 | - private $_yMode = null; |
|
57 | + private $_yMode = null; |
|
58 | 58 | |
59 | 59 | /** |
60 | 60 | * X-Position |
61 | 61 | * |
62 | 62 | * @var float |
63 | 63 | */ |
64 | - private $_xPos = null; |
|
64 | + private $_xPos = null; |
|
65 | 65 | |
66 | 66 | /** |
67 | 67 | * Y-Position |
68 | 68 | * |
69 | 69 | * @var float |
70 | 70 | */ |
71 | - private $_yPos = null; |
|
71 | + private $_yPos = null; |
|
72 | 72 | |
73 | 73 | /** |
74 | 74 | * width |
75 | 75 | * |
76 | 76 | * @var float |
77 | 77 | */ |
78 | - private $_width = null; |
|
78 | + private $_width = null; |
|
79 | 79 | |
80 | 80 | /** |
81 | 81 | * height |
82 | 82 | * |
83 | 83 | * @var float |
84 | 84 | */ |
85 | - private $_height = null; |
|
85 | + private $_height = null; |
|
86 | 86 | |
87 | 87 | |
88 | 88 | /** |
89 | 89 | * Create a new PHPExcel_Chart_Layout |
90 | 90 | */ |
91 | - public function __construct($layout=array()) |
|
91 | + public function __construct($layout = array()) |
|
92 | 92 | { |
93 | - if (isset($layout['layoutTarget'])) { $this->_layoutTarget = $layout['layoutTarget']; } |
|
94 | - if (isset($layout['xMode'])) { $this->_xMode = $layout['xMode']; } |
|
95 | - if (isset($layout['yMode'])) { $this->_yMode = $layout['yMode']; } |
|
96 | - if (isset($layout['x'])) { $this->_xPos = (float) $layout['x']; } |
|
97 | - if (isset($layout['y'])) { $this->_yPos = (float) $layout['y']; } |
|
98 | - if (isset($layout['w'])) { $this->_width = (float) $layout['w']; } |
|
99 | - if (isset($layout['h'])) { $this->_height = (float) $layout['h']; } |
|
93 | + if (isset($layout['layoutTarget'])) { $this->_layoutTarget = $layout['layoutTarget']; } |
|
94 | + if (isset($layout['xMode'])) { $this->_xMode = $layout['xMode']; } |
|
95 | + if (isset($layout['yMode'])) { $this->_yMode = $layout['yMode']; } |
|
96 | + if (isset($layout['x'])) { $this->_xPos = (float) $layout['x']; } |
|
97 | + if (isset($layout['y'])) { $this->_yPos = (float) $layout['y']; } |
|
98 | + if (isset($layout['w'])) { $this->_width = (float) $layout['w']; } |
|
99 | + if (isset($layout['h'])) { $this->_height = (float) $layout['h']; } |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -55,7 +55,7 @@ |
||
55 | 55 | self::xlLegendPositionLeft => self::POSITION_LEFT, |
56 | 56 | self::xlLegendPositionRight => self::POSITION_RIGHT, |
57 | 57 | self::xlLegendPositionTop => self::POSITION_TOP |
58 | - ); |
|
58 | + ); |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Legend position |
@@ -36,20 +36,20 @@ discard block |
||
36 | 36 | class PHPExcel_Chart_Legend |
37 | 37 | { |
38 | 38 | /** Legend positions */ |
39 | - const xlLegendPositionBottom = -4107; // Below the chart. |
|
40 | - const xlLegendPositionCorner = 2; // In the upper right-hand corner of the chart border. |
|
41 | - const xlLegendPositionCustom = -4161; // A custom position. |
|
42 | - const xlLegendPositionLeft = -4131; // Left of the chart. |
|
43 | - const xlLegendPositionRight = -4152; // Right of the chart. |
|
44 | - const xlLegendPositionTop = -4160; // Above the chart. |
|
39 | + const xlLegendPositionBottom = -4107; // Below the chart. |
|
40 | + const xlLegendPositionCorner = 2; // In the upper right-hand corner of the chart border. |
|
41 | + const xlLegendPositionCustom = -4161; // A custom position. |
|
42 | + const xlLegendPositionLeft = -4131; // Left of the chart. |
|
43 | + const xlLegendPositionRight = -4152; // Right of the chart. |
|
44 | + const xlLegendPositionTop = -4160; // Above the chart. |
|
45 | 45 | |
46 | 46 | const POSITION_RIGHT = 'r'; |
47 | 47 | const POSITION_LEFT = 'l'; |
48 | - const POSITION_BOTTOM = 'b'; |
|
49 | - const POSITION_TOP = 't'; |
|
50 | - const POSITION_TOPRIGHT = 'tr'; |
|
48 | + const POSITION_BOTTOM = 'b'; |
|
49 | + const POSITION_TOP = 't'; |
|
50 | + const POSITION_TOPRIGHT = 'tr'; |
|
51 | 51 | |
52 | - private static $_positionXref = array( self::xlLegendPositionBottom => self::POSITION_BOTTOM, |
|
52 | + private static $_positionXref = array(self::xlLegendPositionBottom => self::POSITION_BOTTOM, |
|
53 | 53 | self::xlLegendPositionCorner => self::POSITION_TOPRIGHT, |
54 | 54 | self::xlLegendPositionCustom => '??', |
55 | 55 | self::xlLegendPositionLeft => self::POSITION_LEFT, |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | /** |
83 | 83 | * Create a new PHPExcel_Chart_Legend |
84 | 84 | */ |
85 | - public function __construct($position = null, PHPExcel_Chart_Layout $layout = null, $overlay= false) |
|
85 | + public function __construct($position = null, PHPExcel_Chart_Layout $layout = null, $overlay = false) |
|
86 | 86 | { |
87 | 87 | $this->_position = $position; |
88 | 88 | $this->_layout = $layout; |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * @param string $position |
105 | 105 | */ |
106 | 106 | public function setPosition($position = self::POSITION_RIGHT) { |
107 | - if (!in_array($position,self::$positionXref)) { |
|
107 | + if ( ! in_array($position, self::$positionXref)) { |
|
108 | 108 | return false; |
109 | 109 | } |
110 | 110 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | * @return number |
120 | 120 | */ |
121 | 121 | public function getPositionXL() { |
122 | - return array_search($this->_position,self::$positionXref); |
|
122 | + return array_search($this->_position, self::$positionXref); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | /** |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * @param number $positionXL |
129 | 129 | */ |
130 | 130 | public function setPositionXL($positionXL = self::xlLegendPositionRight) { |
131 | - if (!array_key_exists($positionXL,self::$positionXref)) { |
|
131 | + if ( ! array_key_exists($positionXL, self::$positionXref)) { |
|
132 | 132 | return false; |
133 | 133 | } |
134 | 134 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * |
151 | 151 | * @param boolean $value |
152 | 152 | */ |
153 | - public function setOverlay($value=false) { |
|
153 | + public function setOverlay($value = false) { |
|
154 | 154 | $this->_overlay = $value; |
155 | 155 | } |
156 | 156 |
@@ -117,7 +117,7 @@ |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | public function refresh(PHPExcel_Worksheet $worksheet) { |
120 | - foreach($this->_plotSeries as $plotSeries) { |
|
120 | + foreach($this->_plotSeries as $plotSeries) { |
|
121 | 121 | $plotSeries->refresh($worksheet); |
122 | 122 | } |
123 | 123 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function getPlotSeriesCount() { |
85 | 85 | $seriesCount = 0; |
86 | - foreach($this->_plotSeries as $plot) { |
|
86 | + foreach ($this->_plotSeries as $plot) { |
|
87 | 87 | $seriesCount += $plot->getPlotSeriesCount(); |
88 | 88 | } |
89 | 89 | return $seriesCount; |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | public function refresh(PHPExcel_Worksheet $worksheet) { |
120 | - foreach($this->_plotSeries as $plotSeries) { |
|
120 | + foreach ($this->_plotSeries as $plotSeries) { |
|
121 | 121 | $plotSeries->refresh($worksheet); |
122 | 122 | } |
123 | 123 | } |
@@ -98,188 +98,188 @@ discard block |
||
98 | 98 | */ |
99 | 99 | private $_alignment; |
100 | 100 | |
101 | - /** |
|
102 | - * Create a new PHPExcel_Comment |
|
103 | - * |
|
104 | - * @throws Exception |
|
105 | - */ |
|
106 | - public function __construct() |
|
107 | - { |
|
108 | - // Initialise variables |
|
109 | - $this->_author = 'Author'; |
|
110 | - $this->_text = new PHPExcel_RichText(); |
|
111 | - $this->_fillColor = new PHPExcel_Style_Color('FFFFFFE1'); |
|
101 | + /** |
|
102 | + * Create a new PHPExcel_Comment |
|
103 | + * |
|
104 | + * @throws Exception |
|
105 | + */ |
|
106 | + public function __construct() |
|
107 | + { |
|
108 | + // Initialise variables |
|
109 | + $this->_author = 'Author'; |
|
110 | + $this->_text = new PHPExcel_RichText(); |
|
111 | + $this->_fillColor = new PHPExcel_Style_Color('FFFFFFE1'); |
|
112 | 112 | $this->_alignment = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL; |
113 | - } |
|
113 | + } |
|
114 | 114 | |
115 | - /** |
|
116 | - * Get Author |
|
117 | - * |
|
118 | - * @return string |
|
119 | - */ |
|
120 | - public function getAuthor() { |
|
121 | - return $this->_author; |
|
122 | - } |
|
115 | + /** |
|
116 | + * Get Author |
|
117 | + * |
|
118 | + * @return string |
|
119 | + */ |
|
120 | + public function getAuthor() { |
|
121 | + return $this->_author; |
|
122 | + } |
|
123 | 123 | |
124 | - /** |
|
125 | - * Set Author |
|
126 | - * |
|
127 | - * @param string $pValue |
|
128 | - * @return PHPExcel_Comment |
|
129 | - */ |
|
124 | + /** |
|
125 | + * Set Author |
|
126 | + * |
|
127 | + * @param string $pValue |
|
128 | + * @return PHPExcel_Comment |
|
129 | + */ |
|
130 | 130 | public function setAuthor($pValue = '') { |
131 | 131 | $this->_author = $pValue; |
132 | 132 | return $this; |
133 | 133 | } |
134 | 134 | |
135 | - /** |
|
136 | - * Get Rich text comment |
|
137 | - * |
|
138 | - * @return PHPExcel_RichText |
|
139 | - */ |
|
140 | - public function getText() { |
|
141 | - return $this->_text; |
|
142 | - } |
|
135 | + /** |
|
136 | + * Get Rich text comment |
|
137 | + * |
|
138 | + * @return PHPExcel_RichText |
|
139 | + */ |
|
140 | + public function getText() { |
|
141 | + return $this->_text; |
|
142 | + } |
|
143 | 143 | |
144 | - /** |
|
145 | - * Set Rich text comment |
|
146 | - * |
|
147 | - * @param PHPExcel_RichText $pValue |
|
148 | - * @return PHPExcel_Comment |
|
149 | - */ |
|
150 | - public function setText(PHPExcel_RichText $pValue) { |
|
151 | - $this->_text = $pValue; |
|
152 | - return $this; |
|
153 | - } |
|
144 | + /** |
|
145 | + * Set Rich text comment |
|
146 | + * |
|
147 | + * @param PHPExcel_RichText $pValue |
|
148 | + * @return PHPExcel_Comment |
|
149 | + */ |
|
150 | + public function setText(PHPExcel_RichText $pValue) { |
|
151 | + $this->_text = $pValue; |
|
152 | + return $this; |
|
153 | + } |
|
154 | 154 | |
155 | - /** |
|
156 | - * Get comment width (CSS style, i.e. XXpx or YYpt) |
|
157 | - * |
|
158 | - * @return string |
|
159 | - */ |
|
160 | - public function getWidth() { |
|
161 | - return $this->_width; |
|
162 | - } |
|
155 | + /** |
|
156 | + * Get comment width (CSS style, i.e. XXpx or YYpt) |
|
157 | + * |
|
158 | + * @return string |
|
159 | + */ |
|
160 | + public function getWidth() { |
|
161 | + return $this->_width; |
|
162 | + } |
|
163 | 163 | |
164 | - /** |
|
165 | - * Set comment width (CSS style, i.e. XXpx or YYpt) |
|
166 | - * |
|
167 | - * @param string $value |
|
168 | - * @return PHPExcel_Comment |
|
169 | - */ |
|
170 | - public function setWidth($value = '96pt') { |
|
171 | - $this->_width = $value; |
|
172 | - return $this; |
|
173 | - } |
|
164 | + /** |
|
165 | + * Set comment width (CSS style, i.e. XXpx or YYpt) |
|
166 | + * |
|
167 | + * @param string $value |
|
168 | + * @return PHPExcel_Comment |
|
169 | + */ |
|
170 | + public function setWidth($value = '96pt') { |
|
171 | + $this->_width = $value; |
|
172 | + return $this; |
|
173 | + } |
|
174 | 174 | |
175 | - /** |
|
176 | - * Get comment height (CSS style, i.e. XXpx or YYpt) |
|
177 | - * |
|
178 | - * @return string |
|
179 | - */ |
|
180 | - public function getHeight() { |
|
181 | - return $this->_height; |
|
182 | - } |
|
175 | + /** |
|
176 | + * Get comment height (CSS style, i.e. XXpx or YYpt) |
|
177 | + * |
|
178 | + * @return string |
|
179 | + */ |
|
180 | + public function getHeight() { |
|
181 | + return $this->_height; |
|
182 | + } |
|
183 | 183 | |
184 | - /** |
|
185 | - * Set comment height (CSS style, i.e. XXpx or YYpt) |
|
186 | - * |
|
187 | - * @param string $value |
|
188 | - * @return PHPExcel_Comment |
|
189 | - */ |
|
190 | - public function setHeight($value = '55.5pt') { |
|
191 | - $this->_height = $value; |
|
192 | - return $this; |
|
193 | - } |
|
184 | + /** |
|
185 | + * Set comment height (CSS style, i.e. XXpx or YYpt) |
|
186 | + * |
|
187 | + * @param string $value |
|
188 | + * @return PHPExcel_Comment |
|
189 | + */ |
|
190 | + public function setHeight($value = '55.5pt') { |
|
191 | + $this->_height = $value; |
|
192 | + return $this; |
|
193 | + } |
|
194 | 194 | |
195 | - /** |
|
196 | - * Get left margin (CSS style, i.e. XXpx or YYpt) |
|
197 | - * |
|
198 | - * @return string |
|
199 | - */ |
|
200 | - public function getMarginLeft() { |
|
201 | - return $this->_marginLeft; |
|
202 | - } |
|
195 | + /** |
|
196 | + * Get left margin (CSS style, i.e. XXpx or YYpt) |
|
197 | + * |
|
198 | + * @return string |
|
199 | + */ |
|
200 | + public function getMarginLeft() { |
|
201 | + return $this->_marginLeft; |
|
202 | + } |
|
203 | 203 | |
204 | - /** |
|
205 | - * Set left margin (CSS style, i.e. XXpx or YYpt) |
|
206 | - * |
|
207 | - * @param string $value |
|
208 | - * @return PHPExcel_Comment |
|
209 | - */ |
|
210 | - public function setMarginLeft($value = '59.25pt') { |
|
211 | - $this->_marginLeft = $value; |
|
212 | - return $this; |
|
213 | - } |
|
204 | + /** |
|
205 | + * Set left margin (CSS style, i.e. XXpx or YYpt) |
|
206 | + * |
|
207 | + * @param string $value |
|
208 | + * @return PHPExcel_Comment |
|
209 | + */ |
|
210 | + public function setMarginLeft($value = '59.25pt') { |
|
211 | + $this->_marginLeft = $value; |
|
212 | + return $this; |
|
213 | + } |
|
214 | 214 | |
215 | - /** |
|
216 | - * Get top margin (CSS style, i.e. XXpx or YYpt) |
|
217 | - * |
|
218 | - * @return string |
|
219 | - */ |
|
220 | - public function getMarginTop() { |
|
221 | - return $this->_marginTop; |
|
222 | - } |
|
215 | + /** |
|
216 | + * Get top margin (CSS style, i.e. XXpx or YYpt) |
|
217 | + * |
|
218 | + * @return string |
|
219 | + */ |
|
220 | + public function getMarginTop() { |
|
221 | + return $this->_marginTop; |
|
222 | + } |
|
223 | 223 | |
224 | - /** |
|
225 | - * Set top margin (CSS style, i.e. XXpx or YYpt) |
|
226 | - * |
|
227 | - * @param string $value |
|
228 | - * @return PHPExcel_Comment |
|
229 | - */ |
|
230 | - public function setMarginTop($value = '1.5pt') { |
|
231 | - $this->_marginTop = $value; |
|
232 | - return $this; |
|
233 | - } |
|
224 | + /** |
|
225 | + * Set top margin (CSS style, i.e. XXpx or YYpt) |
|
226 | + * |
|
227 | + * @param string $value |
|
228 | + * @return PHPExcel_Comment |
|
229 | + */ |
|
230 | + public function setMarginTop($value = '1.5pt') { |
|
231 | + $this->_marginTop = $value; |
|
232 | + return $this; |
|
233 | + } |
|
234 | 234 | |
235 | - /** |
|
236 | - * Is the comment visible by default? |
|
237 | - * |
|
238 | - * @return boolean |
|
239 | - */ |
|
240 | - public function getVisible() { |
|
241 | - return $this->_visible; |
|
242 | - } |
|
235 | + /** |
|
236 | + * Is the comment visible by default? |
|
237 | + * |
|
238 | + * @return boolean |
|
239 | + */ |
|
240 | + public function getVisible() { |
|
241 | + return $this->_visible; |
|
242 | + } |
|
243 | 243 | |
244 | - /** |
|
245 | - * Set comment default visibility |
|
246 | - * |
|
247 | - * @param boolean $value |
|
248 | - * @return PHPExcel_Comment |
|
249 | - */ |
|
250 | - public function setVisible($value = false) { |
|
251 | - $this->_visible = $value; |
|
252 | - return $this; |
|
253 | - } |
|
244 | + /** |
|
245 | + * Set comment default visibility |
|
246 | + * |
|
247 | + * @param boolean $value |
|
248 | + * @return PHPExcel_Comment |
|
249 | + */ |
|
250 | + public function setVisible($value = false) { |
|
251 | + $this->_visible = $value; |
|
252 | + return $this; |
|
253 | + } |
|
254 | 254 | |
255 | - /** |
|
256 | - * Get fill color |
|
257 | - * |
|
258 | - * @return PHPExcel_Style_Color |
|
259 | - */ |
|
260 | - public function getFillColor() { |
|
261 | - return $this->_fillColor; |
|
262 | - } |
|
255 | + /** |
|
256 | + * Get fill color |
|
257 | + * |
|
258 | + * @return PHPExcel_Style_Color |
|
259 | + */ |
|
260 | + public function getFillColor() { |
|
261 | + return $this->_fillColor; |
|
262 | + } |
|
263 | 263 | |
264 | - /** |
|
265 | - * Set Alignment |
|
266 | - * |
|
267 | - * @param string $pValue |
|
268 | - * @return PHPExcel_Comment |
|
269 | - */ |
|
270 | - public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) { |
|
264 | + /** |
|
265 | + * Set Alignment |
|
266 | + * |
|
267 | + * @param string $pValue |
|
268 | + * @return PHPExcel_Comment |
|
269 | + */ |
|
270 | + public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) { |
|
271 | 271 | $this->_alignment = $pValue; |
272 | 272 | return $this; |
273 | - } |
|
273 | + } |
|
274 | 274 | |
275 | - /** |
|
276 | - * Get Alignment |
|
277 | - * |
|
278 | - * @return string |
|
279 | - */ |
|
280 | - public function getAlignment() { |
|
275 | + /** |
|
276 | + * Get Alignment |
|
277 | + * |
|
278 | + * @return string |
|
279 | + */ |
|
280 | + public function getAlignment() { |
|
281 | 281 | return $this->_alignment; |
282 | - } |
|
282 | + } |
|
283 | 283 | |
284 | 284 | /** |
285 | 285 | * Get hash code |
@@ -287,19 +287,19 @@ discard block |
||
287 | 287 | * @return string Hash code |
288 | 288 | */ |
289 | 289 | public function getHashCode() { |
290 | - return md5( |
|
291 | - $this->_author |
|
292 | - . $this->_text->getHashCode() |
|
293 | - . $this->_width |
|
294 | - . $this->_height |
|
295 | - . $this->_marginLeft |
|
296 | - . $this->_marginTop |
|
297 | - . ($this->_visible ? 1 : 0) |
|
298 | - . $this->_fillColor->getHashCode() |
|
299 | - . $this->_alignment |
|
300 | - . __CLASS__ |
|
301 | - ); |
|
302 | - } |
|
290 | + return md5( |
|
291 | + $this->_author |
|
292 | + . $this->_text->getHashCode() |
|
293 | + . $this->_width |
|
294 | + . $this->_height |
|
295 | + . $this->_marginLeft |
|
296 | + . $this->_marginTop |
|
297 | + . ($this->_visible ? 1 : 0) |
|
298 | + . $this->_fillColor->getHashCode() |
|
299 | + . $this->_alignment |
|
300 | + . __CLASS__ |
|
301 | + ); |
|
302 | + } |
|
303 | 303 | |
304 | 304 | /** |
305 | 305 | * Implement PHP __clone to create a deep clone, not just a shallow copy. |
@@ -106,10 +106,10 @@ |
||
106 | 106 | public function __construct() |
107 | 107 | { |
108 | 108 | // Initialise variables |
109 | - $this->_author = 'Author'; |
|
110 | - $this->_text = new PHPExcel_RichText(); |
|
111 | - $this->_fillColor = new PHPExcel_Style_Color('FFFFFFE1'); |
|
112 | - $this->_alignment = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL; |
|
109 | + $this->_author = 'Author'; |
|
110 | + $this->_text = new PHPExcel_RichText(); |
|
111 | + $this->_fillColor = new PHPExcel_Style_Color('FFFFFFE1'); |
|
112 | + $this->_alignment = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |