diff options
| author | Jesse Luehrs <doy@tozt.net> | 2015-07-27 21:44:34 -0700 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2015-07-27 21:44:34 -0700 |
| commit | 53bf90652bf21ba5ed934af67e37737b7ffa2b1a (patch) | |
| tree | 71f485a4b0e0c5dd457b3fb40805f5628947bcaa | |
| parent | 8d3e8838b7bfa551cd69b108a955de369edd9f99 (diff) | |
| parent | 5dcf21a7875315952e32ef59efc5683adcec80ed (diff) | |
| download | spreadsheet-parsexlsx-53bf90652bf21ba5ed934af67e37737b7ffa2b1a.tar.gz spreadsheet-parsexlsx-53bf90652bf21ba5ed934af67e37737b7ffa2b1a.zip | |
Merge pull request #39 from rjbs/v5.8
restore v5.8 support
| -rw-r--r-- | lib/Spreadsheet/ParseXLSX.pm | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/lib/Spreadsheet/ParseXLSX.pm b/lib/Spreadsheet/ParseXLSX.pm index ece46ab..1698acd 100644 --- a/lib/Spreadsheet/ParseXLSX.pm +++ b/lib/Spreadsheet/ParseXLSX.pm @@ -1,7 +1,7 @@ package Spreadsheet::ParseXLSX; use strict; use warnings; -use 5.010; +use 5.008; # ABSTRACT: parse XLSX files use Archive::Zip; @@ -184,7 +184,8 @@ sub _parse_sheet { my ($twig, $margin) = @_; map { my $key = "\u${_}Margin"; - $sheet->{$key} = $margin->att($_) // 0 + $sheet->{$key} = defined $margin->att($_) + ? $margin->att($_) : 0 } qw(left right top bottom header footer); $twig->purge; @@ -192,9 +193,13 @@ sub _parse_sheet { 'pageSetup' => sub { my ($twig, $setup) = @_; - $sheet->{Scale} = $setup->att('scale') // 100; - $sheet->{Landscape} = ($setup->att('orientation') // '') ne 'landscape'; - $sheet->{PaperSize} = $setup->att('paperSize') // 1; + $sheet->{Scale} = defined $setup->att('scale') + ? $setup->att('scale') + : 100; + $sheet->{Landscape} = ($setup->att('orientation') || '') ne 'landscape'; + $sheet->{PaperSize} = defined $setup->att('paperSize') + ? $setup->att('paperSize') + : 1; $sheet->{PageStart} = $setup->att('firstPageNumber'); $sheet->{UsePage} = $self->_xml_boolean($setup->att('useFirstPageNumber')); $sheet->{HorizontalDPI} = $setup->att('horizontalDpi'); @@ -229,8 +234,10 @@ sub _parse_sheet { 'sheetFormatPr' => sub { my ( $twig, $format ) = @_; - $default_row_height //= $format->att('defaultRowHeight'); - $default_column_width //= $format->att('baseColWidth'); + $default_row_height = $format->att('defaultRowHeight') + unless defined $default_row_height; + $default_column_width = $format->att('baseColWidth') + unless defined $default_column_width; $twig->purge; }, |