geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-22 16:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweak to fix colours from the pallette index

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@86741 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker
2012-02-21 17:28:37 +00:00
parent 9b462e941d
commit 3392f46985
5 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classes/PHPExcel/Reader/Excel2007.php
+2 -2
View File
@@ -419,7 +419,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
$xmlThemeName = $xmlTheme->attributes();
$xmlTheme = $xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
$themeName = (string)$xmlThemeName['name'];
$colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
$colourSchemeName = (string)$colourScheme['name'];
$colourScheme = $xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
@@ -1644,7 +1644,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
if (isset($color["rgb"])) {
return (string)$color["rgb"];
} else if (isset($color["indexed"])) {
return PHPExcel_Style_Color::indexedColor($color["indexed"],$background)->getARGB();
return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
} else if (isset($color["theme"])) {
if (self::$_theme !== NULL) {
$returnColour = self::$_theme->getColourByIndex((int)$color["theme"]);