X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=parse_format.pm;h=e348dded4a45b55cf7f95d6e72e1df78f07fdef9;hb=5a8dc93df03fe2c20e79331b0efb33f34f5545c4;hp=6a9bfb8af4425a07e627e7d1fd6e1ad0f6eb336f;hpb=9b1a2a99675691579335e9c341ec58c00546329d;p=webpac

diff --git a/parse_format.pm b/parse_format.pm
index 6a9bfb8..e348dde 100644
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -194,7 +194,14 @@ sub parse_excel_format {
 	my $format = shift;
 	my $row = shift;
 	my $i = shift;
-	my $codepage = shift;
+	#my $codepage = shift;
+	#
+	# data allready comes in utf-8 due to change in
+	# SpreadSheet::ParseExcel::FmtDefault line 69 from
+	#	return pack('C*', unpack('n*', $sTxt));
+	# to following which returns utf-8:
+	#	return pack('U*', unpack('n*', $sTxt));
+	#
 
 	return if ($i > 0);	# Excel doesn't support repeatable fields
 
@@ -215,9 +222,6 @@ sub parse_excel_format {
 #print STDERR "--$1-> $format -[",length($format),"] ";
 			if ($row->{$1}) {
 				my $tmp = $row->{$1};
-				if ($codepage) {
-					$tmp = $codepage->convert($tmp) || warn "excel: $1 '$tmp' can't convert";
-				}
 				$display .= $prefix . $tmp;
 				$swish .= $tmp." ";
 #print STDERR " == $tmp";