|
@@ -1860,7 +1860,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
|
|
|
// offset: 0; size: 2; 0 = base 1900, 1 = base 1904
|
|
|
PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
|
|
|
- if (ord($recordData{0}) == 1) {
|
|
|
+ if (ord($recordData[0]) == 1) {
|
|
|
PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
|
|
|
}
|
|
|
}
|
|
@@ -2334,7 +2334,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
|
|
|
|
|
|
if ($xclfType == 2) {
|
|
|
- $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
+ $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
|
|
|
// modify the relevant style property
|
|
|
if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
|
|
@@ -2350,7 +2350,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
|
|
|
|
|
|
if ($xclfType == 2) {
|
|
|
- $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
+ $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
|
|
|
// modify the relevant style property
|
|
|
if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
|
|
@@ -2366,7 +2366,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
|
|
|
|
|
|
if ($xclfType == 2) {
|
|
|
- $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
+ $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
|
|
|
// modify the relevant style property
|
|
|
if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
|
|
@@ -2382,7 +2382,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
|
|
|
|
|
|
if ($xclfType == 2) {
|
|
|
- $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
+ $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
|
|
|
// modify the relevant style property
|
|
|
if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
|
|
@@ -2398,7 +2398,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
|
|
|
|
|
|
if ($xclfType == 2) {
|
|
|
- $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
+ $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
|
|
|
// modify the relevant style property
|
|
|
if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
|
|
@@ -2414,7 +2414,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
|
|
|
|
|
|
if ($xclfType == 2) {
|
|
|
- $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
+ $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
|
|
|
// modify the relevant style property
|
|
|
if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
|
|
@@ -2430,7 +2430,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
|
|
|
|
|
|
if ($xclfType == 2) {
|
|
|
- $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
+ $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
|
|
|
// modify the relevant style property
|
|
|
if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
|
|
@@ -2446,7 +2446,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
|
|
|
|
|
|
if ($xclfType == 2) {
|
|
|
- $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
+ $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue{1}), ord($xclrValue{2}));
|
|
|
|
|
|
// modify the relevant style property
|
|
|
if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
|
|
@@ -4392,7 +4392,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
|
|
|
if (!$this->_readDataOnly) {
|
|
|
// offset: 0; size: 1; pane identifier
|
|
|
- $paneId = ord($recordData{0});
|
|
|
+ $paneId = ord($recordData[0]);
|
|
|
|
|
|
// offset: 1; size: 2; index to row of the active cell
|
|
|
$r = self::_GetInt2d($recordData, 1);
|
|
@@ -6504,7 +6504,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
|
|
|
private static function _readRGB($rgb)
|
|
|
{
|
|
|
// offset: 0; size 1; Red component
|
|
|
- $r = ord($rgb{0});
|
|
|
+ $r = ord($rgb[0]);
|
|
|
|
|
|
// offset: 1; size: 1; Green component
|
|
|
$g = ord($rgb{1});
|