Skip to content

Commit 77a1d16

Browse files
authored
Merge pull request #222 from viest/dev
Fix: free up stale sheets.
2 parents d5f632c + 1bcbe7b commit 77a1d16

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

kernel/excel.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,10 @@ PHP_METHOD(vtiful_xls, openSheet)
949949
RETURN_NULL();
950950
}
951951

952+
if (obj->read_ptr.sheet_t != NULL) {
953+
xlsxioread_sheet_close(obj->read_ptr.sheet_t);
954+
}
955+
952956
obj->read_ptr.sheet_t = sheet_open(obj->read_ptr.file_t, zs_sheet_name, zl_flag);
953957
}
954958
/* }}} */

package.xml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@
3333
<email>[email protected]</email>
3434
<active>yes</active>
3535
</lead>
36-
<date>2019-12-26</date>
36+
<date>2019-12-31</date>
3737
<time>22:00:00</time>
3838
<version>
39-
<release>1.3.3.1</release>
40-
<api>1.3.3.1</api>
39+
<release>1.3.3.2</release>
40+
<api>1.3.3.2</api>
4141
</version>
4242
<stability>
4343
<release>stable</release>
4444
<api>stable</api>
4545
</stability>
4646
<license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
4747
<notes>
48-
- FIX merge cells.
48+
- FIX free up stale sheets.
4949
</notes>
5050
<contents>
5151
<dir name="/">
@@ -251,6 +251,22 @@
251251
<configureoption default="yes" name="enable-reader" prompt="enable reader supports?" />
252252
</extsrcrelease>
253253
<changelog>
254+
<release>
255+
<date>2019-12-26</date>
256+
<time>22:00:00</time>
257+
<version>
258+
<release>1.3.3.1</release>
259+
<api>1.3.3.1</api>
260+
</version>
261+
<stability>
262+
<release>stable</release>
263+
<api>stable</api>
264+
</stability>
265+
<license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
266+
<notes>
267+
- FIX merge cells.
268+
</notes>
269+
</release>
254270
<release>
255271
<date>2019-12-23</date>
256272
<time>23:00:00</time>

php_xlswriter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
extern zend_module_entry xlswriter_module_entry;
1919
#define phpext_xlswriter_ptr &xlswriter_module_entry
2020

21-
#define PHP_XLSWRITER_VERSION "1.3.3.1"
21+
#define PHP_XLSWRITER_VERSION "1.3.3.2"
2222

2323
#ifdef PHP_WIN32
2424
# define PHP_VTIFUL_API __declspec(dllexport)

0 commit comments

Comments
 (0)