From d30855345c94bf190fd680f4b0b374eb4e62c89a Mon Sep 17 00:00:00 2001 From: sandraros <34005250+sandraros@users.noreply.github.com> Date: Sun, 29 Oct 2023 18:11:02 +0100 Subject: [PATCH 1/3] XML I18N_LANGS/DD02_TEXTS - ZEXCEL_S_FIELDCATALOG (#1149) New XML added by abapGit while serializing the DDIC structure ZEXCEL_S_FIELDCATALOG: 1 ... 1 Fieldcatalog for Table Binding ... --- src/zexcel_s_fieldcatalog.tabl.xml | 119 +++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/src/zexcel_s_fieldcatalog.tabl.xml b/src/zexcel_s_fieldcatalog.tabl.xml index b7958b7..7adfa26 100644 --- a/src/zexcel_s_fieldcatalog.tabl.xml +++ b/src/zexcel_s_fieldcatalog.tabl.xml @@ -118,6 +118,125 @@ E + + 1 + 4 + 5 + 6 + 8 + B + C + F + G + H + K + L + N + O + Q + R + S + T + U + V + W + c + d + + + + 1 + Fieldcatalog for Table Binding + + + 4 + Fieldcatalog for Table Binding + + + 5 + Fieldcatalog for Table Binding + + + 6 + Fieldcatalog for Table Binding + + + 8 + Fieldcatalog for Table Binding + + + B + Fieldcatalog for Table Binding + + + C + Fieldcatalog for Table Binding + + + F + Fieldcatalog for Table Binding + + + G + Fieldcatalog for Table Binding + + + H + Fieldcatalog for Table Binding + + + K + Fieldcatalog for Table Binding + + + L + Fieldcatalog for Table Binding + + + N + Fieldcatalog for Table Binding + + + O + Fieldcatalog for Table Binding + + + Q + Fieldcatalog for Table Binding + + + R + Fieldcatalog for Table Binding + + + S + Fieldcatalog for Table Binding + + + T + Fieldcatalog for Table Binding + + + U + Fieldcatalog for Table Binding + + + V + Fieldcatalog for Table Binding + + + W + Fieldcatalog for Table Binding + + + c + Fieldcatalog for Table Binding + + + d + Fieldcatalog for Table Binding + + From cf8bb2c5012c42bd6fb4cea2caef4ad66fbab972 Mon Sep 17 00:00:00 2001 From: Daniel Wegner Date: Sun, 29 Oct 2023 18:29:51 +0100 Subject: [PATCH 2/3] add iv_end_row to convert_to_table (#1148) Co-authored-by: sandraros <34005250+sandraros@users.noreply.github.com> --- src/zcl_excel_worksheet.clas.abap | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap index c650015..cec706b 100644 --- a/src/zcl_excel_worksheet.clas.abap +++ b/src/zcl_excel_worksheet.clas.abap @@ -673,6 +673,7 @@ CLASS zcl_excel_worksheet DEFINITION IMPORTING !it_field_catalog TYPE zexcel_t_fieldcatalog OPTIONAL !iv_begin_row TYPE int4 DEFAULT 2 + !iv_end_row TYPE int4 DEFAULT 0 EXPORTING !et_data TYPE STANDARD TABLE !er_data TYPE REF TO data @@ -2263,6 +2264,10 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. LOOP AT me->sheet_content ASSIGNING FROM lv_index. AT NEW cell_row. + IF iv_end_row <> 0 + AND -cell_row > iv_end_row. + EXIT. + ENDIF. " New line APPEND INITIAL LINE TO ASSIGNING . lv_index = sy-tabix. From ccda3a0aa8ea4dbcabd8e7be46848af1849ab71e Mon Sep 17 00:00:00 2001 From: Arno <32099906+aspeitkamp@users.noreply.github.com> Date: Sun, 29 Oct 2023 19:09:30 +0100 Subject: [PATCH 3/3] read all header/footer (odd/even) elements (#1144) Previously only the "oddFooter" was read and stored. Read the missing elements as well. --- src/zcl_excel_reader_2007.clas.abap | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/zcl_excel_reader_2007.clas.abap b/src/zcl_excel_reader_2007.clas.abap index f7afd92..1c89b39 100644 --- a/src/zcl_excel_reader_2007.clas.abap +++ b/src/zcl_excel_reader_2007.clas.abap @@ -2859,6 +2859,21 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION. ls_odd_footer-left_value = lo_ixml_hf_value_elem->get_value( ). ENDIF. + lo_ixml_hf_value_elem = lo_ixml_headerfooter_elem->find_from_name_ns( name = 'oddHeader' uri = namespace-main ). + IF lo_ixml_hf_value_elem IS NOT INITIAL. + ls_odd_header-left_value = lo_ixml_hf_value_elem->get_value( ). + ENDIF. + + lo_ixml_hf_value_elem = lo_ixml_headerfooter_elem->find_from_name_ns( name = 'evenFooter' uri = namespace-main ). + IF lo_ixml_hf_value_elem IS NOT INITIAL. + ls_even_footer-left_value = lo_ixml_hf_value_elem->get_value( ). + ENDIF. + + lo_ixml_hf_value_elem = lo_ixml_headerfooter_elem->find_from_name_ns( name = 'evenHeader' uri = namespace-main ). + IF lo_ixml_hf_value_elem IS NOT INITIAL. + ls_even_header-left_value = lo_ixml_hf_value_elem->get_value( ). + ENDIF. + * 2do§1 Header/footer " TODO.. get the rest.