mirror of
https://github.com/retailcrm/PHPExcel.git
synced 2024-11-22 21:36:05 +03:00
Feature: (MBaker) Fix to toFormattedString() method in PHPExcel_Style_NumberFormat to handle fractions with a # code for the integer part
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@64874 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
parent
756e587bc9
commit
9cacc2fda7
@ -649,7 +649,7 @@ class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable
|
|||||||
$adjustedDecimalPart = $decimalPart/$GCD;
|
$adjustedDecimalPart = $decimalPart/$GCD;
|
||||||
$adjustedDecimalDivisor = $decimalDivisor/$GCD;
|
$adjustedDecimalDivisor = $decimalDivisor/$GCD;
|
||||||
|
|
||||||
if ((strpos($format,'0') !== false) || (substr($format,0,3) == '? ?')) {
|
if ((strpos($format,'0') !== false) || (strpos($format,'#') !== false) || (substr($format,0,3) == '? ?')) {
|
||||||
if ($integerPart == 0) { $integerPart = ''; }
|
if ($integerPart == 0) { $integerPart = ''; }
|
||||||
$value = "$sign$integerPart $adjustedDecimalPart/$adjustedDecimalDivisor";
|
$value = "$sign$integerPart $adjustedDecimalPart/$adjustedDecimalDivisor";
|
||||||
} else {
|
} else {
|
||||||
|
@ -35,6 +35,7 @@ Fixed in SVN:
|
|||||||
- Feature: (MBaker) Added Contiguous flag for the CSV Reader, when working with Read Filters
|
- Feature: (MBaker) Added Contiguous flag for the CSV Reader, when working with Read Filters
|
||||||
- Feature: (MBaker) Added getFormattedValue() method for cell object
|
- Feature: (MBaker) Added getFormattedValue() method for cell object
|
||||||
- Feature: (MBaker) Added strictNullComparison argument to the worksheet fromArray() method
|
- Feature: (MBaker) Added strictNullComparison argument to the worksheet fromArray() method
|
||||||
|
- Feature: (MBaker) Fix to toFormattedString() method in PHPExcel_Style_NumberFormat to handle fractions with a # code for the integer part
|
||||||
- Bugfix: (MB) Work item 14143 - NA() doesn't propagate in matrix calc - quick fix in JAMA/Matrix.php
|
- Bugfix: (MB) Work item 14143 - NA() doesn't propagate in matrix calc - quick fix in JAMA/Matrix.php
|
||||||
- Bugfix: (Progi1984) Work item 7895 - Excel5 : Formula : String constant containing double quotation mark
|
- Bugfix: (Progi1984) Work item 7895 - Excel5 : Formula : String constant containing double quotation mark
|
||||||
- Bugfix: (Progi1984) Work item 7895 - Excel5 : Formula : Percent
|
- Bugfix: (Progi1984) Work item 7895 - Excel5 : Formula : Percent
|
||||||
|
Loading…
Reference in New Issue
Block a user