From 44342c5da6c0744c5fae264e88a134db093283f9 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Fri, 10 May 2013 20:49:17 -0500
Subject: parsing worksheets will require access to global workbook stuff

---
 lib/Spreadsheet/ParseXLSX.pm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'lib/Spreadsheet/ParseXLSX.pm')

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;
 }
 
-- 
cgit v1.2.3-54-g00ecf