From eb6fa8c5a4cfe42a8c0fd857f6817de9ab983b69 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 8 May 2014 12:59:07 +0200 Subject: [PATCH] Bug 11944: Remove bad FIXME in guided_report Bug 11679 introduced a FIXME for this but it is wrong. The strings have to be encoded before generating the ods file. However, it is useless to decode column names. Signed-off-by: Jonathan Druart Signed-off-by: Dobrica Pavlinusic --- reports/guided_reports.pl | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index b4d0fb1..6411ae2 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -827,7 +827,6 @@ elsif ($phase eq 'Export'){ for ( my $i = 1; $i < $nb_rows +1 ; $i++ ) { $row = $doc->getRow( $table, $i ); for ( my $j = 0 ; $j < $nb_cols ; $j++ ) { - # FIXME Bug 11944 my $value = Encode::encode( 'UTF8', $rows->[$i - 1][$j] ); $doc->cellValue( $row, $j, $value ); } @@ -900,14 +899,7 @@ elsif ($phase eq 'Save Compound'){ # pass $sth, get back an array of names for the column headers sub header_cell_values { my $sth = shift or return (); - my @cols; - foreach my $c (@{$sth->{NAME}}) { - # TODO in Bug 11944 - #FIXME apparently DBI still needs a utf8 fix for this? - $c = Encode::decode('UTF-8', $c); - push @cols, $c; - } - return @cols; + return @{$sth->{NAME}}; } # pass $sth, get back a TMPL_LOOP-able set of names for the column headers -- 1.7.2.5