r63378 - in /branches/upstream/libspreadsheet-parseexcel-perl/current: ./ lib/Spreadsheet/ lib/Spreadsheet/ParseExcel/ lib/Spreadsheet/ParseExcel/SaveParser/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue Oct 5 01:46:27 UTC 2010
Author: jawnsy-guest
Date: Tue Oct 5 01:45:50 2010
New Revision: 63378
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=63378
Log:
[svn-upgrade] new version libspreadsheet-parseexcel-perl (0.5800)
Modified:
branches/upstream/libspreadsheet-parseexcel-perl/current/Changes
branches/upstream/libspreadsheet-parseexcel-perl/current/META.yml
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Cell.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Dump.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtDefault.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan2.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtUnicode.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Font.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Format.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Worksheet.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Utility.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Workbook.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Worksheet.pm
branches/upstream/libspreadsheet-parseexcel-perl/current/t/21_number_format_user.t
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/Changes?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/Changes (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/Changes Tue Oct 5 01:45:50 2010
@@ -1,4 +1,21 @@
Revision history for Perl module Spreadsheet::ParseExcel.
+
+0.58 September 17 2010
+
+ ! Fix for text cells formatted with a leading apostrophe.
+ http://rt.cpan.org/Public/Bug/Display.html?id=61299
+
+ ! Documentation fixes. Thanks to Dan Dascalescu
+ Fix RT #61320 (typos)
+ http://rt.cpan.org/Public/Bug/Display.html?id=61320
+
+ ! Fix for currency locales in format strings.
+ Reported by wjaguar.
+ http://rt.cpan.org/Public/Bug/Display.html?id=60547
+
+ ! Fix for incomplete SETUP records.
+ Reported by M.C. Deurloo.
+
0.57 January 24 2010
@@ -21,6 +38,10 @@
! Made version 0.19 of OLE::Storage_Lite a prerequisite to avoid
issues when writing OLE header in SaveParser.
+
+ ! Changed Parse() method name to parse() for consistency with the
+ rest of the API. The older method name is still supported but
+ not documented.
0.55 August 25 2009
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/META.yml?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/META.yml (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/META.yml Tue Oct 5 01:45:50 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Spreadsheet-ParseExcel
-version: 0.57
+version: 0.58
abstract: Read information from an Excel file.
author:
- John McNamara (jmcnamara at cpan.org)
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel.pm Tue Oct 5 01:45:50 2010
@@ -18,7 +18,7 @@
use OLE::Storage_Lite;
use IO::File;
use Config;
-our $VERSION = '0.57';
+our $VERSION = '0.58';
use Spreadsheet::ParseExcel::Workbook;
use Spreadsheet::ParseExcel::Worksheet;
@@ -1621,6 +1621,10 @@
my ( $oBook, $bOp, $bLen, $sWk ) = @_;
return undef unless ( defined $oBook->{_CurSheet} );
+ # Workaround for some apps and older Excels that don't write a
+ # complete SETUP record.
+ return undef if $bLen != 34;
+
my $oWkS = $oBook->{Worksheet}[ $oBook->{_CurSheet} ];
my $iGrBit;
@@ -2261,7 +2265,7 @@
=head2 parse($filename, [$formatter])
-The Parser C<parse()> method return a L</Workbook> object.
+The Parser C<parse()> method returns a L</Workbook> object.
my $parser = Spreadsheet::ParseExcel->new();
my $workbook = $parser->parse('Book1.xls');
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Cell.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Cell.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Cell.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Cell.pm Tue Oct 5 01:45:50 2010
@@ -18,7 +18,7 @@
use strict;
use warnings;
-our $VERSION = '0.57';
+our $VERSION = '0.58';
###############################################################################
#
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Dump.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Dump.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Dump.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Dump.pm Tue Oct 5 01:45:50 2010
@@ -18,7 +18,7 @@
use strict;
use warnings;
-our $VERSION = '0.57';
+our $VERSION = '0.58';
my %NameTbl = (
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtDefault.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtDefault.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtDefault.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtDefault.pm Tue Oct 5 01:45:50 2010
@@ -19,7 +19,7 @@
use warnings;
use Spreadsheet::ParseExcel::Utility qw(ExcelFmt);
-our $VERSION = '0.57';
+our $VERSION = '0.58';
my %hFmtDefault = (
0x00 => '@',
@@ -105,6 +105,12 @@
$oThis->FmtStringDef( $oBook->{Format}[ $oCell->{FormatNo} ]->{FmtIdx},
$oBook );
+ # Special case for cells that use Lotus123 style leading
+ # apostrophe to designate text formatting.
+ if ( $oBook->{Format}[ $oCell->{FormatNo} ]->{Key123} ) {
+ $sFmtStr = '@';
+ }
+
unless ( defined($sFmtStr) ) {
if ( $oCell->{Type} eq 'Numeric' ) {
if ( int( $oCell->{Val} ) != $oCell->{Val} ) {
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan.pm Tue Oct 5 01:45:50 2010
@@ -21,7 +21,7 @@
use Encode qw(find_encoding decode);
use base 'Spreadsheet::ParseExcel::FmtDefault';
-our $VERSION = '0.57';
+our $VERSION = '0.58';
my %FormatTable = (
0x00 => '@',
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan2.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan2.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan2.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtJapan2.pm Tue Oct 5 01:45:50 2010
@@ -21,7 +21,7 @@
use Jcode;
use Unicode::Map;
use base 'Spreadsheet::ParseExcel::FmtJapan';
-our $VERSION = '0.57';
+our $VERSION = '0.58';
#------------------------------------------------------------------------------
# new (for Spreadsheet::ParseExcel::FmtJapan2)
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtUnicode.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtUnicode.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtUnicode.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/FmtUnicode.pm Tue Oct 5 01:45:50 2010
@@ -21,7 +21,7 @@
use Unicode::Map;
use base 'Spreadsheet::ParseExcel::FmtDefault';
-our $VERSION = '0.57';
+our $VERSION = '0.58';
#------------------------------------------------------------------------------
# new (for Spreadsheet::ParseExcel::FmtUnicode)
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Font.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Font.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Font.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Font.pm Tue Oct 5 01:45:50 2010
@@ -18,7 +18,7 @@
use strict;
use warnings;
-our $VERSION = '0.57';
+our $VERSION = '0.58';
sub new {
my ( $class, %rhIni ) = @_;
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Format.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Format.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Format.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Format.pm Tue Oct 5 01:45:50 2010
@@ -18,7 +18,7 @@
use strict;
use warnings;
-our $VERSION = '0.57';
+our $VERSION = '0.58';
sub new {
my ( $class, %rhIni ) = @_;
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser.pm Tue Oct 5 01:45:50 2010
@@ -24,7 +24,7 @@
use Spreadsheet::WriteExcel;
use base 'Spreadsheet::ParseExcel';
-our $VERSION = '0.57';
+our $VERSION = '0.58';
###############################################################################
#
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Workbook.pm Tue Oct 5 01:45:50 2010
@@ -19,7 +19,7 @@
use warnings;
use base 'Spreadsheet::ParseExcel::Workbook';
-our $VERSION = '0.57';
+our $VERSION = '0.58';
#==============================================================================
# Spreadsheet::ParseExcel::SaveParser::Workbook
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Worksheet.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Worksheet.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Worksheet.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/SaveParser/Worksheet.pm Tue Oct 5 01:45:50 2010
@@ -23,7 +23,7 @@
#==============================================================================
use base 'Spreadsheet::ParseExcel::Worksheet';
-our $VERSION = '0.57';
+our $VERSION = '0.58';
sub new {
my ( $sClass, %rhIni ) = @_;
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Utility.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Utility.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Utility.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Utility.pm Tue Oct 5 01:45:50 2010
@@ -24,7 +24,7 @@
@EXPORT_OK = qw(ExcelFmt LocaltimeExcel ExcelLocaltime
col2int int2col sheetRef xls2csv);
-our $VERSION = '0.57';
+our $VERSION = '0.58';
my $qrNUMBER = qr/(^[+-]?\d+(\.\d+)?$)|(^[+-]?\d+\.?(\d*)[eE][+-](\d+))$/;
@@ -186,9 +186,16 @@
# Remove the locale, such as [$-409], from the format string.
my $locale = '';
- if ( $format =~ s/^(\[\$-\d+\])// ) {
+ if ( $format =~ s/^(\[\$?-\d+\])// ) {
$locale = $1;
}
+
+ # Replace currency locale, such as [$$-409], with $ in the format string.
+ # See the RT#60547 test cases in 21_number_format_user.t.
+ if ( $format =~ s/(\[\$([^-]+)(-\d+)?\])/$2/s ) {
+ $locale = $1;
+ }
+
# Remove leading # from '# ?/?', '# ??/??' fraction formats.
$format =~ s{# \?}{?}g;
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Workbook.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Workbook.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Workbook.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Workbook.pm Tue Oct 5 01:45:50 2010
@@ -18,7 +18,7 @@
use strict;
use warnings;
-our $VERSION = '0.57';
+our $VERSION = '0.58';
###############################################################################
#
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Worksheet.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Worksheet.pm?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Worksheet.pm (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/lib/Spreadsheet/ParseExcel/Worksheet.pm Tue Oct 5 01:45:50 2010
@@ -19,7 +19,7 @@
use warnings;
use Scalar::Util qw(weaken);
-our $VERSION = '0.57';
+our $VERSION = '0.58';
###############################################################################
#
@@ -625,15 +625,6 @@
Returns a two-element list C<($min, $max)> containing the minimum and maximum of defined columns in the worksheet. If there is no column defined C<$max> is smaller than C<$min>.
my ( $col_min, $col_max ) = $worksheet->col_range();
-
-
-=head2 col_range()
-
-The C<col_range()> method returns TODO.
-
- my $col_range = $worksheet->col_range();
-
-Returns 0 if the property isn't set.
=head2 get_name()
Modified: branches/upstream/libspreadsheet-parseexcel-perl/current/t/21_number_format_user.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-parseexcel-perl/current/t/21_number_format_user.t?rev=63378&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-parseexcel-perl/current/t/21_number_format_user.t (original)
+++ branches/upstream/libspreadsheet-parseexcel-perl/current/t/21_number_format_user.t Tue Oct 5 01:45:50 2010
@@ -12,7 +12,7 @@
use strict;
use Spreadsheet::ParseExcel::Utility qw( ExcelFmt LocaltimeExcel );
-use Test::More tests => 139;
+use Test::More tests => 142;
my $is_1904 = 1;
@@ -195,6 +195,12 @@
[ 138, 36898, 'Sun', 'ddd' ],
[ 139, 2958103,'Sun', 'ddd' ],
+
+ # http://rt.cpan.org/Public/Bug/Display.html?id=60547
+ [ 140, 27400, '$27,400.00', '[$$-409]#,##0.00' ],
+ [ 141, 826331.94, '826,331.94 руб.', '#,##0.00\ [$руб.-419]' ],
+ [ 142, 826331.94, '826,331.94 RUR', '#,##0.00\ [$RUR]' ],
+
);
###############################################################################
More information about the Pkg-perl-cvs-commits
mailing list