← All changes
|
vendor/phpoffice/phpexcel/Classes/PHPExcel/Cell/DataValidation.php
+106
-126
3.1.2
→
3.0.10
View file →
| @@ -1,10 +1,9 @@ | ||
| 1 | 1 | <?php |
| 2 | - | |
| 3 | 2 | /** |
| 4 | - * PHPExcel_Cell_DataValidation | |
| 3 | + * PHPExcel | |
| 5 | 4 | * |
| 6 | - * Copyright (c) 2006 - 2015 PHPExcel | |
| 5 | + * Copyright (c) 2006 - 2014 PHPExcel | |
| 7 | 6 | * |
| 8 | 7 | * This library is free software; you can redistribute it and/or |
| 9 | 8 | * modify it under the terms of the GNU Lesser General Public |
| 10 | 9 | * License as published by the Free Software Foundation; either |
| @@ -20,12 +19,21 @@ | ||
| 20 | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 21 | 20 | * |
| 22 | 21 | * @category PHPExcel |
| 23 | 22 | * @package PHPExcel_Cell |
| 24 | - * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) | |
| 23 | + * @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel) | |
| 25 | 24 | * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL |
| 26 | 25 | * @version ##VERSION##, ##DATE## |
| 27 | 26 | */ |
| 27 | + | |
| 28 | + | |
| 29 | +/** | |
| 30 | + * PHPExcel_Cell_DataValidation | |
| 31 | + * | |
| 32 | + * @category PHPExcel | |
| 33 | + * @package PHPExcel_Cell | |
| 34 | + * @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel) | |
| 35 | + */ | |
| 28 | 36 | class PHPExcel_Cell_DataValidation |
| 29 | 37 | { |
| 30 | 38 | /* Data validation types */ |
| 31 | 39 | const TYPE_NONE = 'none'; |
| @@ -56,9 +64,9 @@ | ||
| 56 | 64 | * Formula 1 |
| 57 | 65 | * |
| 58 | 66 | * @var string |
| 59 | 67 | */ |
| 60 | - private $formula1; | |
| 68 | + private $_formula1; | |
| 61 | 69 | |
| 62 | 70 | /** |
| 63 | 71 | * Formula 2 |
| 64 | 72 | * |
| @@ -63,9 +71,9 @@ | ||
| 63 | 71 | * Formula 2 |
| 64 | 72 | * |
| 65 | 73 | * @var string |
| 66 | 74 | */ |
| 67 | - private $formula2; | |
| 75 | + private $_formula2; | |
| 68 | 76 | |
| 69 | 77 | /** |
| 70 | 78 | * Type |
| 71 | 79 | * |
| @@ -70,9 +78,9 @@ | ||
| 70 | 78 | * Type |
| 71 | 79 | * |
| 72 | 80 | * @var string |
| 73 | 81 | */ |
| 74 | - private $type = PHPExcel_Cell_DataValidation::TYPE_NONE; | |
| 82 | + private $_type = PHPExcel_Cell_DataValidation::TYPE_NONE; | |
| 75 | 83 | |
| 76 | 84 | /** |
| 77 | 85 | * Error style |
| 78 | 86 | * |
| @@ -77,9 +85,9 @@ | ||
| 77 | 85 | * Error style |
| 78 | 86 | * |
| 79 | 87 | * @var string |
| 80 | 88 | */ |
| 81 | - private $errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP; | |
| 89 | + private $_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP; | |
| 82 | 90 | |
| 83 | 91 | /** |
| 84 | 92 | * Operator |
| 85 | 93 | * |
| @@ -84,9 +92,9 @@ | ||
| 84 | 92 | * Operator |
| 85 | 93 | * |
| 86 | 94 | * @var string |
| 87 | 95 | */ |
| 88 | - private $operator; | |
| 96 | + private $_operator; | |
| 89 | 97 | |
| 90 | 98 | /** |
| 91 | 99 | * Allow Blank |
| 92 | 100 | * |
| @@ -91,9 +99,9 @@ | ||
| 91 | 99 | * Allow Blank |
| 92 | 100 | * |
| 93 | 101 | * @var boolean |
| 94 | 102 | */ |
| 95 | - private $allowBlank; | |
| 103 | + private $_allowBlank; | |
| 96 | 104 | |
| 97 | 105 | /** |
| 98 | 106 | * Show DropDown |
| 99 | 107 | * |
| @@ -98,9 +106,9 @@ | ||
| 98 | 106 | * Show DropDown |
| 99 | 107 | * |
| 100 | 108 | * @var boolean |
| 101 | 109 | */ |
| 102 | - private $showDropDown; | |
| 110 | + private $_showDropDown; | |
| 103 | 111 | |
| 104 | 112 | /** |
| 105 | 113 | * Show InputMessage |
| 106 | 114 | * |
| @@ -105,9 +113,9 @@ | ||
| 105 | 113 | * Show InputMessage |
| 106 | 114 | * |
| 107 | 115 | * @var boolean |
| 108 | 116 | */ |
| 109 | - private $showInputMessage; | |
| 117 | + private $_showInputMessage; | |
| 110 | 118 | |
| 111 | 119 | /** |
| 112 | 120 | * Show ErrorMessage |
| 113 | 121 | * |
| @@ -112,9 +120,9 @@ | ||
| 112 | 120 | * Show ErrorMessage |
| 113 | 121 | * |
| 114 | 122 | * @var boolean |
| 115 | 123 | */ |
| 116 | - private $showErrorMessage; | |
| 124 | + private $_showErrorMessage; | |
| 117 | 125 | |
| 118 | 126 | /** |
| 119 | 127 | * Error title |
| 120 | 128 | * |
| @@ -119,9 +127,9 @@ | ||
| 119 | 127 | * Error title |
| 120 | 128 | * |
| 121 | 129 | * @var string |
| 122 | 130 | */ |
| 123 | - private $errorTitle; | |
| 131 | + private $_errorTitle; | |
| 124 | 132 | |
| 125 | 133 | /** |
| 126 | 134 | * Error |
| 127 | 135 | * |
| @@ -126,9 +134,9 @@ | ||
| 126 | 134 | * Error |
| 127 | 135 | * |
| 128 | 136 | * @var string |
| 129 | 137 | */ |
| 130 | - private $error; | |
| 138 | + private $_error; | |
| 131 | 139 | |
| 132 | 140 | /** |
| 133 | 141 | * Prompt title |
| 134 | 142 | * |
| @@ -133,9 +141,9 @@ | ||
| 133 | 141 | * Prompt title |
| 134 | 142 | * |
| 135 | 143 | * @var string |
| 136 | 144 | */ |
| 137 | - private $promptTitle; | |
| 145 | + private $_promptTitle; | |
| 138 | 146 | |
| 139 | 147 | /** |
| 140 | 148 | * Prompt |
| 141 | 149 | * |
| @@ -140,9 +148,9 @@ | ||
| 140 | 148 | * Prompt |
| 141 | 149 | * |
| 142 | 150 | * @var string |
| 143 | 151 | */ |
| 144 | - private $prompt; | |
| 152 | + private $_prompt; | |
| 145 | 153 | |
| 146 | 154 | /** |
| 147 | 155 | * Create a new PHPExcel_Cell_DataValidation |
| 148 | 156 | */ |
| @@ -148,21 +156,21 @@ | ||
| 148 | 156 | */ |
| 149 | 157 | public function __construct() |
| 150 | 158 | { |
| 151 | 159 | // Initialise member variables |
| 152 | - $this->formula1 = ''; | |
| 153 | - $this->formula2 = ''; | |
| 154 | - $this->type = PHPExcel_Cell_DataValidation::TYPE_NONE; | |
| 155 | - $this->errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP; | |
| 156 | - $this->operator = ''; | |
| 157 | - $this->allowBlank = false; | |
| 158 | - $this->showDropDown = false; | |
| 159 | - $this->showInputMessage = false; | |
| 160 | - $this->showErrorMessage = false; | |
| 161 | - $this->errorTitle = ''; | |
| 162 | - $this->error = ''; | |
| 163 | - $this->promptTitle = ''; | |
| 164 | - $this->prompt = ''; | |
| 160 | + $this->_formula1 = ''; | |
| 161 | + $this->_formula2 = ''; | |
| 162 | + $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE; | |
| 163 | + $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP; | |
| 164 | + $this->_operator = ''; | |
| 165 | + $this->_allowBlank = FALSE; | |
| 166 | + $this->_showDropDown = FALSE; | |
| 167 | + $this->_showInputMessage = FALSE; | |
| 168 | + $this->_showErrorMessage = FALSE; | |
| 169 | + $this->_errorTitle = ''; | |
| 170 | + $this->_error = ''; | |
| 171 | + $this->_promptTitle = ''; | |
| 172 | + $this->_prompt = ''; | |
| 165 | 173 | } |
| 166 | 174 | |
| 167 | 175 | /** |
| 168 | 176 | * Get Formula 1 |
| @@ -168,11 +176,10 @@ | ||
| 168 | 176 | * Get Formula 1 |
| 169 | 177 | * |
| 170 | 178 | * @return string |
| 171 | 179 | */ |
| 172 | - public function getFormula1() | |
| 173 | - { | |
| 174 | - return $this->formula1; | |
| 180 | + public function getFormula1() { | |
| 181 | + return $this->_formula1; | |
| 175 | 182 | } |
| 176 | 183 | |
| 177 | 184 | /** |
| 178 | 185 | * Set Formula 1 |
| @@ -179,11 +186,10 @@ | ||
| 179 | 186 | * |
| 180 | 187 | * @param string $value |
| 181 | 188 | * @return PHPExcel_Cell_DataValidation |
| 182 | 189 | */ |
| 183 | - public function setFormula1($value = '') | |
| 184 | - { | |
| 185 | - $this->formula1 = $value; | |
| 190 | + public function setFormula1($value = '') { | |
| 191 | + $this->_formula1 = $value; | |
| 186 | 192 | return $this; |
| 187 | 193 | } |
| 188 | 194 | |
| 189 | 195 | /** |
| @@ -190,11 +196,10 @@ | ||
| 190 | 196 | * Get Formula 2 |
| 191 | 197 | * |
| 192 | 198 | * @return string |
| 193 | 199 | */ |
| 194 | - public function getFormula2() | |
| 195 | - { | |
| 196 | - return $this->formula2; | |
| 200 | + public function getFormula2() { | |
| 201 | + return $this->_formula2; | |
| 197 | 202 | } |
| 198 | 203 | |
| 199 | 204 | /** |
| 200 | 205 | * Set Formula 2 |
| @@ -201,11 +206,10 @@ | ||
| 201 | 206 | * |
| 202 | 207 | * @param string $value |
| 203 | 208 | * @return PHPExcel_Cell_DataValidation |
| 204 | 209 | */ |
| 205 | - public function setFormula2($value = '') | |
| 206 | - { | |
| 207 | - $this->formula2 = $value; | |
| 210 | + public function setFormula2($value = '') { | |
| 211 | + $this->_formula2 = $value; | |
| 208 | 212 | return $this; |
| 209 | 213 | } |
| 210 | 214 | |
| 211 | 215 | /** |
| @@ -212,11 +216,10 @@ | ||
| 212 | 216 | * Get Type |
| 213 | 217 | * |
| 214 | 218 | * @return string |
| 215 | 219 | */ |
| 216 | - public function getType() | |
| 217 | - { | |
| 218 | - return $this->type; | |
| 220 | + public function getType() { | |
| 221 | + return $this->_type; | |
| 219 | 222 | } |
| 220 | 223 | |
| 221 | 224 | /** |
| 222 | 225 | * Set Type |
| @@ -223,11 +226,10 @@ | ||
| 223 | 226 | * |
| 224 | 227 | * @param string $value |
| 225 | 228 | * @return PHPExcel_Cell_DataValidation |
| 226 | 229 | */ |
| 227 | - public function setType($value = PHPExcel_Cell_DataValidation::TYPE_NONE) | |
| 228 | - { | |
| 229 | - $this->type = $value; | |
| 230 | + public function setType($value = PHPExcel_Cell_DataValidation::TYPE_NONE) { | |
| 231 | + $this->_type = $value; | |
| 230 | 232 | return $this; |
| 231 | 233 | } |
| 232 | 234 | |
| 233 | 235 | /** |
| @@ -234,11 +236,10 @@ | ||
| 234 | 236 | * Get Error style |
| 235 | 237 | * |
| 236 | 238 | * @return string |
| 237 | 239 | */ |
| 238 | - public function getErrorStyle() | |
| 239 | - { | |
| 240 | - return $this->errorStyle; | |
| 240 | + public function getErrorStyle() { | |
| 241 | + return $this->_errorStyle; | |
| 241 | 242 | } |
| 242 | 243 | |
| 243 | 244 | /** |
| 244 | 245 | * Set Error style |
| @@ -245,11 +246,10 @@ | ||
| 245 | 246 | * |
| 246 | 247 | * @param string $value |
| 247 | 248 | * @return PHPExcel_Cell_DataValidation |
| 248 | 249 | */ |
| 249 | - public function setErrorStyle($value = PHPExcel_Cell_DataValidation::STYLE_STOP) | |
| 250 | - { | |
| 251 | - $this->errorStyle = $value; | |
| 250 | + public function setErrorStyle($value = PHPExcel_Cell_DataValidation::STYLE_STOP) { | |
| 251 | + $this->_errorStyle = $value; | |
| 252 | 252 | return $this; |
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | /** |
| @@ -256,11 +256,10 @@ | ||
| 256 | 256 | * Get Operator |
| 257 | 257 | * |
| 258 | 258 | * @return string |
| 259 | 259 | */ |
| 260 | - public function getOperator() | |
| 261 | - { | |
| 262 | - return $this->operator; | |
| 260 | + public function getOperator() { | |
| 261 | + return $this->_operator; | |
| 263 | 262 | } |
| 264 | 263 | |
| 265 | 264 | /** |
| 266 | 265 | * Set Operator |
| @@ -267,11 +266,10 @@ | ||
| 267 | 266 | * |
| 268 | 267 | * @param string $value |
| 269 | 268 | * @return PHPExcel_Cell_DataValidation |
| 270 | 269 | */ |
| 271 | - public function setOperator($value = '') | |
| 272 | - { | |
| 273 | - $this->operator = $value; | |
| 270 | + public function setOperator($value = '') { | |
| 271 | + $this->_operator = $value; | |
| 274 | 272 | return $this; |
| 275 | 273 | } |
| 276 | 274 | |
| 277 | 275 | /** |
| @@ -278,11 +276,10 @@ | ||
| 278 | 276 | * Get Allow Blank |
| 279 | 277 | * |
| 280 | 278 | * @return boolean |
| 281 | 279 | */ |
| 282 | - public function getAllowBlank() | |
| 283 | - { | |
| 284 | - return $this->allowBlank; | |
| 280 | + public function getAllowBlank() { | |
| 281 | + return $this->_allowBlank; | |
| 285 | 282 | } |
| 286 | 283 | |
| 287 | 284 | /** |
| 288 | 285 | * Set Allow Blank |
| @@ -289,11 +286,10 @@ | ||
| 289 | 286 | * |
| 290 | 287 | * @param boolean $value |
| 291 | 288 | * @return PHPExcel_Cell_DataValidation |
| 292 | 289 | */ |
| 293 | - public function setAllowBlank($value = false) | |
| 294 | - { | |
| 295 | - $this->allowBlank = $value; | |
| 290 | + public function setAllowBlank($value = false) { | |
| 291 | + $this->_allowBlank = $value; | |
| 296 | 292 | return $this; |
| 297 | 293 | } |
| 298 | 294 | |
| 299 | 295 | /** |
| @@ -300,11 +296,10 @@ | ||
| 300 | 296 | * Get Show DropDown |
| 301 | 297 | * |
| 302 | 298 | * @return boolean |
| 303 | 299 | */ |
| 304 | - public function getShowDropDown() | |
| 305 | - { | |
| 306 | - return $this->showDropDown; | |
| 300 | + public function getShowDropDown() { | |
| 301 | + return $this->_showDropDown; | |
| 307 | 302 | } |
| 308 | 303 | |
| 309 | 304 | /** |
| 310 | 305 | * Set Show DropDown |
| @@ -311,11 +306,10 @@ | ||
| 311 | 306 | * |
| 312 | 307 | * @param boolean $value |
| 313 | 308 | * @return PHPExcel_Cell_DataValidation |
| 314 | 309 | */ |
| 315 | - public function setShowDropDown($value = false) | |
| 316 | - { | |
| 317 | - $this->showDropDown = $value; | |
| 310 | + public function setShowDropDown($value = false) { | |
| 311 | + $this->_showDropDown = $value; | |
| 318 | 312 | return $this; |
| 319 | 313 | } |
| 320 | 314 | |
| 321 | 315 | /** |
| @@ -322,11 +316,10 @@ | ||
| 322 | 316 | * Get Show InputMessage |
| 323 | 317 | * |
| 324 | 318 | * @return boolean |
| 325 | 319 | */ |
| 326 | - public function getShowInputMessage() | |
| 327 | - { | |
| 328 | - return $this->showInputMessage; | |
| 320 | + public function getShowInputMessage() { | |
| 321 | + return $this->_showInputMessage; | |
| 329 | 322 | } |
| 330 | 323 | |
| 331 | 324 | /** |
| 332 | 325 | * Set Show InputMessage |
| @@ -333,11 +326,10 @@ | ||
| 333 | 326 | * |
| 334 | 327 | * @param boolean $value |
| 335 | 328 | * @return PHPExcel_Cell_DataValidation |
| 336 | 329 | */ |
| 337 | - public function setShowInputMessage($value = false) | |
| 338 | - { | |
| 339 | - $this->showInputMessage = $value; | |
| 330 | + public function setShowInputMessage($value = false) { | |
| 331 | + $this->_showInputMessage = $value; | |
| 340 | 332 | return $this; |
| 341 | 333 | } |
| 342 | 334 | |
| 343 | 335 | /** |
| @@ -344,11 +336,10 @@ | ||
| 344 | 336 | * Get Show ErrorMessage |
| 345 | 337 | * |
| 346 | 338 | * @return boolean |
| 347 | 339 | */ |
| 348 | - public function getShowErrorMessage() | |
| 349 | - { | |
| 350 | - return $this->showErrorMessage; | |
| 340 | + public function getShowErrorMessage() { | |
| 341 | + return $this->_showErrorMessage; | |
| 351 | 342 | } |
| 352 | 343 | |
| 353 | 344 | /** |
| 354 | 345 | * Set Show ErrorMessage |
| @@ -355,11 +346,10 @@ | ||
| 355 | 346 | * |
| 356 | 347 | * @param boolean $value |
| 357 | 348 | * @return PHPExcel_Cell_DataValidation |
| 358 | 349 | */ |
| 359 | - public function setShowErrorMessage($value = false) | |
| 360 | - { | |
| 361 | - $this->showErrorMessage = $value; | |
| 350 | + public function setShowErrorMessage($value = false) { | |
| 351 | + $this->_showErrorMessage = $value; | |
| 362 | 352 | return $this; |
| 363 | 353 | } |
| 364 | 354 | |
| 365 | 355 | /** |
| @@ -366,11 +356,10 @@ | ||
| 366 | 356 | * Get Error title |
| 367 | 357 | * |
| 368 | 358 | * @return string |
| 369 | 359 | */ |
| 370 | - public function getErrorTitle() | |
| 371 | - { | |
| 372 | - return $this->errorTitle; | |
| 360 | + public function getErrorTitle() { | |
| 361 | + return $this->_errorTitle; | |
| 373 | 362 | } |
| 374 | 363 | |
| 375 | 364 | /** |
| 376 | 365 | * Set Error title |
| @@ -377,11 +366,10 @@ | ||
| 377 | 366 | * |
| 378 | 367 | * @param string $value |
| 379 | 368 | * @return PHPExcel_Cell_DataValidation |
| 380 | 369 | */ |
| 381 | - public function setErrorTitle($value = '') | |
| 382 | - { | |
| 383 | - $this->errorTitle = $value; | |
| 370 | + public function setErrorTitle($value = '') { | |
| 371 | + $this->_errorTitle = $value; | |
| 384 | 372 | return $this; |
| 385 | 373 | } |
| 386 | 374 | |
| 387 | 375 | /** |
| @@ -388,11 +376,10 @@ | ||
| 388 | 376 | * Get Error |
| 389 | 377 | * |
| 390 | 378 | * @return string |
| 391 | 379 | */ |
| 392 | - public function getError() | |
| 393 | - { | |
| 394 | - return $this->error; | |
| 380 | + public function getError() { | |
| 381 | + return $this->_error; | |
| 395 | 382 | } |
| 396 | 383 | |
| 397 | 384 | /** |
| 398 | 385 | * Set Error |
| @@ -399,11 +386,10 @@ | ||
| 399 | 386 | * |
| 400 | 387 | * @param string $value |
| 401 | 388 | * @return PHPExcel_Cell_DataValidation |
| 402 | 389 | */ |
| 403 | - public function setError($value = '') | |
| 404 | - { | |
| 405 | - $this->error = $value; | |
| 390 | + public function setError($value = '') { | |
| 391 | + $this->_error = $value; | |
| 406 | 392 | return $this; |
| 407 | 393 | } |
| 408 | 394 | |
| 409 | 395 | /** |
| @@ -410,11 +396,10 @@ | ||
| 410 | 396 | * Get Prompt title |
| 411 | 397 | * |
| 412 | 398 | * @return string |
| 413 | 399 | */ |
| 414 | - public function getPromptTitle() | |
| 415 | - { | |
| 416 | - return $this->promptTitle; | |
| 400 | + public function getPromptTitle() { | |
| 401 | + return $this->_promptTitle; | |
| 417 | 402 | } |
| 418 | 403 | |
| 419 | 404 | /** |
| 420 | 405 | * Set Prompt title |
| @@ -421,11 +406,10 @@ | ||
| 421 | 406 | * |
| 422 | 407 | * @param string $value |
| 423 | 408 | * @return PHPExcel_Cell_DataValidation |
| 424 | 409 | */ |
| 425 | - public function setPromptTitle($value = '') | |
| 426 | - { | |
| 427 | - $this->promptTitle = $value; | |
| 410 | + public function setPromptTitle($value = '') { | |
| 411 | + $this->_promptTitle = $value; | |
| 428 | 412 | return $this; |
| 429 | 413 | } |
| 430 | 414 | |
| 431 | 415 | /** |
| @@ -432,11 +416,10 @@ | ||
| 432 | 416 | * Get Prompt |
| 433 | 417 | * |
| 434 | 418 | * @return string |
| 435 | 419 | */ |
| 436 | - public function getPrompt() | |
| 437 | - { | |
| 438 | - return $this->prompt; | |
| 420 | + public function getPrompt() { | |
| 421 | + return $this->_prompt; | |
| 439 | 422 | } |
| 440 | 423 | |
| 441 | 424 | /** |
| 442 | 425 | * Set Prompt |
| @@ -443,11 +426,10 @@ | ||
| 443 | 426 | * |
| 444 | 427 | * @param string $value |
| 445 | 428 | * @return PHPExcel_Cell_DataValidation |
| 446 | 429 | */ |
| 447 | - public function setPrompt($value = '') | |
| 448 | - { | |
| 449 | - $this->prompt = $value; | |
| 430 | + public function setPrompt($value = '') { | |
| 431 | + $this->_prompt = $value; | |
| 450 | 432 | return $this; |
| 451 | 433 | } |
| 452 | 434 | |
| 453 | 435 | /** |
| @@ -454,25 +436,24 @@ | ||
| 454 | 436 | * Get hash code |
| 455 | 437 | * |
| 456 | 438 | * @return string Hash code |
| 457 | 439 | */ |
| 458 | - public function getHashCode() | |
| 459 | - { | |
| 440 | + public function getHashCode() { | |
| 460 | 441 | return md5( |
| 461 | - $this->formula1 . | |
| 462 | - $this->formula2 . | |
| 463 | - $this->type = PHPExcel_Cell_DataValidation::TYPE_NONE . | |
| 464 | - $this->errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP . | |
| 465 | - $this->operator . | |
| 466 | - ($this->allowBlank ? 't' : 'f') . | |
| 467 | - ($this->showDropDown ? 't' : 'f') . | |
| 468 | - ($this->showInputMessage ? 't' : 'f') . | |
| 469 | - ($this->showErrorMessage ? 't' : 'f') . | |
| 470 | - $this->errorTitle . | |
| 471 | - $this->error . | |
| 472 | - $this->promptTitle . | |
| 473 | - $this->prompt . | |
| 474 | - __CLASS__ | |
| 442 | + $this->_formula1 | |
| 443 | + . $this->_formula2 | |
| 444 | + . $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE | |
| 445 | + . $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP | |
| 446 | + . $this->_operator | |
| 447 | + . ($this->_allowBlank ? 't' : 'f') | |
| 448 | + . ($this->_showDropDown ? 't' : 'f') | |
| 449 | + . ($this->_showInputMessage ? 't' : 'f') | |
| 450 | + . ($this->_showErrorMessage ? 't' : 'f') | |
| 451 | + . $this->_errorTitle | |
| 452 | + . $this->_error | |
| 453 | + . $this->_promptTitle | |
| 454 | + . $this->_prompt | |
| 455 | + . __CLASS__ | |
| 475 | 456 | ); |
| 476 | 457 | } |
| 477 | 458 | |
| 478 | 459 | /** |
| @@ -477,10 +458,9 @@ | ||
| 477 | 458 | |
| 478 | 459 | /** |
| 479 | 460 | * Implement PHP __clone to create a deep clone, not just a shallow copy. |
| 480 | 461 | */ |
| 481 | - public function __clone() | |
| 482 | - { | |
| 462 | + public function __clone() { | |
| 483 | 463 | $vars = get_object_vars($this); |
| 484 | 464 | foreach ($vars as $key => $value) { |
| 485 | 465 | if (is_object($value)) { |
| 486 | 466 | $this->$key = clone $value; |