RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-26 15:26:03 +03:00
Code Issues Projects Releases Wiki Activity

Minor bugfixes

Browse Source
This commit is contained in:
MarkBaker 2015-03-09 23:59:13 +00:00
parent de9fc7b888
commit d3148bdcdb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/PHPExcel/Shared/Font.php
View File

@ -258,7 +258,7 @@ class PHPExcel_Shared_Font
// Special case if there are one or more newline characters ("\n") // Special case if there are one or more newline characters ("\n")
if (strpos($cellText, "\n") !== false) { if (strpos($cellText, "\n") !== false) {
$lineTexts = explode("\n", $cellText); $lineTexts = explode("\n", $cellText);
$lineWitdhs = array(); $lineWidths = array();
foreach ($lineTexts as $lineText) { foreach ($lineTexts as $lineText) {
$lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont); $lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont);
} }
@ -274,7 +274,7 @@ class PHPExcel_Shared_Font
// and addition because Excel adds some padding, just use approx width of 'n' glyph // and addition because Excel adds some padding, just use approx width of 'n' glyph
$columnWidth = self::getTextWidthPixelsExact($cellText, $font, $rotation) + $columnWidthAdjust; $columnWidth = self::getTextWidthPixelsExact($cellText, $font, $rotation) + $columnWidthAdjust;
} catch (PHPExcel_Exception $e) { } catch (PHPExcel_Exception $e) {
$approximate == true; $approximate = true;
} }
} }