alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Workitems 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@61062 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2010-09-16 17:04:11 +00:00
parent 388d2c80d1
commit a3a0aa73e7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Classes/PHPExcel/Shared/String.php
View File

@ -303,7 +303,7 @@ class PHPExcel_Shared_String
// Sometimes iconv_substr('A', 0, 1, 'UTF-8') just returns false in PHP 5.2.0 // Sometimes iconv_substr('A', 0, 1, 'UTF-8') just returns false in PHP 5.2.0
// we cannot use iconv in that case either (http://bugs.php.net/bug.php?id=37773) // we cannot use iconv in that case either (http://bugs.php.net/bug.php?id=37773)
if (!@iconv('UTF-8', 'UTF-16LE', 'x')) { if (!@iconv_substr('A', 0, 1, 'UTF-8')) {
self::$_isIconvEnabled = false; self::$_isIconvEnabled = false;
return false; return false;
} }
@ -491,7 +491,7 @@ class PHPExcel_Shared_String
// else, no conversion // else, no conversion
return $value; return $value;
} }
/** /**
* Decode UTF-16 encoded strings. * Decode UTF-16 encoded strings.
* *
@ -602,7 +602,7 @@ class PHPExcel_Shared_String
$localeconv = localeconv(); $localeconv = localeconv();
self::$_decimalSeparator = $localeconv['decimal_point'] != '' self::$_decimalSeparator = $localeconv['decimal_point'] != ''
? $localeconv['decimal_point'] : $localeconv['mon_decimal_point']; ? $localeconv['decimal_point'] : $localeconv['mon_decimal_point'];
if (self::$_decimalSeparator == '') if (self::$_decimalSeparator == '')
{ {
// Default to . // Default to .

1
changelog.txt
View File

@ -40,6 +40,7 @@ Fixed in SVN:
- Bugfix: (MBaker) Workitem 14223 - Advanced Value Binder Not Working? - Bugfix: (MBaker) Workitem 14223 - Advanced Value Binder Not Working?
- Bugfix: (MBaker) Workitem 14226 - unassigned object variable in PHPExcel->removeCellXfByIndex - Bugfix: (MBaker) Workitem 14226 - unassigned object variable in PHPExcel->removeCellXfByIndex
- Bugfix: (MBaker) Workitem 14236 - problem with getting cell values from another worksheet... (if cell doesn't exist) - Bugfix: (MBaker) Workitem 14236 - problem with getting cell values from another worksheet... (if cell doesn't exist)
- Bugfix: (MBaker) Workitem 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string (thanks gorfou)
2010-08-26 (v1.7.4): 2010-08-26 (v1.7.4):