projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
SL
/
Template
/
OpenDocument.pm
diff --git
a/SL/Template/OpenDocument.pm
b/SL/Template/OpenDocument.pm
index
98fba05
..
2ed3c60
100644
(file)
--- a/
SL/Template/OpenDocument.pm
+++ b/
SL/Template/OpenDocument.pm
@@
-3,6
+3,7
@@
package SL::Template::OpenDocument;
use parent qw(SL::Template::Simple);
use Archive::Zip;
use parent qw(SL::Template::Simple);
use Archive::Zip;
+use Encode;
use POSIX 'setsid';
use SL::Iconv;
use POSIX 'setsid';
use SL::Iconv;
@@
-228,7
+229,7
@@
sub parse {
return 0;
}
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();
if (!$contents) {
$self->{"error"} = "File is not a OpenDocument file.";
$main::lxdebug->leave_sub();
@@
-267,7
+268,7
@@
sub parse {
# $new_contents =~ s|>|>\n|g;
# $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) {
my $styles = $zip->contents("styles.xml");
if ($contents) {