diff options
author | Jesse Luehrs <doy@tozt.net> | 2015-03-14 23:43:53 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2015-03-14 23:43:53 -0400 |
commit | 5b7d7e818fe0027acdfb3fbe8fc0af69ef9a8f99 (patch) | |
tree | 0d519b471b0515191c5351616f84197f83469741 | |
parent | c48aba2416230ad6f9fa792a256e2983ce863b98 (diff) | |
parent | c29a8f6ce1de3f88adf14d357136c84e1970dd52 (diff) | |
download | spreadsheet-parsexlsx-5b7d7e818fe0027acdfb3fbe8fc0af69ef9a8f99.tar.gz spreadsheet-parsexlsx-5b7d7e818fe0027acdfb3fbe8fc0af69ef9a8f99.zip |
Merge pull request #31 from f20/master
Spreadsheet::ParseXLSX: fix bug that caused using_1904_date to return the wrong answer
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | lib/Spreadsheet/ParseXLSX.pm | 2 | ||||
-rw-r--r-- | t/bug-16.t (renamed from t/bug-lock.t) | 2 | ||||
-rw-r--r-- | t/bug-17.t | 14 | ||||
-rw-r--r-- | t/data/bug-16.xlsx (renamed from t/data/bug-lock.xlsx) | bin | 8480 -> 8480 bytes | |||
-rw-r--r-- | t/data/bug-17a.xlsx | bin | 0 -> 7825 bytes | |||
-rw-r--r-- | t/data/bug-17b.xlsx | bin | 0 -> 7817 bytes |
7 files changed, 17 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 655229f..e649e7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: perl perl: - - "5.19" + - "5.20" - "5.18" - "5.16" - "5.14" diff --git a/lib/Spreadsheet/ParseXLSX.pm b/lib/Spreadsheet/ParseXLSX.pm index 082228a..c12bace 100644 --- a/lib/Spreadsheet/ParseXLSX.pm +++ b/lib/Spreadsheet/ParseXLSX.pm @@ -82,7 +82,7 @@ sub _parse_workbook { : ("")); } - $workbook->{Flag1904} = $properties && $properties->att('date1904') ? 1 : 0; + $workbook->{Flg1904} = $properties && $properties->att('date1904') ? 1 : 0; $workbook->{FmtClass} = $formatter || Spreadsheet::ParseExcel::FmtDefault->new; diff --git a/t/bug-lock.t b/t/bug-16.t index 142d003..8ee9b6d 100644 --- a/t/bug-lock.t +++ b/t/bug-16.t @@ -5,7 +5,7 @@ use Test::More; use Spreadsheet::ParseXLSX; -my $wb = Spreadsheet::ParseXLSX->new->parse('t/data/bug-lock.xlsx'); +my $wb = Spreadsheet::ParseXLSX->new->parse('t/data/bug-16.xlsx'); my $ws = $wb->worksheet(0); my $b1 = $ws->get_cell(0, 0); diff --git a/t/bug-17.t b/t/bug-17.t new file mode 100644 index 0000000..fb77b26 --- /dev/null +++ b/t/bug-17.t @@ -0,0 +1,14 @@ +#!/usr/bin/env perl +use strict; +use warnings; +use Test::More; + +use Spreadsheet::ParseXLSX; + +my $wba = Spreadsheet::ParseXLSX->new->parse('t/data/bug-17a.xlsx'); +ok($wba->using_1904_date); + +my $wbb = Spreadsheet::ParseXLSX->new->parse('t/data/bug-17b.xlsx'); +ok(!$wbb->using_1904_date); + +done_testing; diff --git a/t/data/bug-lock.xlsx b/t/data/bug-16.xlsx Binary files differindex bf16fdb..bf16fdb 100644 --- a/t/data/bug-lock.xlsx +++ b/t/data/bug-16.xlsx diff --git a/t/data/bug-17a.xlsx b/t/data/bug-17a.xlsx Binary files differnew file mode 100644 index 0000000..7d8680c --- /dev/null +++ b/t/data/bug-17a.xlsx diff --git a/t/data/bug-17b.xlsx b/t/data/bug-17b.xlsx Binary files differnew file mode 100644 index 0000000..f58508a --- /dev/null +++ b/t/data/bug-17b.xlsx |