From d72a257f454b8b1d3ad93cde2a43f37df4f2ddd7 Mon Sep 17 00:00:00 2001 From: FL Date: Sat, 5 Jul 2014 12:08:53 +0000 Subject: Improve locked cell detection for cells with hidden formulas. Add test for locked cell detection. --- lib/Spreadsheet/ParseXLSX.pm | 2 +- t/bug-lock.t | 26 ++++++++++++++++++++++++++ t/data/bug-lock.xlsx | Bin 0 -> 8480 bytes 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 t/bug-lock.t create mode 100644 t/data/bug-lock.xlsx diff --git a/lib/Spreadsheet/ParseXLSX.pm b/lib/Spreadsheet/ParseXLSX.pm index 77e83e7..d20d734 100644 --- a/lib/Spreadsheet/ParseXLSX.pm +++ b/lib/Spreadsheet/ParseXLSX.pm @@ -513,7 +513,7 @@ sub _parse_styles { Font => $font[$_->att('fontId')], FmtIdx => 0+$_->att('numFmtId'), - Lock => $protection + Lock => $protection && defined $protection->att('locked') ? $protection->att('locked') : 1, Hidden => $protection diff --git a/t/bug-lock.t b/t/bug-lock.t new file mode 100644 index 0000000..142d003 --- /dev/null +++ b/t/bug-lock.t @@ -0,0 +1,26 @@ +#!/usr/bin/env perl +use strict; +use warnings; +use Test::More; + +use Spreadsheet::ParseXLSX; + +my $wb = Spreadsheet::ParseXLSX->new->parse('t/data/bug-lock.xlsx'); +my $ws = $wb->worksheet(0); + +my $b1 = $ws->get_cell(0, 0); +ok($b1->get_format->{Lock}); + +my $b2 = $ws->get_cell(1, 0); +ok(!$b2->get_format->{Lock}); + +my $b3 = $ws->get_cell(2, 0); +ok($b3->get_format->{Lock}); + +my $b4 = $ws->get_cell(3, 0); +ok(!$b4->get_format->{Lock}); + +my $b5 = $ws->get_cell(4, 0); +ok($b5->get_format->{Lock}); + +done_testing; diff --git a/t/data/bug-lock.xlsx b/t/data/bug-lock.xlsx new file mode 100644 index 0000000..bf16fdb Binary files /dev/null and b/t/data/bug-lock.xlsx differ -- cgit v1.2.3-54-g00ecf