Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1863 → Rev 1864

/trunk/vendors/PHPExcel/f44b41242023265192efa5d4dd1dbf1dcb0d7cd1.diff
New file
0,0 → 1,48
diff --git a/Classes/PHPExcel/Reader/CSV.php b/Classes/PHPExcel/Reader/CSV.php
index d43b374..d45a0c6 100644
--- a/Classes/PHPExcel/Reader/CSV.php
+++ b/Classes/PHPExcel/Reader/CSV.php
@@ -144,28 +144,28 @@ public function getInputEncoding()
*/
protected function _skipBOM()
{
- rewind($fileHandle);
+ rewind($this->_fileHandle);
switch ($this->_inputEncoding) {
case 'UTF-8':
fgets($this->_fileHandle, 4) == "\xEF\xBB\xBF" ?
- fseek($this->_fileHandle, 3) : fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 3) : fseek($this->_fileHandle, 0);
break;
case 'UTF-16LE':
fgets($this->_fileHandle, 3) == "\xFF\xFE" ?
- fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
break;
case 'UTF-16BE':
fgets($this->_fileHandle, 3) == "\xFE\xFF" ?
- fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
break;
case 'UTF-32LE':
fgets($this->_fileHandle, 5) == "\xFF\xFE\x00\x00" ?
- fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
break;
case 'UTF-32BE':
fgets($this->_fileHandle, 5) == "\x00\x00\xFE\xFF" ?
- fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
break;
default:
break;
@@ -187,7 +187,7 @@ public function listWorksheetInfo($pFilename)
throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
}
$fileHandle = $this->_fileHandle;
-
+
// Skip BOM, if any
$this->_skipBOM();
/trunk/vendors/PHPExcel/issue-79.patch
New file
0,0 → 1,13
Index: Classes/PHPExcel/Worksheet.php
===================================================================
--- Classes/PHPExcel/Worksheet.php (révision 1547)
+++ Classes/PHPExcel/Worksheet.php (copie de travail)
@@ -431,7 +431,7 @@
}
// Maximum 31 characters allowed for sheet title
- if (PHPExcel_Shared_String::CountCharacters($pValue) > 31) {
+ if (PHPExcel_Shared_String::CountCharacters($pValue) > 131) {
throw new PHPExcel_Exception('Maximum 31 characters allowed in sheet title.');
}