DataObjects/Core_domain.php

[Pman.Core] / SimpleExcel.php

diff --git a/SimpleExcel.php b/SimpleExcel.php
index 7ba756c..c3603ef 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 = 1;
+        $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), $height);;
-                $worksheet->setRow($start_row+$r, null);
-//            }
+                $height = MAX(count($vv) * $line_height, $height);;
+                $worksheet->setRow($start_row+$r, $height);
+            }
         }
         $this->start_row++;
         
@@ -367,8 +367,10 @@ class Pman_Core_SimpleExcel extends Pman
         }
         
         require_once 'File/Convert.php';
+        //var_Dump($this->outfile2);
         $fc=  new File_Convert($this->outfile2, "application/vnd.ms-excel");
-        $fn = $fc->convert("application/vnd.ms-excel"); 
+        $fn = $fc->convert("application/vnd.ms-excel");
+        //print_r($fc);
         $fc->serve('attachment',$fname); // can fix IE Mess
     }