diff --git a/Documentation/PHPExcel developer documentation.doc b/Documentation/PHPExcel developer documentation.doc index 2c7c81a6..bd5c0cb3 100644 Binary files a/Documentation/PHPExcel developer documentation.doc and b/Documentation/PHPExcel developer documentation.doc differ diff --git a/Documentation/markdown/Overview/08-Recipes.md b/Documentation/markdown/Overview/08-Recipes.md index 6ee9c693..5e202db1 100644 --- a/Documentation/markdown/Overview/08-Recipes.md +++ b/Documentation/markdown/Overview/08-Recipes.md @@ -103,13 +103,13 @@ This is regardless of which language version of Microsoft Office Excel may have 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! -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. +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. ```php $objPHPExcel->getActiveSheet()->setCellValue('B8','=IF(C4>500,"profit","loss")'); ``` -If you want to write a string beginning with an "=" character to a cell, then you should use the setCellValueExplicit() method. +If you want to write a string beginning with an "=" character to a cell, then you should use the setCellValueExplicit() method. ```php $objPHPExcel->getActiveSheet() @@ -167,22 +167,22 @@ At present, the following locale settings are supported: Language | | Locale Code ---------------------|----------------------|------------- - Czech | Cetina | cs + Czech | Ceština | cs Danish | Dansk | da German | Deutsch | de - Spanish | Espaol | es + Spanish | Español | es Finnish | Suomi | fi - French | Franais | fr + French | Français | fr Hungarian | Magyar | hu Italian | Italiano | it Dutch | Nederlands | nl Norwegian | Norsk | no Polish | Jezyk polski | pl - Portuguese | Portugus | pt - Brazilian Portuguese | Portugus Brasileiro | pt_br + Portuguese | Português | pt + Brazilian Portuguese | Português Brasileiro | pt_br Russian | ??????? ???? | ru Swedish | Svenska | sv - Turkish | Trke | tr + Turkish | Türkçe | tr ### Write a newline character "\n" in a cell (ALT+"Enter") @@ -843,7 +843,7 @@ You can instruct PHPExcel to add a summary to the right (default), or to the lef $objPHPExcel->getActiveSheet()->setShowSummaryRight(false); ``` -### Setting a row''s height +### Setting a row's height A row's height can be set using the following code: @@ -851,6 +851,8 @@ A row's height can be set using the following code: $objPHPExcel->getActiveSheet()->getRowDimension('10')->setRowHeight(100); ``` +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. + ### Show/hide a row 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 2. Output HTTP headers for the type of document you wish to output 3. Use the PHPExcel_Writer_* of your choice, and save to "php://output" -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. +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. __This may not be safe for unauthorized viewing!__ 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: $objPHPExcel->getActiveSheet()->getSheetView()->setZoomScale(75); ``` -Note that zoom level should be in range 10 – 400. +Note that zoom level should be in range 10 – 400. ### Sheet tab color diff --git a/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt b/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt index faaa61d1..9334f684 100644 --- a/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt +++ b/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt @@ -15,3 +15,6 @@ pChart TeeChart http://www.steema.com/products/teechart/overview.html + +PHPGraphLib + http://www.ebrueggeman.com/phpgraphlib \ No newline at end of file diff --git a/src/PhpSpreadsheet/Reader/HTML.php b/src/PhpSpreadsheet/Reader/HTML.php index e24478f8..c2c2ecca 100644 --- a/src/PhpSpreadsheet/Reader/HTML.php +++ b/src/PhpSpreadsheet/Reader/HTML.php @@ -488,7 +488,7 @@ class HTML extends BaseReader implements IReader // Reload the HTML file into the DOM object $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanFile($pFilename), 'HTML-ENTITIES', 'UTF-8')); if ($loaded === false) { - throw new Exception('Failed to load ', $pFilename, ' as a DOM Document'); + throw new Exception('Failed to load ' . $pFilename . ' as a DOM Document'); } // Discard white space