diff options
author | Jesse Luehrs <doy@tozt.net> | 2014-01-29 15:56:58 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2014-01-29 15:56:58 -0500 |
commit | 9b1330ff59fd6b7faefa1fcc798b898359e7b9e9 (patch) | |
tree | c57f33e139875d93aa368b405ae3e0252ed56c5d | |
parent | 3e1b783c60afe860f38b7947888a0bb443694691 (diff) | |
download | spreadsheet-parsexlsx-9b1330ff59fd6b7faefa1fcc798b898359e7b9e9.tar.gz spreadsheet-parsexlsx-9b1330ff59fd6b7faefa1fcc798b898359e7b9e9.zip |
return undef to mean 'the default color' (#15)
-rw-r--r-- | lib/Spreadsheet/ParseXLSX.pm | 8 | ||||
-rw-r--r-- | t/basic.t | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/Spreadsheet/ParseXLSX.pm b/lib/Spreadsheet/ParseXLSX.pm index 72d8a58..9a41518 100644 --- a/lib/Spreadsheet/ParseXLSX.pm +++ b/lib/Spreadsheet/ParseXLSX.pm @@ -673,11 +673,9 @@ sub _color { my $self = shift; my ($colors, $color_node) = @_; - my $color; # XXX - if ($color_node) { - $color = '#000000' # XXX - if $color_node->att('auto'); - $color = '#' . Spreadsheet::ParseExcel->ColorIdxToRGB( # XXX + my $color; + if ($color_node && !$color_node->att('auto')) { + $color = '#' . Spreadsheet::ParseExcel->ColorIdxToRGB( $color_node->att('indexed') ) if defined $color_node->att('indexed'); $color = '#' . substr($color_node->att('rgb'), 2, 6) @@ -85,7 +85,7 @@ for my $file ($filename, do { open my $fh, '<', $filename or die; $fh }) { ok($format->{Wrap}); is_deeply($format->{Fill}, [0, undef, undef]); is_deeply($format->{BdrStyle}, [(1) x 4]); - is_deeply($format->{BdrColor}, [('#000000') x 4]); + is_deeply($format->{BdrColor}, [(undef) x 4]); is_deeply($format->{BdrDiag}, [0, 0, undef]); my $font = $format->{Font}; |