diff options
| -rw-r--r-- | lib/Spreadsheet/ParseXLSX.pm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/Spreadsheet/ParseXLSX.pm b/lib/Spreadsheet/ParseXLSX.pm index 3022988..25469e8 100644 --- a/lib/Spreadsheet/ParseXLSX.pm +++ b/lib/Spreadsheet/ParseXLSX.pm @@ -39,16 +39,6 @@ sub _parse_workbook { my $workbook = Spreadsheet::ParseExcel::Workbook->new; - my @sheets = map { - my $sheet = Spreadsheet::ParseExcel::Worksheet->new( - Name => $_->att('name'), - _Book => $workbook, - _SheetNo => $_->att('sheetId') - 1, - ); - $self->_parse_sheet($sheet, $files); - $sheet - } $files->{workbook}->find_nodes('//sheets/sheet'); - my ($version) = $files->{workbook}->find_nodes('//fileVersion'); my ($properties) = $files->{workbook}->find_nodes('//workbookPr'); @@ -59,9 +49,6 @@ sub _parse_workbook { $workbook->{FmtClass} = Spreadsheet::ParseExcel::FmtDefault->new; # XXX - $workbook->{Worksheet} = \@sheets; - $workbook->{SheetCount} = scalar(@sheets); - # $workbook->{Format} = ...; # $workbook->{FormatStr} = ...; # $workbook->{Font} = ...; @@ -75,6 +62,19 @@ sub _parse_workbook { # $workbook->{PrintArea} = ...; # $workbook->{PrintTitle} = ...; + my @sheets = map { + my $sheet = Spreadsheet::ParseExcel::Worksheet->new( + Name => $_->att('name'), + _Book => $workbook, + _SheetNo => $_->att('sheetId') - 1, + ); + $self->_parse_sheet($sheet, $files); + $sheet + } $files->{workbook}->find_nodes('//sheets/sheet'); + + $workbook->{Worksheet} = \@sheets; + $workbook->{SheetCount} = scalar(@sheets); + return $workbook; } |