Skip to content
This repository was archived by the owner on Jan 2, 2019. It is now read-only.

Commit 6ae1056

Browse files
author
MarkBaker
committed
Minor bugfixes and documentation changes
1 parent f29b05b commit 6ae1056

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ pChart
1515

1616
TeeChart
1717
http://www.steema.com/products/teechart/overview.html
18+
19+
PHPGraphLib
20+
http://www.ebrueggeman.com/phpgraphlib

Classes/PHPExcel/Reader/Excel5.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5465,7 +5465,7 @@ private function createFormulaFromTokens($tokens, $additionalData)
54655465
unset($space2, $space3, $space4, $space5);
54665466
break;
54675467
case 'tArray': // array constant
5468-
$constantArray = self::_readBIFF8ConstantArray($additionalData);
5468+
$constantArray = self::readBIFF8ConstantArray($additionalData);
54695469
$formulaStrings[] = $space1 . $space0 . $constantArray['value'];
54705470
$additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
54715471
unset($space0, $space1);
@@ -7217,7 +7217,7 @@ private static function readBIFF8ConstantArray($arrayData)
72177217
for ($r = 1; $r <= $nr + 1; ++$r) {
72187218
$items = array();
72197219
for ($c = 1; $c <= $nc + 1; ++$c) {
7220-
$constant = self::_readBIFF8Constant($arrayData);
7220+
$constant = self::readBIFF8Constant($arrayData);
72217221
$items[] = $constant['value'];
72227222
$arrayData = substr($arrayData, $constant['size']);
72237223
$size += $constant['size'];

Classes/PHPExcel/Reader/HTML.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
494494
// Reload the HTML file into the DOM object
495495
$loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
496496
if ($loaded === false) {
497-
throw new PHPExcel_Reader_Exception('Failed to load ', $pFilename, ' as a DOM Document');
497+
throw new PHPExcel_Reader_Exception('Failed to load ' . $pFilename . ' as a DOM Document');
498498
}
499499

500500
// Discard white space
Binary file not shown.

Documentation/markdown/Overview/08-Recipes.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ This is regardless of which language version of Microsoft Office Excel may have
103103

104104
When the final workbook is opened by the user, Microsoft Office Excel will take care of displaying the formula according the applications language. Translation is taken care of by the application!
105105

106-
The following line of code writes the formula '=IF(C4>500,"profit","loss")' into the cell B8. Note that the formula must start with "=" to make PHPExcel recognise this as a formula.
106+
The following line of code writes the formula '=IF(C4>500,"profit","loss")' into the cell B8. Note that the formula must start with "=" to make PHPExcel recognise this as a formula.
107107

108108
```php
109109
$objPHPExcel->getActiveSheet()->setCellValue('B8','=IF(C4>500,"profit","loss")');
110110
```
111111

112-
If you want to write a string beginning with an "=" character to a cell, then you should use the setCellValueExplicit() method.
112+
If you want to write a string beginning with an "=" character to a cell, then you should use the setCellValueExplicit() method.
113113

114114
```php
115115
$objPHPExcel->getActiveSheet()
@@ -167,22 +167,22 @@ At present, the following locale settings are supported:
167167

168168
Language | | Locale Code
169169
---------------------|----------------------|-------------
170-
Czech | Ceština | cs
170+
Czech | Ceština | cs
171171
Danish | Dansk | da
172172
German | Deutsch | de
173-
Spanish | Español | es
173+
Spanish | Español | es
174174
Finnish | Suomi | fi
175-
French | Français | fr
175+
French | Français | fr
176176
Hungarian | Magyar | hu
177177
Italian | Italiano | it
178178
Dutch | Nederlands | nl
179179
Norwegian | Norsk | no
180180
Polish | Jezyk polski | pl
181-
Portuguese | Português | pt
182-
Brazilian Portuguese | Português Brasileiro | pt_br
181+
Portuguese | Português | pt
182+
Brazilian Portuguese | Português Brasileiro | pt_br
183183
Russian | ??????? ???? | ru
184184
Swedish | Svenska | sv
185-
Turkish | Türkçe | tr
185+
Turkish | Türkçe | tr
186186

187187
### Write a newline character "\n" in a cell (ALT+"Enter")
188188

@@ -843,14 +843,16 @@ You can instruct PHPExcel to add a summary to the right (default), or to the lef
843843
$objPHPExcel->getActiveSheet()->setShowSummaryRight(false);
844844
```
845845

846-
### Setting a row''s height
846+
### Setting a row's height
847847

848848
A row's height can be set using the following code:
849849

850850
```php
851851
$objPHPExcel->getActiveSheet()->getRowDimension('10')->setRowHeight(100);
852852
```
853853

854+
Excel measures row height in points, where 1 pt is 1/72 of an inch (or about 0.35mm). The default value is 12.75 pts; and the permitted range of values is between 0 and 409 pts, where 0 pts is a hidden row.
855+
854856
### Show/hide a row
855857

856858
To set a worksheet''s row visibility, you can use the following code. The following example hides row number 10.
@@ -1059,7 +1061,7 @@ Sometimes, one really wants to output a file to a client''s browser, especially
10591061
2. Output HTTP headers for the type of document you wish to output
10601062
3. Use the PHPExcel_Writer_* of your choice, and save to "php://output"
10611063

1062-
PHPExcel_Writer_Excel2007 uses temporary storage when writing to php://output. By default, temporary files are stored in the script's working directory. When there is no access, it falls back to the operating system's temporary files location.
1064+
PHPExcel_Writer_Excel2007 uses temporary storage when writing to php://output. By default, temporary files are stored in the script's working directory. When there is no access, it falls back to the operating system's temporary files location.
10631065

10641066
__This may not be safe for unauthorized viewing!__
10651067
Depending on the configuration of your operating system, temporary storage can be read by anyone using the same temporary storage folder. When confidentiality of your document is needed, it is recommended not to use php://output.
@@ -1146,7 +1148,7 @@ To set a worksheet's zoom level, the following code can be used:
11461148
$objPHPExcel->getActiveSheet()->getSheetView()->setZoomScale(75);
11471149
```
11481150

1149-
Note that zoom level should be in range 10 – 400.
1151+
Note that zoom level should be in range 10 – 400.
11501152

11511153
### Sheet tab color
11521154

0 commit comments

Comments
 (0)