@@ -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(); |
@@ -385,10 +385,10 @@ |
||
385 | 385 | } |
386 | 386 | |
387 | 387 | /** |
388 | - * Get SubScript |
|
389 | - * |
|
390 | - * @return boolean |
|
391 | - */ |
|
388 | + * Get SubScript |
|
389 | + * |
|
390 | + * @return boolean |
|
391 | + */ |
|
392 | 392 | public function getSubScript() |
393 | 393 | { |
394 | 394 | if ($this->isSupervisor) { |
@@ -250,8 +250,8 @@ |
||
250 | 250 | */ |
251 | 251 | public function setStyle(\PHPExcel\Style $pValue = null) |
252 | 252 | { |
253 | - $this->style = $pValue; |
|
254 | - return $this; |
|
253 | + $this->style = $pValue; |
|
254 | + return $this; |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | /** |
@@ -450,7 +450,7 @@ |
||
450 | 450 | if ($cell->getDataType() == Cell\DataType::TYPE_FORMULA) { |
451 | 451 | // Formula should be adjusted |
452 | 452 | $pSheet->getCell($newCoordinates) |
453 | - ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle())); |
|
453 | + ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle())); |
|
454 | 454 | } else { |
455 | 455 | // Formula should not be adjusted |
456 | 456 | $pSheet->getCell($newCoordinates)->setValue($cell->getValue()); |
@@ -215,17 +215,17 @@ discard block |
||
215 | 215 | private $showGridlines = true; |
216 | 216 | |
217 | 217 | /** |
218 | - * Print gridlines? |
|
219 | - * |
|
220 | - * @var boolean |
|
221 | - */ |
|
218 | + * Print gridlines? |
|
219 | + * |
|
220 | + * @var boolean |
|
221 | + */ |
|
222 | 222 | private $printGridlines = false; |
223 | 223 | |
224 | 224 | /** |
225 | - * Show row and column headers? |
|
226 | - * |
|
227 | - * @var boolean |
|
228 | - */ |
|
225 | + * Show row and column headers? |
|
226 | + * |
|
227 | + * @var boolean |
|
228 | + */ |
|
229 | 229 | private $showRowColHeaders = true; |
230 | 230 | |
231 | 231 | /** |
@@ -320,10 +320,10 @@ discard block |
||
320 | 320 | private $hash; |
321 | 321 | |
322 | 322 | /** |
323 | - * CodeName |
|
324 | - * |
|
325 | - * @var string |
|
326 | - */ |
|
323 | + * CodeName |
|
324 | + * |
|
325 | + * @var string |
|
326 | + */ |
|
327 | 327 | private $codeName = null; |
328 | 328 | |
329 | 329 | /** |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | $this->disconnectCells(); |
391 | 391 | } |
392 | 392 | |
393 | - /** |
|
393 | + /** |
|
394 | 394 | * Return the cache controller for the cell collection |
395 | 395 | * |
396 | 396 | * @return CachedObjectStorage_xxx |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | return $pValue; |
440 | 440 | } |
441 | 441 | |
442 | - /** |
|
442 | + /** |
|
443 | 443 | * Check sheet title for valid Excel syntax |
444 | 444 | * |
445 | 445 | * @param string $pValue The string to check |
@@ -1248,7 +1248,7 @@ discard block |
||
1248 | 1248 | */ |
1249 | 1249 | public function cellExists($pCoordinate = 'A1') |
1250 | 1250 | { |
1251 | - // Worksheet reference? |
|
1251 | + // Worksheet reference? |
|
1252 | 1252 | if (strpos($pCoordinate, '!') !== false) { |
1253 | 1253 | $worksheetReference = Worksheet::extractSheetTitle($pCoordinate, true); |
1254 | 1254 | return $this->parent->getSheetByName($worksheetReference[0])->cellExists(strtoupper($worksheetReference[1])); |
@@ -2140,21 +2140,21 @@ discard block |
||
2140 | 2140 | } |
2141 | 2141 | |
2142 | 2142 | /** |
2143 | - * Print gridlines? |
|
2144 | - * |
|
2145 | - * @return boolean |
|
2146 | - */ |
|
2143 | + * Print gridlines? |
|
2144 | + * |
|
2145 | + * @return boolean |
|
2146 | + */ |
|
2147 | 2147 | public function getPrintGridlines() |
2148 | 2148 | { |
2149 | 2149 | return $this->printGridlines; |
2150 | 2150 | } |
2151 | 2151 | |
2152 | 2152 | /** |
2153 | - * Set print gridlines |
|
2154 | - * |
|
2155 | - * @param boolean $pValue Print gridlines (true/false) |
|
2156 | - * @return Worksheet |
|
2157 | - */ |
|
2153 | + * Set print gridlines |
|
2154 | + * |
|
2155 | + * @param boolean $pValue Print gridlines (true/false) |
|
2156 | + * @return Worksheet |
|
2157 | + */ |
|
2158 | 2158 | public function setPrintGridlines($pValue = false) |
2159 | 2159 | { |
2160 | 2160 | $this->printGridlines = $pValue; |
@@ -2162,21 +2162,21 @@ discard block |
||
2162 | 2162 | } |
2163 | 2163 | |
2164 | 2164 | /** |
2165 | - * Show row and column headers? |
|
2166 | - * |
|
2167 | - * @return boolean |
|
2168 | - */ |
|
2165 | + * Show row and column headers? |
|
2166 | + * |
|
2167 | + * @return boolean |
|
2168 | + */ |
|
2169 | 2169 | public function getShowRowColHeaders() |
2170 | 2170 | { |
2171 | 2171 | return $this->showRowColHeaders; |
2172 | 2172 | } |
2173 | 2173 | |
2174 | 2174 | /** |
2175 | - * Set show row and column headers |
|
2176 | - * |
|
2177 | - * @param boolean $pValue Show row and column headers (true/false) |
|
2178 | - * @return Worksheet |
|
2179 | - */ |
|
2175 | + * Set show row and column headers |
|
2176 | + * |
|
2177 | + * @param boolean $pValue Show row and column headers (true/false) |
|
2178 | + * @return Worksheet |
|
2179 | + */ |
|
2180 | 2180 | public function setShowRowColHeaders($pValue = false) |
2181 | 2181 | { |
2182 | 2182 | $this->showRowColHeaders = $pValue; |
@@ -2905,7 +2905,7 @@ discard block |
||
2905 | 2905 | * @param null|string Same rule as Title minus space not allowed (but, like Excel, change silently space to underscore) |
2906 | 2906 | * @return objWorksheet |
2907 | 2907 | * @throws Exception |
2908 | - */ |
|
2908 | + */ |
|
2909 | 2909 | public function setCodeName($pValue = null) |
2910 | 2910 | { |
2911 | 2911 | // Is this a 'rename' or not? |
@@ -2954,7 +2954,7 @@ discard block |
||
2954 | 2954 | * Return the code name of the sheet |
2955 | 2955 | * |
2956 | 2956 | * @return null|string |
2957 | - */ |
|
2957 | + */ |
|
2958 | 2958 | public function getCodeName() |
2959 | 2959 | { |
2960 | 2960 | return $this->codeName; |
@@ -2962,7 +2962,7 @@ discard block |
||
2962 | 2962 | /** |
2963 | 2963 | * Sheet has a code name ? |
2964 | 2964 | * @return boolean |
2965 | - */ |
|
2965 | + */ |
|
2966 | 2966 | public function hasCodeName() |
2967 | 2967 | { |
2968 | 2968 | return !(is_null($this->codeName)); |
@@ -63,7 +63,7 @@ |
||
63 | 63 | 0x3F => '333333', |
64 | 64 | ); |
65 | 65 | |
66 | - /** |
|
66 | + /** |
|
67 | 67 | * Map color array from BIFF8 built-in color index |
68 | 68 | * |
69 | 69 | * @param int $color |
@@ -262,8 +262,8 @@ |
||
262 | 262 | $sheet = $objPHPExcel->setActiveSheetIndex($this->sheetIndex); |
263 | 263 | |
264 | 264 | $escapeEnclosures = array( "\\" . $this->enclosure, |
265 | - $this->enclosure . $this->enclosure |
|
266 | - ); |
|
265 | + $this->enclosure . $this->enclosure |
|
266 | + ); |
|
267 | 267 | |
268 | 268 | // Set our starting row based on whether we're in contiguous mode or not |
269 | 269 | $currentRow = 1; |