package SL::Template::OpenDocument;
-use SL::Template::Simple;
+use parent qw(SL::Template::Simple);
use Archive::Zip;
+use Encode;
use POSIX 'setsid';
-use vars qw(@ISA);
use SL::Iconv;
# use File::Temp qw(:mktemp);
use IO::File;
-@ISA = qw(SL::Template::Simple);
-
use strict;
sub new {
$contents =~ m|^(.*?)(</table:table-row[^>]*>)|;
my $table_row = $1;
my $end_tag = $2;
- substr($contents, 0, length($1) + length($end_tag)) = "";
if ($table_row =~ m|\<\%foreachrow\s+(.*?)\%\>|) {
my $var = $1;
- substr($table_row, length($`), length($&)) = "";
+ $contents =~ m|\<\%foreachrow\s+.*?\%\>|;
+ substr($contents, length($`), length($&)) = "";
- my ($t1, $t2) = $self->find_end($table_row, length($`));
- if (!$t1) {
+ ($table_row, $contents) = $self->find_end($contents, length($`));
+ if (!$table_row) {
$self->{"error"} = "Unclosed <\%foreachrow\%>." unless ($self->{"error"});
$main::lxdebug->leave_sub();
return undef;
}
- my $new_text = $self->parse_foreach($var, $t1 . $t2, $tag, $end_tag, @indices);
+ $contents =~ m|^(.*?)(</table:table-row[^>]*>)|;
+ $table_row .= $1;
+ $end_tag = $2;
+
+ substr $contents, 0, length($&), '';
+
+ my $new_text = $self->parse_foreach($var, $table_row, $tag, $end_tag, @indices);
if (!defined($new_text)) {
$main::lxdebug->leave_sub();
return undef;
$new_contents .= $new_text;
} else {
+ substr($contents, 0, length($table_row) + length($end_tag)) = "";
my $new_text = $self->parse_block($table_row, @indices);
if (!defined($new_text)) {
$main::lxdebug->leave_sub();
return 0;
}
- my $contents = $zip->contents("content.xml");
+ my $contents = Encode::decode('utf-8-strict', $zip->contents("content.xml"));
if (!$contents) {
$self->{"error"} = "File is not a OpenDocument file.";
$main::lxdebug->leave_sub();
# $new_contents =~ s|>|>\n|g;
- $zip->contents("content.xml", $new_contents);
+ $zip->contents("content.xml", Encode::encode('utf-8-strict', $new_contents));
my $styles = $zip->contents("styles.xml");
if ($contents) {