@@ -45,11 +45,11 @@ |
||
45 | 45 | */ |
46 | 46 | private $height = -1; |
47 | 47 | |
48 | - /** |
|
49 | - * ZeroHeight for Row? |
|
50 | - * |
|
51 | - * @var bool |
|
52 | - */ |
|
48 | + /** |
|
49 | + * ZeroHeight for Row? |
|
50 | + * |
|
51 | + * @var bool |
|
52 | + */ |
|
53 | 53 | private $zeroHeight = false; |
54 | 54 | |
55 | 55 | /** |
@@ -207,27 +207,27 @@ |
||
207 | 207 | private $scale = 100; |
208 | 208 | |
209 | 209 | /** |
210 | - * Fit To Page |
|
211 | - * Whether scale or fitToWith / fitToHeight applies |
|
212 | - * |
|
213 | - * @var boolean |
|
214 | - */ |
|
210 | + * Fit To Page |
|
211 | + * Whether scale or fitToWith / fitToHeight applies |
|
212 | + * |
|
213 | + * @var boolean |
|
214 | + */ |
|
215 | 215 | private $fitToPage = false; |
216 | 216 | |
217 | 217 | /** |
218 | - * Fit To Height |
|
219 | - * Number of vertical pages to fit on |
|
220 | - * |
|
221 | - * @var int? |
|
222 | - */ |
|
218 | + * Fit To Height |
|
219 | + * Number of vertical pages to fit on |
|
220 | + * |
|
221 | + * @var int? |
|
222 | + */ |
|
223 | 223 | private $fitToHeight = 1; |
224 | 224 | |
225 | 225 | /** |
226 | - * Fit To Width |
|
227 | - * Number of horizontal pages to fit on |
|
228 | - * |
|
229 | - * @var int? |
|
230 | - */ |
|
226 | + * Fit To Width |
|
227 | + * Number of horizontal pages to fit on |
|
228 | + * |
|
229 | + * @var int? |
|
230 | + */ |
|
231 | 231 | private $fitToWidth = 1; |
232 | 232 | |
233 | 233 | /** |
@@ -466,8 +466,8 @@ |
||
466 | 466 | */ |
467 | 467 | public function setShadow(Drawing\Shadow $pValue = null) |
468 | 468 | { |
469 | - $this->shadow = $pValue; |
|
470 | - return $this; |
|
469 | + $this->shadow = $pValue; |
|
470 | + return $this; |
|
471 | 471 | } |
472 | 472 | |
473 | 473 | /** |
@@ -711,8 +711,8 @@ |
||
711 | 711 | ? AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN |
712 | 712 | : AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN; |
713 | 713 | $ruleValues[] = array('operator' => $operator, |
714 | - 'value' => $average |
|
715 | - ); |
|
714 | + 'value' => $average |
|
715 | + ); |
|
716 | 716 | $columnFilterTests[$columnID] = array( |
717 | 717 | 'method' => 'filterTestInCustomDataSet', |
718 | 718 | 'arguments' => array('filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR) |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | return $this; |
196 | 196 | } |
197 | 197 | |
198 | - /** |
|
198 | + /** |
|
199 | 199 | * Get Shadow alignment |
200 | 200 | * |
201 | 201 | * @return int |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | return $this; |
218 | 218 | } |
219 | 219 | |
220 | - /** |
|
220 | + /** |
|
221 | 221 | * Get Color |
222 | 222 | * |
223 | 223 | * @return \PHPExcel\Style\Color |
@@ -236,11 +236,11 @@ discard block |
||
236 | 236 | */ |
237 | 237 | public function setColor(\PHPExcel\Style\Color $pValue = null) |
238 | 238 | { |
239 | - $this->color = $pValue; |
|
240 | - return $this; |
|
239 | + $this->color = $pValue; |
|
240 | + return $this; |
|
241 | 241 | } |
242 | 242 | |
243 | - /** |
|
243 | + /** |
|
244 | 244 | * Get Alpha |
245 | 245 | * |
246 | 246 | * @return int |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | 'NULL' => null |
263 | 263 | ); |
264 | 264 | |
265 | - // PHPExcel functions |
|
265 | + // PHPExcel functions |
|
266 | 266 | private static $PHPExcelFunctions = array( |
267 | 267 | 'ABS' => array( |
268 | 268 | 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, |
@@ -3137,13 +3137,13 @@ discard block |
||
3137 | 3137 | $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null; |
3138 | 3138 | |
3139 | 3139 | $regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION. |
3140 | - '|'.self::CALCULATION_REGEXP_CELLREF. |
|
3141 | - '|'.self::CALCULATION_REGEXP_NUMBER. |
|
3142 | - '|'.self::CALCULATION_REGEXP_STRING. |
|
3143 | - '|'.self::CALCULATION_REGEXP_OPENBRACE. |
|
3144 | - '|'.self::CALCULATION_REGEXP_NAMEDRANGE. |
|
3145 | - '|'.self::CALCULATION_REGEXP_ERROR. |
|
3146 | - ')/si'; |
|
3140 | + '|'.self::CALCULATION_REGEXP_CELLREF. |
|
3141 | + '|'.self::CALCULATION_REGEXP_NUMBER. |
|
3142 | + '|'.self::CALCULATION_REGEXP_STRING. |
|
3143 | + '|'.self::CALCULATION_REGEXP_OPENBRACE. |
|
3144 | + '|'.self::CALCULATION_REGEXP_NAMEDRANGE. |
|
3145 | + '|'.self::CALCULATION_REGEXP_ERROR. |
|
3146 | + ')/si'; |
|
3147 | 3147 | |
3148 | 3148 | // Start with initialisation |
3149 | 3149 | $index = 0; |
@@ -573,7 +573,7 @@ discard block |
||
573 | 573 | // Verify if cell is in range |
574 | 574 | return (($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) && |
575 | 575 | ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow) |
576 | - ); |
|
576 | + ); |
|
577 | 577 | } |
578 | 578 | |
579 | 579 | /** |
@@ -845,11 +845,11 @@ discard block |
||
845 | 845 | $_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex); |
846 | 846 | } elseif ($pColumnIndex < 702) { |
847 | 847 | $_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) . |
848 | - chr(65 + $pColumnIndex % 26); |
|
848 | + chr(65 + $pColumnIndex % 26); |
|
849 | 849 | } else { |
850 | 850 | $_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) . |
851 | - chr(65 + ((($pColumnIndex - 26) % 676) / 26)) . |
|
852 | - chr(65 + $pColumnIndex % 26); |
|
851 | + chr(65 + ((($pColumnIndex - 26) % 676) / 26)) . |
|
852 | + chr(65 + $pColumnIndex % 26); |
|
853 | 853 | } |
854 | 854 | } |
855 | 855 | return $_indexCache[$pColumnIndex]; |
@@ -12,15 +12,15 @@ discard block |
||
12 | 12 | class GridLines extends Properties |
13 | 13 | { |
14 | 14 | |
15 | - /** |
|
16 | - * Properties of Class: |
|
17 | - * Object State (State for Minor Tick Mark) @var bool |
|
18 | - * Line Properties @var array of mixed |
|
19 | - * Shadow Properties @var array of mixed |
|
20 | - * Glow Properties @var array of mixed |
|
21 | - * Soft Properties @var array of mixed |
|
22 | - * |
|
23 | - */ |
|
15 | + /** |
|
16 | + * Properties of Class: |
|
17 | + * Object State (State for Minor Tick Mark) @var bool |
|
18 | + * Line Properties @var array of mixed |
|
19 | + * Shadow Properties @var array of mixed |
|
20 | + * Glow Properties @var array of mixed |
|
21 | + * Soft Properties @var array of mixed |
|
22 | + * |
|
23 | + */ |
|
24 | 24 | |
25 | 25 | private $objectState = false; |
26 | 26 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | private $softEdges = array( |
82 | 82 | 'size' => null |
83 | - ); |
|
83 | + ); |
|
84 | 84 | |
85 | 85 | /** |
86 | 86 | * Get Object State |
@@ -100,65 +100,65 @@ discard block |
||
100 | 100 | private $cellStyleXfCollection = array(); |
101 | 101 | |
102 | 102 | /** |
103 | - * hasMacros : this workbook have macros ? |
|
104 | - * |
|
105 | - * @var bool |
|
106 | - */ |
|
103 | + * hasMacros : this workbook have macros ? |
|
104 | + * |
|
105 | + * @var bool |
|
106 | + */ |
|
107 | 107 | private $hasMacros = false; |
108 | 108 | |
109 | 109 | /** |
110 | - * macrosCode : all macros code (the vbaProject.bin file, this include form, code, etc.), null if no macro |
|
111 | - * |
|
112 | - * @var binary |
|
113 | - */ |
|
110 | + * macrosCode : all macros code (the vbaProject.bin file, this include form, code, etc.), null if no macro |
|
111 | + * |
|
112 | + * @var binary |
|
113 | + */ |
|
114 | 114 | private $macrosCode; |
115 | 115 | /** |
116 | - * macrosCertificate : if macros are signed, contains vbaProjectSignature.bin file, null if not signed |
|
117 | - * |
|
118 | - * @var binary |
|
119 | - */ |
|
116 | + * macrosCertificate : if macros are signed, contains vbaProjectSignature.bin file, null if not signed |
|
117 | + * |
|
118 | + * @var binary |
|
119 | + */ |
|
120 | 120 | private $macrosCertificate; |
121 | 121 | |
122 | 122 | /** |
123 | - * ribbonXMLData : null if workbook is'nt Excel 2007 or not contain a customized UI |
|
124 | - * |
|
125 | - * @var null|string |
|
126 | - */ |
|
123 | + * ribbonXMLData : null if workbook is'nt Excel 2007 or not contain a customized UI |
|
124 | + * |
|
125 | + * @var null|string |
|
126 | + */ |
|
127 | 127 | private $ribbonXMLData; |
128 | 128 | |
129 | 129 | /** |
130 | - * ribbonBinObjects : null if workbook is'nt Excel 2007 or not contain embedded objects (picture(s)) for Ribbon Elements |
|
131 | - * ignored if $ribbonXMLData is null |
|
132 | - * |
|
133 | - * @var null|array |
|
134 | - */ |
|
130 | + * ribbonBinObjects : null if workbook is'nt Excel 2007 or not contain embedded objects (picture(s)) for Ribbon Elements |
|
131 | + * ignored if $ribbonXMLData is null |
|
132 | + * |
|
133 | + * @var null|array |
|
134 | + */ |
|
135 | 135 | private $ribbonBinObjects; |
136 | 136 | |
137 | 137 | /** |
138 | - * The workbook has macros ? |
|
139 | - * |
|
140 | - * @return true if workbook has macros, false if not |
|
141 | - */ |
|
138 | + * The workbook has macros ? |
|
139 | + * |
|
140 | + * @return true if workbook has macros, false if not |
|
141 | + */ |
|
142 | 142 | public function hasMacros() |
143 | 143 | { |
144 | 144 | return $this->hasMacros; |
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
148 | - * Define if a workbook has macros |
|
149 | - * |
|
150 | - * @param boolean $hasMacros true|false |
|
151 | - */ |
|
148 | + * Define if a workbook has macros |
|
149 | + * |
|
150 | + * @param boolean $hasMacros true|false |
|
151 | + */ |
|
152 | 152 | public function setHasMacros($hasMacros = false) |
153 | 153 | { |
154 | 154 | $this->hasMacros = (bool) $hasMacros; |
155 | 155 | } |
156 | 156 | |
157 | 157 | /** |
158 | - * Set the macros code |
|
159 | - * |
|
160 | - * @param string $macroCode string|null |
|
161 | - */ |
|
158 | + * Set the macros code |
|
159 | + * |
|
160 | + * @param string $macroCode string|null |
|
161 | + */ |
|
162 | 162 | public function setMacrosCode($macroCode = null) |
163 | 163 | { |
164 | 164 | $this->macrosCode = $macroCode; |
@@ -166,49 +166,49 @@ discard block |
||
166 | 166 | } |
167 | 167 | |
168 | 168 | /** |
169 | - * Return the macros code |
|
170 | - * |
|
171 | - * @return string|null |
|
172 | - */ |
|
169 | + * Return the macros code |
|
170 | + * |
|
171 | + * @return string|null |
|
172 | + */ |
|
173 | 173 | public function getMacrosCode() |
174 | 174 | { |
175 | 175 | return $this->macrosCode; |
176 | 176 | } |
177 | 177 | |
178 | 178 | /** |
179 | - * Set the macros certificate |
|
180 | - * |
|
181 | - * @param string|null $Certificate |
|
182 | - */ |
|
179 | + * Set the macros certificate |
|
180 | + * |
|
181 | + * @param string|null $Certificate |
|
182 | + */ |
|
183 | 183 | public function setMacrosCertificate($certificate = null) |
184 | 184 | { |
185 | 185 | $this->macrosCertificate = $certificate; |
186 | 186 | } |
187 | 187 | |
188 | 188 | /** |
189 | - * Is the project signed ? |
|
190 | - * |
|
191 | - * @return boolean true|false |
|
192 | - */ |
|
189 | + * Is the project signed ? |
|
190 | + * |
|
191 | + * @return boolean true|false |
|
192 | + */ |
|
193 | 193 | public function hasMacrosCertificate() |
194 | 194 | { |
195 | 195 | return !is_null($this->macrosCertificate); |
196 | 196 | } |
197 | 197 | |
198 | 198 | /** |
199 | - * Return the macros certificate |
|
200 | - * |
|
201 | - * @return string|null |
|
202 | - */ |
|
199 | + * Return the macros certificate |
|
200 | + * |
|
201 | + * @return string|null |
|
202 | + */ |
|
203 | 203 | public function getMacrosCertificate() |
204 | 204 | { |
205 | 205 | return $this->macrosCertificate; |
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
209 | - * Remove all macros, certificate from spreadsheet |
|
210 | - * |
|
211 | - */ |
|
209 | + * Remove all macros, certificate from spreadsheet |
|
210 | + * |
|
211 | + */ |
|
212 | 212 | public function discardMacros() |
213 | 213 | { |
214 | 214 | $this->hasMacros = false; |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
220 | - * set ribbon XML data |
|
221 | - * |
|
222 | - */ |
|
220 | + * set ribbon XML data |
|
221 | + * |
|
222 | + */ |
|
223 | 223 | public function setRibbonXMLData($target = null, $xmlData = null) |
224 | 224 | { |
225 | 225 | if (!is_null($target) && !is_null($xmlData)) { |
@@ -230,10 +230,10 @@ discard block |
||
230 | 230 | } |
231 | 231 | |
232 | 232 | /** |
233 | - * retrieve ribbon XML Data |
|
234 | - * |
|
235 | - * return string|null|array |
|
236 | - */ |
|
233 | + * retrieve ribbon XML Data |
|
234 | + * |
|
235 | + * return string|null|array |
|
236 | + */ |
|
237 | 237 | public function getRibbonXMLData($what = 'all') //we need some constants here... |
238 | 238 | { |
239 | 239 | $returnData = null; |
@@ -254,9 +254,9 @@ discard block |
||
254 | 254 | } |
255 | 255 | |
256 | 256 | /** |
257 | - * store binaries ribbon objects (pictures) |
|
258 | - * |
|
259 | - */ |
|
257 | + * store binaries ribbon objects (pictures) |
|
258 | + * |
|
259 | + */ |
|
260 | 260 | public function setRibbonBinObjects($BinObjectsNames = null, $BinObjectsData = null) |
261 | 261 | { |
262 | 262 | if (!is_null($BinObjectsNames) && !is_null($BinObjectsData)) { |
@@ -266,18 +266,18 @@ discard block |
||
266 | 266 | } |
267 | 267 | } |
268 | 268 | /** |
269 | - * return the extension of a filename. Internal use for a array_map callback (php<5.3 don't like lambda function) |
|
270 | - * |
|
271 | - */ |
|
269 | + * return the extension of a filename. Internal use for a array_map callback (php<5.3 don't like lambda function) |
|
270 | + * |
|
271 | + */ |
|
272 | 272 | private function getExtensionOnly($ThePath) |
273 | 273 | { |
274 | 274 | return pathinfo($ThePath, PATHINFO_EXTENSION); |
275 | 275 | } |
276 | 276 | |
277 | 277 | /** |
278 | - * retrieve Binaries Ribbon Objects |
|
279 | - * |
|
280 | - */ |
|
278 | + * retrieve Binaries Ribbon Objects |
|
279 | + * |
|
280 | + */ |
|
281 | 281 | public function getRibbonBinObjects($What = 'all') |
282 | 282 | { |
283 | 283 | $ReturnData = null; |
@@ -306,20 +306,20 @@ discard block |
||
306 | 306 | } |
307 | 307 | |
308 | 308 | /** |
309 | - * This workbook have a custom UI ? |
|
310 | - * |
|
311 | - * @return true|false |
|
312 | - */ |
|
309 | + * This workbook have a custom UI ? |
|
310 | + * |
|
311 | + * @return true|false |
|
312 | + */ |
|
313 | 313 | public function hasRibbon() |
314 | 314 | { |
315 | 315 | return !is_null($this->ribbonXMLData); |
316 | 316 | } |
317 | 317 | |
318 | 318 | /** |
319 | - * This workbook have additionnal object for the ribbon ? |
|
320 | - * |
|
321 | - * @return true|false |
|
322 | - */ |
|
319 | + * This workbook have additionnal object for the ribbon ? |
|
320 | + * |
|
321 | + * @return true|false |
|
322 | + */ |
|
323 | 323 | public function hasRibbonBinObjects() |
324 | 324 | { |
325 | 325 | return !is_null($this->ribbonBinObjects); |
@@ -354,9 +354,9 @@ discard block |
||
354 | 354 | return null; |
355 | 355 | } |
356 | 356 | |
357 | - /** |
|
358 | - * Create a new PHPExcel with one Worksheet |
|
359 | - */ |
|
357 | + /** |
|
358 | + * Create a new PHPExcel with one Worksheet |
|
359 | + */ |
|
360 | 360 | public function __construct() |
361 | 361 | { |
362 | 362 | $this->uniqueID = uniqid(); |