@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | 'NULL' => null |
262 | 262 | ); |
263 | 263 | |
264 | - // PhpSpreadsheet functions |
|
264 | + // PhpSpreadsheet functions |
|
265 | 265 | private static $phpSpreadsheetFunctions = array( |
266 | 266 | 'ABS' => array( |
267 | 267 | 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, |
@@ -3136,13 +3136,13 @@ discard block |
||
3136 | 3136 | $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null; |
3137 | 3137 | |
3138 | 3138 | $regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION. |
3139 | - '|'.self::CALCULATION_REGEXP_CELLREF. |
|
3140 | - '|'.self::CALCULATION_REGEXP_NUMBER. |
|
3141 | - '|'.self::CALCULATION_REGEXP_STRING. |
|
3142 | - '|'.self::CALCULATION_REGEXP_OPENBRACE. |
|
3143 | - '|'.self::CALCULATION_REGEXP_NAMEDRANGE. |
|
3144 | - '|'.self::CALCULATION_REGEXP_ERROR. |
|
3145 | - ')/si'; |
|
3139 | + '|'.self::CALCULATION_REGEXP_CELLREF. |
|
3140 | + '|'.self::CALCULATION_REGEXP_NUMBER. |
|
3141 | + '|'.self::CALCULATION_REGEXP_STRING. |
|
3142 | + '|'.self::CALCULATION_REGEXP_OPENBRACE. |
|
3143 | + '|'.self::CALCULATION_REGEXP_NAMEDRANGE. |
|
3144 | + '|'.self::CALCULATION_REGEXP_ERROR. |
|
3145 | + ')/si'; |
|
3146 | 3146 | |
3147 | 3147 | // Start with initialisation |
3148 | 3148 | $index = 0; |
@@ -99,65 +99,65 @@ discard block |
||
99 | 99 | private $cellStyleXfCollection = array(); |
100 | 100 | |
101 | 101 | /** |
102 | - * hasMacros : this workbook have macros ? |
|
103 | - * |
|
104 | - * @var bool |
|
105 | - */ |
|
102 | + * hasMacros : this workbook have macros ? |
|
103 | + * |
|
104 | + * @var bool |
|
105 | + */ |
|
106 | 106 | private $hasMacros = false; |
107 | 107 | |
108 | 108 | /** |
109 | - * macrosCode : all macros code (the vbaProject.bin file, this include form, code, etc.), null if no macro |
|
110 | - * |
|
111 | - * @var binary |
|
112 | - */ |
|
109 | + * macrosCode : all macros code (the vbaProject.bin file, this include form, code, etc.), null if no macro |
|
110 | + * |
|
111 | + * @var binary |
|
112 | + */ |
|
113 | 113 | private $macrosCode; |
114 | 114 | /** |
115 | - * macrosCertificate : if macros are signed, contains vbaProjectSignature.bin file, null if not signed |
|
116 | - * |
|
117 | - * @var binary |
|
118 | - */ |
|
115 | + * macrosCertificate : if macros are signed, contains vbaProjectSignature.bin file, null if not signed |
|
116 | + * |
|
117 | + * @var binary |
|
118 | + */ |
|
119 | 119 | private $macrosCertificate; |
120 | 120 | |
121 | 121 | /** |
122 | - * ribbonXMLData : null if workbook is'nt Excel 2007 or not contain a customized UI |
|
123 | - * |
|
124 | - * @var null|string |
|
125 | - */ |
|
122 | + * ribbonXMLData : null if workbook is'nt Excel 2007 or not contain a customized UI |
|
123 | + * |
|
124 | + * @var null|string |
|
125 | + */ |
|
126 | 126 | private $ribbonXMLData; |
127 | 127 | |
128 | 128 | /** |
129 | - * ribbonBinObjects : null if workbook is'nt Excel 2007 or not contain embedded objects (picture(s)) for Ribbon Elements |
|
130 | - * ignored if $ribbonXMLData is null |
|
131 | - * |
|
132 | - * @var null|array |
|
133 | - */ |
|
129 | + * ribbonBinObjects : null if workbook is'nt Excel 2007 or not contain embedded objects (picture(s)) for Ribbon Elements |
|
130 | + * ignored if $ribbonXMLData is null |
|
131 | + * |
|
132 | + * @var null|array |
|
133 | + */ |
|
134 | 134 | private $ribbonBinObjects; |
135 | 135 | |
136 | 136 | /** |
137 | - * The workbook has macros ? |
|
138 | - * |
|
139 | - * @return true if workbook has macros, false if not |
|
140 | - */ |
|
137 | + * The workbook has macros ? |
|
138 | + * |
|
139 | + * @return true if workbook has macros, false if not |
|
140 | + */ |
|
141 | 141 | public function hasMacros() |
142 | 142 | { |
143 | 143 | return $this->hasMacros; |
144 | 144 | } |
145 | 145 | |
146 | 146 | /** |
147 | - * Define if a workbook has macros |
|
148 | - * |
|
149 | - * @param boolean $hasMacros true|false |
|
150 | - */ |
|
147 | + * Define if a workbook has macros |
|
148 | + * |
|
149 | + * @param boolean $hasMacros true|false |
|
150 | + */ |
|
151 | 151 | public function setHasMacros($hasMacros = false) |
152 | 152 | { |
153 | 153 | $this->hasMacros = (bool) $hasMacros; |
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
157 | - * Set the macros code |
|
158 | - * |
|
159 | - * @param string $macroCode string|null |
|
160 | - */ |
|
157 | + * Set the macros code |
|
158 | + * |
|
159 | + * @param string $macroCode string|null |
|
160 | + */ |
|
161 | 161 | public function setMacrosCode($macroCode = null) |
162 | 162 | { |
163 | 163 | $this->macrosCode = $macroCode; |
@@ -165,49 +165,49 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | /** |
168 | - * Return the macros code |
|
169 | - * |
|
170 | - * @return string|null |
|
171 | - */ |
|
168 | + * Return the macros code |
|
169 | + * |
|
170 | + * @return string|null |
|
171 | + */ |
|
172 | 172 | public function getMacrosCode() |
173 | 173 | { |
174 | 174 | return $this->macrosCode; |
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
178 | - * Set the macros certificate |
|
179 | - * |
|
180 | - * @param string|null $Certificate |
|
181 | - */ |
|
178 | + * Set the macros certificate |
|
179 | + * |
|
180 | + * @param string|null $Certificate |
|
181 | + */ |
|
182 | 182 | public function setMacrosCertificate($certificate = null) |
183 | 183 | { |
184 | 184 | $this->macrosCertificate = $certificate; |
185 | 185 | } |
186 | 186 | |
187 | 187 | /** |
188 | - * Is the project signed ? |
|
189 | - * |
|
190 | - * @return boolean true|false |
|
191 | - */ |
|
188 | + * Is the project signed ? |
|
189 | + * |
|
190 | + * @return boolean true|false |
|
191 | + */ |
|
192 | 192 | public function hasMacrosCertificate() |
193 | 193 | { |
194 | 194 | return !is_null($this->macrosCertificate); |
195 | 195 | } |
196 | 196 | |
197 | 197 | /** |
198 | - * Return the macros certificate |
|
199 | - * |
|
200 | - * @return string|null |
|
201 | - */ |
|
198 | + * Return the macros certificate |
|
199 | + * |
|
200 | + * @return string|null |
|
201 | + */ |
|
202 | 202 | public function getMacrosCertificate() |
203 | 203 | { |
204 | 204 | return $this->macrosCertificate; |
205 | 205 | } |
206 | 206 | |
207 | 207 | /** |
208 | - * Remove all macros, certificate from spreadsheet |
|
209 | - * |
|
210 | - */ |
|
208 | + * Remove all macros, certificate from spreadsheet |
|
209 | + * |
|
210 | + */ |
|
211 | 211 | public function discardMacros() |
212 | 212 | { |
213 | 213 | $this->hasMacros = false; |
@@ -216,9 +216,9 @@ discard block |
||
216 | 216 | } |
217 | 217 | |
218 | 218 | /** |
219 | - * set ribbon XML data |
|
220 | - * |
|
221 | - */ |
|
219 | + * set ribbon XML data |
|
220 | + * |
|
221 | + */ |
|
222 | 222 | public function setRibbonXMLData($target = null, $xmlData = null) |
223 | 223 | { |
224 | 224 | if (!is_null($target) && !is_null($xmlData)) { |
@@ -229,10 +229,10 @@ discard block |
||
229 | 229 | } |
230 | 230 | |
231 | 231 | /** |
232 | - * retrieve ribbon XML Data |
|
233 | - * |
|
234 | - * return string|null|array |
|
235 | - */ |
|
232 | + * retrieve ribbon XML Data |
|
233 | + * |
|
234 | + * return string|null|array |
|
235 | + */ |
|
236 | 236 | public function getRibbonXMLData($what = 'all') //we need some constants here... |
237 | 237 | { |
238 | 238 | $returnData = null; |
@@ -253,9 +253,9 @@ discard block |
||
253 | 253 | } |
254 | 254 | |
255 | 255 | /** |
256 | - * store binaries ribbon objects (pictures) |
|
257 | - * |
|
258 | - */ |
|
256 | + * store binaries ribbon objects (pictures) |
|
257 | + * |
|
258 | + */ |
|
259 | 259 | public function setRibbonBinObjects($BinObjectsNames = null, $BinObjectsData = null) |
260 | 260 | { |
261 | 261 | if (!is_null($BinObjectsNames) && !is_null($BinObjectsData)) { |
@@ -265,18 +265,18 @@ discard block |
||
265 | 265 | } |
266 | 266 | } |
267 | 267 | /** |
268 | - * return the extension of a filename. Internal use for a array_map callback (php<5.3 don't like lambda function) |
|
269 | - * |
|
270 | - */ |
|
268 | + * return the extension of a filename. Internal use for a array_map callback (php<5.3 don't like lambda function) |
|
269 | + * |
|
270 | + */ |
|
271 | 271 | private function getExtensionOnly($ThePath) |
272 | 272 | { |
273 | 273 | return pathinfo($ThePath, PATHINFO_EXTENSION); |
274 | 274 | } |
275 | 275 | |
276 | 276 | /** |
277 | - * retrieve Binaries Ribbon Objects |
|
278 | - * |
|
279 | - */ |
|
277 | + * retrieve Binaries Ribbon Objects |
|
278 | + * |
|
279 | + */ |
|
280 | 280 | public function getRibbonBinObjects($What = 'all') |
281 | 281 | { |
282 | 282 | $ReturnData = null; |
@@ -305,20 +305,20 @@ discard block |
||
305 | 305 | } |
306 | 306 | |
307 | 307 | /** |
308 | - * This workbook have a custom UI ? |
|
309 | - * |
|
310 | - * @return true|false |
|
311 | - */ |
|
308 | + * This workbook have a custom UI ? |
|
309 | + * |
|
310 | + * @return true|false |
|
311 | + */ |
|
312 | 312 | public function hasRibbon() |
313 | 313 | { |
314 | 314 | return !is_null($this->ribbonXMLData); |
315 | 315 | } |
316 | 316 | |
317 | 317 | /** |
318 | - * This workbook have additionnal object for the ribbon ? |
|
319 | - * |
|
320 | - * @return true|false |
|
321 | - */ |
|
318 | + * This workbook have additionnal object for the ribbon ? |
|
319 | + * |
|
320 | + * @return true|false |
|
321 | + */ |
|
322 | 322 | public function hasRibbonBinObjects() |
323 | 323 | { |
324 | 324 | return !is_null($this->ribbonBinObjects); |
@@ -353,9 +353,9 @@ discard block |
||
353 | 353 | return null; |
354 | 354 | } |
355 | 355 | |
356 | - /** |
|
357 | - * Create a new PhpSpreadsheet with one Worksheet |
|
358 | - */ |
|
356 | + /** |
|
357 | + * Create a new PhpSpreadsheet with one Worksheet |
|
358 | + */ |
|
359 | 359 | public function __construct() |
360 | 360 | { |
361 | 361 | $this->uniqueID = uniqid(); |