DataObjects/Core_watch.php

[Pman.Core] / SimpleExcel.php

diff --git a/SimpleExcel.php b/SimpleExcel.php
index fde1714..675e348 100644 (file)
--- a/SimpleExcel.php
+++ b/SimpleExcel.php
@@ -299,7 +299,8 @@ class Pman_Core_SimpleExcel extends Pman
             $worksheet->setRow($start_row +$r, $cfg['row_height']);
         }
         
-        $height = 10;
+        $line_height = (isset($cfg['line_height'])) ? $cfg['line_height'] : 12;
+        $height = 0;
         
         foreach($cfg['cols']  as $c => $col_cfg) {
             
@@ -346,12 +347,11 @@ class Pman_Core_SimpleExcel extends Pman
                 $worksheet->write($start_row+$r, $c, $v, $format);
             }
             
-//            if(isset($col_cfg['autoHeight'])){
+            if(isset($col_cfg['autoHeight'])){
                 $vv = explode("\n", $v);
-                
-                $height = MAX(count($vv) * 15, $height);;
+                $height = MAX(count($vv) * $line_height, $height);;
                 $worksheet->setRow($start_row+$r, $height);
-//            }
+            }
         }
         $this->start_row++;