projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0719f27
)
SimpleExcel.php
author
Edward
<edward@roojs.com>
Fri, 17 Jan 2014 09:56:21 +0000
(17:56 +0800)
committer
Edward
<edward@roojs.com>
Fri, 17 Jan 2014 09:56:21 +0000
(17:56 +0800)
SimpleExcel.php
patch
|
blob
|
history
diff --git
a/SimpleExcel.php
b/SimpleExcel.php
index
7d4381d
..
cf95982
100644
(file)
--- a/
SimpleExcel.php
+++ b/
SimpleExcel.php
@@
-154,7
+154,9
@@
class Pman_Core_SimpleExcel extends Pman
//print_R($worksheet);
$worksheet->setInputEncoding('UTF-8');
-
+ if(!empty($cfg['merged_ranges'])){ // merge cell
+ $worksheet->_merged_ranges = $cfg['merged_ranges'];
+ }
$this->worksheet = $worksheet;
@@
-250,9
+252,7
@@
class Pman_Core_SimpleExcel extends Pman
$start_row++;
}
- if(!empty($cfg['merged_ranges'])){ // merge cell
- $worksheet->_merged_ranges = $cfg['merged_ranges'];
- }
+
}
function addLine($worksheet_name, $clo)