Fix: merge cells

viest · viest · commit cfb4848de245 · 2019-12-26T20:58:53.000+08:00
diff --git a/kernel/excel.c b/kernel/excel.c
@@ -677,7 +677,7 @@ PHP_METHOD(vtiful_xls, autoFilter)
 }
 /* }}} */
 
-/** {{{ \Vtiful\Kernel\Excel::mergeCells(string $range, string $data)
+/** {{{ \Vtiful\Kernel\Excel::mergeCells(string $range, string $data, $formatHandle = NULL)
  */
 PHP_METHOD(vtiful_xls, mergeCells)
 {
@@ -699,11 +699,11 @@ PHP_METHOD(vtiful_xls, mergeCells)
 
     WORKBOOK_NOT_INITIALIZED(obj);
 
-    if (argc == 3) {
+    if (argc == 2) {
         merge_cells(range, data, &obj->write_ptr, obj->format_ptr.format);
     }
 
-    if (argc == 4) {
+    if (argc == 3) {
         merge_cells(range, data, &obj->write_ptr, zval_get_format(format_handle));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ PHP_METHOD(vtiful_xls, autoFilter)`
`677`	`677`	`}`
`678`	`678`	`/* }}} */`
`679`	`679`
`680`		`-/** {{{ \Vtiful\Kernel\Excel::mergeCells(string $range, string $data)`
	`680`	`+/** {{{ \Vtiful\Kernel\Excel::mergeCells(string $range, string $data, $formatHandle = NULL)`
`681`	`681`	`*/`
`682`	`682`	`PHP_METHOD(vtiful_xls, mergeCells)`
`683`	`683`	`{`
`@@ -699,11 +699,11 @@ PHP_METHOD(vtiful_xls, mergeCells)`
`699`	`699`
`700`	`700`	`WORKBOOK_NOT_INITIALIZED(obj);`
`701`	`701`
`702`		`- if (argc == 3) {`
	`702`	`+ if (argc == 2) {`
`703`	`703`	`merge_cells(range, data, &obj->write_ptr, obj->format_ptr.format);`
`704`	`704`	`}`
`705`	`705`
`706`		`- if (argc == 4) {`
	`706`	`+ if (argc == 3) {`
`707`	`707`	`merge_cells(range, data, &obj->write_ptr, zval_get_format(format_handle));`
`708`	`708`	`}`
`709`	`709`	`}`