fix up some inconsistencies in row height/col width calculation

2 files changed, 16 insertions, 4 deletions

diff --git a/lib/Spreadsheet/Template/Generator/Parser/XLS.pm b/lib/Spreadsheet/Template/Generator/Parser/XLS.pm
index a693120..8ac14ef 100644
--- a/lib/Spreadsheet/Template/Generator/Parser/XLS.pm
+++ b/lib/Spreadsheet/Template/Generator/Parser/XLS.pm
@@ -13,6 +13,18 @@ sub make_excel {
     my $excel = $parser->parse($filename);
     die $parser->error unless $excel;
 
+    # just for consistency
+    for my $sheet ($excel->worksheets) {
+        $sheet->{RowHeight} = [
+            map { defined $_ ? $_ : $sheet->get_default_row_height }
+                $sheet->get_row_heights
+        ];
+        $sheet->{ColWidth} = [
+            map { defined $_ ? $_ : $sheet->get_default_col_width }
+                $sheet->get_col_widths
+        ];
+    }
+
     return $excel;
 }
 
diff --git a/lib/Spreadsheet/Template/Generator/Parser/XLSX.pm b/lib/Spreadsheet/Template/Generator/Parser/XLSX.pm
index e9e8972..904c04b 100644
--- a/lib/Spreadsheet/Template/Generator/Parser/XLSX.pm
+++ b/lib/Spreadsheet/Template/Generator/Parser/XLSX.pm
@@ -40,13 +40,13 @@ sub make_excel {
             $row_heights[$row->att('r') - 1] = $row->att('ht');
         }
 
-        $sheet->{DefRowHeight} = $default_row_height;
-        $sheet->{DefColWidth} = $default_column_width;
+        $sheet->{DefRowHeight} = 0+$default_row_height;
+        $sheet->{DefColWidth} = 0+$default_column_width;
         $sheet->{RowHeight} = [
-            map { defined $_ ? $_ : $default_row_height } @row_heights
+            map { defined $_ ? 0+$_ : 0+$default_row_height } @row_heights
         ];
         $sheet->{ColWidth} = [
-            map { defined $_ ? $_ : $default_column_width } @column_widths
+            map { defined $_ ? 0+$_ : 0+$default_column_width } @column_widths
         ];
     }