From: Rob Kinyon Date: Fri, 2 Jun 2006 20:20:24 +0000 (+0000) Subject: r13918@rob-kinyons-powerbook58: rob | 2006-06-02 10:04:04 -0400 X-Git-Tag: v0.27~5 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3271754f9393f1ad067622df405e6d47a9ebb2b4;p=p5sagit%2FExcel-Template.git r13918@rob-kinyons-powerbook58: rob | 2006-06-02 10:04:04 -0400 Fixed a couple bugs and started the process of adding --- diff --git a/Changes b/Changes index 768b7f7..63f260c 100644 --- a/Changes +++ b/Changes @@ -1,10 +1,7 @@ Revision history for Perl distribution Excel::Template -0.26 Fri Jun 02 15:30:00 2005 +0.26 Thu Jun 01 17:00:00 2005 - Fixed how widths are whitelisted to allow '.' for fractions - - Fixed how certain formats are copied - - Added - - Added 0.25 Thu May 26 11:00:00 2005 - Changed how the template file is opened to use 3-arg open() if available diff --git a/MANIFEST b/MANIFEST index 5a83c33..5603972 100644 --- a/MANIFEST +++ b/MANIFEST @@ -31,7 +31,6 @@ lib/Excel/Template/Container/Worksheet.pm lib/Excel/Template/Element/Backref.pm lib/Excel/Template/Element/Cell.pm lib/Excel/Template/Element/Formula.pm -lib/Excel/Template/Element/FreezePanes.pm lib/Excel/Template/Element/Image.pm lib/Excel/Template/Element/Range.pm lib/Excel/Template/Element/Var.pm diff --git a/lib/Excel/Template/Element/Image.pm b/lib/Excel/Template/Element/Image.pm index dd9b9dd..5d9c97b 100644 --- a/lib/Excel/Template/Element/Image.pm +++ b/lib/Excel/Template/Element/Image.pm @@ -9,37 +9,6 @@ BEGIN { use Excel::Template::Element; } -sub render { - my $self = shift; - my ($context) = @_; - - my ($row, $col, $path, $offset, $scale) = map { - $context->get($self, $_) - } qw( ROW COL PATH OFFSET SCALE ); - - my @offsets = (0,0); - if ( $offset =~ /^\s*([\d.]+)\s*,\s*([\d.]+)/ ) { - @offsets = ($1,$2); - } - - my @scales = (0,0); - if ( $scale =~ /^\s*([\d.]+)\s*,\s*([\d.]+)/ ) { - @scales = ($1,$2); - } - - $context->active_worksheet->insert_bitmap( - $row, $col, $path, @offsets, @scales, - ); - - return 1; -} - -sub deltas { - return { - COL => +1, - }; -} - 1; __END__ @@ -53,30 +22,19 @@ To insert an image into the worksheet =head1 NODE NAME -IMAGE +CELL =head1 INHERITANCE L -=head1 EFFECTS - -This will consume one column in the current row. - =head1 DEPENDENCIES None =head1 USAGE - - - - - -Please see L for more information about the offset and scaling options as well as any other restrictions that might be in place. This node does B perform any sort of validation upon your parameters. You are assumed to know what you are doing. - -Note that the offset and scaling values are "X,Y". You I provide both values, even if the Y value is 0. If you provide a 0 value for either scaling option, L will default that to 1. + =head1 AUTHOR