From cf50c6eb979dcbf8c26c424ec2b944afe0c37cea Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 8 May 2013 18:26:55 -0500
Subject: refactor color handling, and add border color support

---
 lib/Spreadsheet/Template/Generator/Parser/Excel.pm | 25 ++++++----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'lib/Spreadsheet/Template/Generator/Parser/Excel.pm')

diff --git a/lib/Spreadsheet/Template/Generator/Parser/Excel.pm b/lib/Spreadsheet/Template/Generator/Parser/Excel.pm
index f2d5b6d..e9082ff 100644
--- a/lib/Spreadsheet/Template/Generator/Parser/Excel.pm
+++ b/lib/Spreadsheet/Template/Generator/Parser/Excel.pm
@@ -116,14 +116,15 @@ sub _parse_cell {
 
         if (!$format->{IgnoreFont}) {
             $format_data->{size} = $format->{Font}{Height};
-            $format_data->{color} = $self->_color(
-                $format->{Font}{Color}
-            ) unless $format->{Font}{Color} eq '8'; # XXX
+            $format_data->{color} = $format->{Font}{Color}
+                unless lc($format->{Font}{Color}) eq '#ffffff'; # XXX
         }
         if (!$format->{IgnoreFill}) {
-            $format_data->{bg_color} = $self->_color(
-                $format->{Fill}[1]
-            ) unless $format->{Fill}[1] eq '64'; # XXX
+            $format_data->{bg_color} = $format->{Fill}[1]
+                unless $format->{Fill}[1] eq '#000000'; # XXX
+        }
+        if (!$format->{IgnoreBorder}) {
+            $format_data->{border_color} = $format->{BdrColor};
         }
         if (!$format->{IgnoreAlignment}) {
             $format_data->{align} = $halign{$format->{AlignH}}
@@ -156,18 +157,6 @@ sub _filter_cell_contents {
     return $contents;
 }
 
-sub _color {
-    my $self = shift;
-    my ($color) = @_;
-
-    if ($color =~ /^#/) {
-        return $color;
-    }
-    else {
-        return '#' . Spreadsheet::ParseExcel->ColorIdxToRGB($color);
-    }
-}
-
 no Moose::Role;
 
 1;
-- 
cgit v1.2.3-54-g00ecf