From 0ca9f7889666fec0162a422b1d69f81df24782f0 Mon Sep 17 00:00:00 2001 From: Domi Bigl Date: Thu, 22 Aug 2024 16:32:19 +0000 Subject: [PATCH] remove more comments and old coding --- src/not_cloud/zcl_excel_converter.clas.abap | 23 ++++--------------- .../zcl_excel_converter.clas.locals_def.abap | 18 ++++----------- src/zcl_excel_fill_template.clas.abap | 6 ++--- src/zcl_excel_worksheet.clas.abap | 4 ++-- 4 files changed, 14 insertions(+), 37 deletions(-) diff --git a/src/not_cloud/zcl_excel_converter.clas.abap b/src/not_cloud/zcl_excel_converter.clas.abap index 26ef15b..42516fc 100644 --- a/src/not_cloud/zcl_excel_converter.clas.abap +++ b/src/not_cloud/zcl_excel_converter.clas.abap @@ -524,10 +524,7 @@ CLASS zcl_excel_converter IMPLEMENTATION. METHOD create_color_style. DATA: ls_styles TYPE ts_styles. DATA: lo_style TYPE REF TO zcl_excel_style. -* Begin of ATC fix-issue-1014-part1 -* READ TABLE wt_styles INTO ls_styles WITH KEY guid = i_style. READ TABLE wt_styles INTO ls_styles WITH KEY guid COMPONENTS guid = i_style. -* End of ATC fix-issue-1014-part1 IF sy-subrc = 0. lo_style = wo_excel->add_new_style( ). lo_style->font->bold = ls_styles-style->font->bold. @@ -1372,14 +1369,9 @@ CLASS zcl_excel_converter IMPLEMENTATION. IF l_line <= 1. CLEAR l_hidden. ELSE. -* Begin of ATC fix-issue-1014-part1 -* LOOP AT wt_sort_values INTO ls_sort_values WHERE is_collapsed = abap_false. - LOOP AT wt_sort_values INTO ls_sort_values USING KEY sort_level. "WHERE is_collapsed = abap_false. -* End of ATC fix-issue-1014-part1 - IF ls_sort_values-is_collapsed = abap_false. "ATC fix-issue-1014-part1 - IF l_hidden < ls_sort_values-sort_level. - l_hidden = ls_sort_values-sort_level. - ENDIF. + LOOP AT wt_sort_values INTO ls_sort_values USING KEY collapsed WHERE is_collapsed = abap_false. + IF l_hidden < ls_sort_values-sort_level. + l_hidden = ls_sort_values-sort_level. ENDIF. ENDLOOP. ENDIF. @@ -1425,13 +1417,8 @@ CLASS zcl_excel_converter IMPLEMENTATION. = . -new = abap_false. l_line = -sort_level. -* Begin of ATC fix-issue-1014-part1 -* LOOP AT wt_sort_values ASSIGNING WHERE sort_level >= l_line. - LOOP AT wt_sort_values ASSIGNING USING KEY sort_level . -* End of ATC fix-issue-1014-part1 - IF -sort_level >= l_line. "ATC fix-issue-1014-part1 - -row_int = l_row_int. - ENDIF. "ATC fix-issue-1014-part1 + LOOP AT wt_sort_values ASSIGNING WHERE sort_level >= l_line. "#EC CI_HASHSEQ + -row_int = l_row_int. ENDLOOP. ENDIF. ENDIF. diff --git a/src/not_cloud/zcl_excel_converter.clas.locals_def.abap b/src/not_cloud/zcl_excel_converter.clas.locals_def.abap index 35eaed6..3f55eab 100644 --- a/src/not_cloud/zcl_excel_converter.clas.locals_def.abap +++ b/src/not_cloud/zcl_excel_converter.clas.locals_def.abap @@ -18,13 +18,8 @@ TYPES: BEGIN OF ts_sort_values, sort_level TYPE int4, is_collapsed TYPE flag, END OF ts_sort_values, -* Begin of ATC fix-issue-1014-part1 -* tt_sort_values TYPE HASHED TABLE OF ts_sort_values WITH UNIQUE KEY fieldname . - tt_sort_values TYPE HASHED TABLE OF ts_sort_values - WITH UNIQUE KEY primary_key COMPONENTS fieldname - WITH NON-UNIQUE SORTED KEY sort_level COMPONENTS sort_level is_collapsed . - -* End of ATC fix-issue-1014-part1 + tt_sort_values TYPE HASHED TABLE OF ts_sort_values WITH UNIQUE KEY primary_key COMPONENTS fieldname + WITH NON-UNIQUE SORTED KEY collapsed COMPONENTS is_collapsed . TYPES: BEGIN OF ts_subtotal_rows, row_int TYPE zexcel_cell_row, row_int_start TYPE zexcel_cell_row, @@ -41,13 +36,8 @@ TYPES: BEGIN OF ts_styles, style TYPE REF TO zcl_excel_style, guid TYPE zexcel_cell_style, END OF ts_styles, -* Begin of ATC fix-issue-1014-part1 -* tt_styles TYPE HASHED TABLE OF ts_styles WITH UNIQUE KEY type alignment inttype decimals. - tt_styles TYPE HASHED TABLE OF ts_styles WITH UNIQUE KEY primary_key - COMPONENTS type alignment inttype decimals - WITH NON-UNIQUE SORTED KEY guid COMPONENTS guid . - . -* End of ATC fix-issue-1014-part1 + tt_styles TYPE HASHED TABLE OF ts_styles WITH UNIQUE KEY primary_key COMPONENTS type alignment inttype decimals + WITH NON-UNIQUE SORTED KEY guid COMPONENTS guid . TYPES: BEGIN OF ts_color_styles, guid_old TYPE zexcel_cell_style, diff --git a/src/zcl_excel_fill_template.clas.abap b/src/zcl_excel_fill_template.clas.abap index e4e1701..1421c18 100644 --- a/src/zcl_excel_fill_template.clas.abap +++ b/src/zcl_excel_fill_template.clas.abap @@ -192,7 +192,7 @@ CLASS zcl_excel_fill_template IMPLEMENTATION. * update merged cells before range - LOOP AT ct_merged_cells INTO ls_merged_cell WHERE row_from >= lv_start_row AND row_to <= lv_stop_row. + LOOP AT ct_merged_cells INTO ls_merged_cell WHERE row_from >= lv_start_row AND row_to <= lv_stop_row. "#EC CI_SORTSEQ ls_merged_cell-row_from = ls_merged_cell-row_from + cv_diff. ls_merged_cell-row_to = ls_merged_cell-row_to + cv_diff. @@ -216,7 +216,7 @@ CLASS zcl_excel_fill_template IMPLEMENTATION. APPEND ls_cell TO lt_tmp_cells_template. ENDLOOP. - LOOP AT ct_merged_cells INTO ls_merged_cell WHERE row_from >= -start AND row_to <= -stop. + LOOP AT ct_merged_cells INTO ls_merged_cell WHERE row_from >= -start AND row_to <= -stop. "#EC CI_SORTSEQ APPEND ls_merged_cell TO lt_tmp_merged_cells_template. ENDLOOP. @@ -271,7 +271,7 @@ CLASS zcl_excel_fill_template IMPLEMENTATION. ct_cells = lt_cells_result. - LOOP AT ct_merged_cells INTO ls_merged_cell WHERE row_from > -stop. + LOOP AT ct_merged_cells INTO ls_merged_cell WHERE row_from > -stop. "#EC CI_SORTSEQ ls_merged_cell-row_from = ls_merged_cell-row_from + cv_diff. ls_merged_cell-row_to = ls_merged_cell-row_to + cv_diff. diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap index ffee7d5..6020acf 100644 --- a/src/zcl_excel_worksheet.clas.abap +++ b/src/zcl_excel_worksheet.clas.abap @@ -2441,7 +2441,7 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. LOOP AT me->mt_merged_cells TRANSPORTING NO FIELDS WHERE row_from <= ip_cell_row AND row_to >= ip_cell_row - AND col_from <= lv_column AND col_to >= lv_column. + AND col_from <= lv_column AND col_to >= lv_column. "#EC CI_SORTSEQ DELETE me->mt_merged_cells. EXIT. ENDLOOP. @@ -4328,7 +4328,7 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. LOOP AT me->mt_merged_cells TRANSPORTING NO FIELDS WHERE NOT ( row_from > ls_merge-row_to OR row_to < ls_merge-row_from OR col_from > ls_merge-col_to - OR col_to < ls_merge-col_from ). + OR col_to < ls_merge-col_from ). "#EC CI_SORTSEQ lv_errormessage = 'Overlapping merges'(404). zcx_excel=>raise_text( lv_errormessage ).