X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FExcel.pm;h=941dbb321a43d7bbda1de49e065e44e289ec4c30;hb=f16c552035ab973a9aed4a1dc29d0e16be7ff541;hp=e961f28eb7318b5e0956993196f139586fd0d0b6;hpb=6cf3f7762efd40bee49a2b8f11bb4ab6915d9071;p=kivitendo-erp.git diff --git a/SL/Template/Excel.pm b/SL/Template/Excel.pm index e961f28eb..941dbb321 100644 --- a/SL/Template/Excel.pm +++ b/SL/Template/Excel.pm @@ -47,11 +47,11 @@ sub parse { my $contents = join("", @lines); my @indices; - $contents =~ s{ + $contents =~ s% $self->{tag_start} [<]* (\s?) [<>\s]* ([\w\s]+) [<>\s]* $self->{tag_end} - }{ + % $self->format_vars(align_right => $1 ne '', varstring => $2, length => length($&), indices => \@indices) - }egx; + %egx; if (!defined($contents)) { $main::lxdebug->leave_sub(); @@ -75,10 +75,6 @@ sub format_vars { $varstring =~ s/(\w+)/ $self->_get_loop_variable($1, 0, @indices) /eg; my $old_string=$varstring; my $new_string = sprintf "%*s", ($align_right ? 1 : -1 ) * $length, $varstring; - if (!defined($new_string) || $new_string eq ''){ - $main::lxdebug->message(0, 'varstring' . $varstring . "old" . $old_string); - # return substr $varstring, ($align_right ? (0, $length) : -$length); - } return substr $new_string, ($align_right ? (0, $length) : -$length); }