Clientbase
/
Spreadsheet_Excel_Writer
mirror of https://github.com/basemaster/Spreadsheet_Excel_Writer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issue #12062: Color handling <8 broken - patch by gwinkless 

git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@291405 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Carsten Schmitz 2009-11-29 00:37:23 +00:00
parent 9a6a1f6a91
commit 4d9b0187c4
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Spreadsheet/Excel/Writer/Format.php
View File

@ -533,24 +533,24 @@ class Spreadsheet_Excel_Writer_Format extends PEAR
function _getColor($name_color = '') function _getColor($name_color = '')
{ {
$colors = array( $colors = array(
'aqua' => 0x0F, 'aqua' => 0x07,
'cyan' => 0x0F, 'cyan' => 0x07,
'black' => 0x08, 'black' => 0x00,
'blue' => 0x0C, 'blue' => 0x04,
'brown' => 0x10, 'brown' => 0x10,
'magenta' => 0x0E, 'magenta' => 0x06,
'fuchsia' => 0x0E, 'fuchsia' => 0x06,
'gray' => 0x17, 'gray' => 0x17,
'grey' => 0x17, 'grey' => 0x17,
'green' => 0x11, 'green' => 0x11,
'lime' => 0x0B, 'lime' => 0x03,
'navy' => 0x12, 'navy' => 0x12,
'orange' => 0x35, 'orange' => 0x35,
'purple' => 0x14, 'purple' => 0x14,
'red' => 0x0A, 'red' => 0x02,
'silver' => 0x16, 'silver' => 0x16,
'white' => 0x09, 'white' => 0x01,
'yellow' => 0x0D 'yellow' => 0x05
); );
// Return the default color, 0x7FFF, if undef, // Return the default color, 0x7FFF, if undef,
@ -568,11 +568,6 @@ class Spreadsheet_Excel_Writer_Format extends PEAR
return(0x7FFF); return(0x7FFF);
} }
// or an index < 8 mapped into the correct range,
if ($name_color < 8) {
return($name_color + 8);
}
// or the default color if arg is outside range, // or the default color if arg is outside range,
if ($name_color > 63) { if ($name_color > 63) {
return(0x7FFF); return(0x7FFF);