From f8e57071f4b4427163d527f2c4c9ad84f81bb59b Mon Sep 17 00:00:00 2001 From: sandraros Date: Sat, 11 May 2024 13:21:12 +0000 Subject: [PATCH] Support of empty cell address by LOAD (workbook) Fix #1081 --- src/zcl_excel_reader_2007.clas.abap | 31 +++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/zcl_excel_reader_2007.clas.abap b/src/zcl_excel_reader_2007.clas.abap index 0731548..70dae56 100644 --- a/src/zcl_excel_reader_2007.clas.abap +++ b/src/zcl_excel_reader_2007.clas.abap @@ -2558,6 +2558,7 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION. lv_max_col = lv_index. ENDIF. lv_cell_row = ls_row-r. + lv_cell_column = ''. lo_row = io_worksheet->get_row( lv_cell_row ). IF ls_row-customheight = '1'. lo_row->set_row_height( ip_row_height = ls_row-ht ip_custom_height = abap_true ). @@ -2594,6 +2595,26 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION. fill_struct_from_attributes( EXPORTING ip_element = lo_ixml_cell_elem CHANGING cp_structure = ls_cell ). + " Determine the column number + IF ls_cell-r IS NOT INITIAL. + " Note that the row should remain unchanged = the one defined by + " i.e. in ..., ls_cell-r would be "A1", + " the "1" of A1 should always be equal to the "1" of convert_columnrow2column_a_row( EXPORTING + i_columnrow = ls_cell-r + IMPORTING + e_column = lv_cell_column + e_row = lv_cell_row ). + ELSE. + " The column is the column after the last cell previously initialized in the same row. + " NB: the row is unchanged = the one defined by e.g. "1" in ... + IF lv_cell_column IS INITIAL. + lv_cell_column = 'A'. + ELSE. + lv_cell_column = zcl_excel_common=>convert_column2alpha( zcl_excel_common=>convert_column2int( lv_cell_column ) + 1 ). + ENDIF. + ENDIF. + lo_ixml_value_elem = lo_ixml_cell_elem->find_from_name_ns( name = 'v' uri = namespace-main ). CASE ls_cell-t. @@ -2642,11 +2663,6 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION. fill_struct_from_attributes( EXPORTING ip_element = lo_ixml_formula_elem CHANGING cp_structure = ls_formula_attributes ). IF ls_formula_attributes-t = 'shared'. - zcl_excel_common=>convert_columnrow2column_a_row( EXPORTING - i_columnrow = ls_cell-r - IMPORTING - e_column = lv_cell_column - e_row = lv_cell_row ). TRY. CLEAR ls_ref_formula. @@ -2671,11 +2687,6 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION. IF lv_cell_value IS NOT INITIAL OR lv_cell_formula IS NOT INITIAL OR lv_style_guid IS NOT INITIAL. - zcl_excel_common=>convert_columnrow2column_a_row( EXPORTING - i_columnrow = ls_cell-r - IMPORTING - e_column = lv_cell_column - e_row = lv_cell_row ). io_worksheet->set_cell( ip_column = lv_cell_column " cell_elem Column ip_row = lv_cell_row " cell_elem row_elem ip_value = lv_cell_value " cell_elem Value