Skip to content

[BUGFIX] Add version check for ColWidthPx and RowHeightPx #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xperseguers wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[BUGFIX] Add version check for ColWidthPx and RowHeightPx #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/ExcelSheet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,14 +397,15 @@ public function colWidth($column)
} // colWidth

/**
* Returns the cell width
* Returns the cell width in pixels
*
* @see ExcelSheet::rowHeight()
* @see ExcelSheet::colWidth()
* @see ExcelSheet::setColWidth()
* @see ExcelSheet::setRowHeight()
* @param int $column 0-based column number
* @return float
* @since libXL 3.8.6.0
*/
public function colWidthPx($column)
{
Expand Down Expand Up @@ -1106,14 +1107,15 @@ public function rowHeight($row)
} // rowHeight

/**
* Returns the row height
* Returns the row height in pixels
*
* @see ExcelSheet::colWidth()
* @see ExcelSheet::colWidthPx()
* @see ExcelSheet::setColWidth()
* @see ExcelSheet::setRowHeight()
* @param int $row 0-based row number
* @return float
* @since libXL 3.8.6.0
*/
public function rowHeightPx($row)
{
Expand Down
10 changes: 8 additions & 2 deletions excel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2849,6 +2849,7 @@ EXCEL_METHOD(Sheet, rowHeight)
}
/* }}} */

#if LIBXL_VERSION >= 0x03080600
/* {{{ proto double ExcelSheet::colWidthPx(int column)
Returns the cell width pixels */
EXCEL_METHOD(Sheet, colWidthPx)
Expand All @@ -2864,6 +2865,7 @@ EXCEL_METHOD(Sheet, rowHeightPx)
PHP_EXCEL_SHEET_GET_DOUBLE_STATE(RowHeightPx)
}
/* }}} */
#endif

/* {{{ proto string ExcelSheet::readComment(int row, int column)
Read comment from a cell */
Expand Down Expand Up @@ -6035,13 +6037,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_Sheet_rowHeight, 0, 0, 1)
ZEND_ARG_INFO(0, row)
ZEND_END_ARG_INFO()

#if LIBXL_VERSION >= 0x03080600
ZEND_BEGIN_ARG_INFO_EX(arginfo_Sheet_colWidthPx, 0, 0, 1)
ZEND_ARG_INFO(0, column)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_Sheet_rowHeightPx, 0, 0, 1)
ZEND_ARG_INFO(0, row)
ZEND_END_ARG_INFO()
#endif

ZEND_BEGIN_ARG_INFO_EX(arginfo_Sheet_readComment, 0, 0, 2)
ZEND_ARG_INFO(0, row)
Expand Down Expand Up @@ -6742,8 +6746,6 @@ zend_function_entry excel_funcs_sheet[] = {
EXCEL_ME(Sheet, removeCol, arginfo_Sheet_removeCol, 0)
EXCEL_ME(Sheet, colWidth, arginfo_Sheet_colWidth, 0)
EXCEL_ME(Sheet, rowHeight, arginfo_Sheet_rowHeight, 0)
EXCEL_ME(Sheet, colWidthPx, arginfo_Sheet_colWidthPx, 0)
EXCEL_ME(Sheet, rowHeightPx, arginfo_Sheet_rowHeightPx, 0)
EXCEL_ME(Sheet, readComment, arginfo_Sheet_readComment, 0)
EXCEL_ME(Sheet, writeComment, arginfo_Sheet_writeComment, 0)
EXCEL_ME(Sheet, setColWidth, arginfo_Sheet_setColWidth, 0)
Expand Down Expand Up @@ -6863,6 +6865,10 @@ zend_function_entry excel_funcs_sheet[] = {
EXCEL_ME(Sheet, addDataValidation, arginfo_Sheet_addDataValidation, 0)
EXCEL_ME(Sheet, addDataValidationDouble, arginfo_Sheet_addDataValidationDouble, 0)
EXCEL_ME(Sheet, removeDataValidations, arginfo_Sheet_removeDataValidations, 0)
#endif
#if LIBXL_VERSION >= 0x03080600
EXCEL_ME(Sheet, colWidthPx, arginfo_Sheet_colWidthPx, 0)
EXCEL_ME(Sheet, rowHeightPx, arginfo_Sheet_rowHeightPx, 0)
#endif
{NULL, NULL, NULL}
};
Expand Down