From a3509f1d4830a158ec999b0ddd227e19836677dd Mon Sep 17 00:00:00 2001 From: larshp Date: Thu, 18 May 2017 16:00:08 +0000 Subject: [PATCH 1/3] remove TRY without CATCH --- src/zcl_excel_converter.clas.abap | 10 +++------- src/zcl_excel_converter_alv_grid.clas.abap | 4 +--- src/zcl_excel_converter_result_ex.clas.abap | 4 +--- src/zcl_excel_converter_result_wd.clas.abap | 4 +--- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/zcl_excel_converter.clas.abap b/src/zcl_excel_converter.clas.abap index e178be0..c259316 100644 --- a/src/zcl_excel_converter.clas.abap +++ b/src/zcl_excel_converter.clas.abap @@ -499,10 +499,8 @@ method CONVERT. ws_option = is_option. ENDIF. - TRY. - execute_converter( EXPORTING io_object = io_alv - it_table = it_table ) . - ENDTRY. + execute_converter( EXPORTING io_object = io_alv + it_table = it_table ) . IF io_worksheet IS SUPPLIED AND io_worksheet IS BOUND. wo_worksheet = io_worksheet. @@ -946,8 +944,7 @@ method EXECUTE_CONVERTER. endif. if sy-subrc = 0. CREATE OBJECT lo_if type (ls_types-clsname). - try. - lo_if->create_fieldcatalog( + lo_if->create_fieldcatalog( exporting is_option = ws_option io_object = io_object @@ -959,7 +956,6 @@ method EXECUTE_CONVERTER. et_colors = wt_colors et_filter = wt_filter ). - endtry. * data lines of highest level. if ws_layout-max_subtotal_level > 0. add 1 to ws_layout-max_subtotal_level. endif. else. diff --git a/src/zcl_excel_converter_alv_grid.clas.abap b/src/zcl_excel_converter_alv_grid.clas.abap index 96814d4..8cf0089 100644 --- a/src/zcl_excel_converter_alv_grid.clas.abap +++ b/src/zcl_excel_converter_alv_grid.clas.abap @@ -40,9 +40,7 @@ endmethod. METHOD zif_excel_converter~create_fieldcatalog. DATA: lo_alv TYPE REF TO cl_gui_alv_grid. - TRY. - zif_excel_converter~can_convert_object( io_object = io_object ). - ENDTRY. + zif_excel_converter~can_convert_object( io_object = io_object ). ws_option = is_option. diff --git a/src/zcl_excel_converter_result_ex.clas.abap b/src/zcl_excel_converter_result_ex.clas.abap index 3c6d71a..40d3a13 100644 --- a/src/zcl_excel_converter_result_ex.clas.abap +++ b/src/zcl_excel_converter_result_ex.clas.abap @@ -45,9 +45,7 @@ METHOD zif_excel_converter~create_fieldcatalog. FIELD-SYMBOLS: TYPE STANDARD TABLE. - TRY. - zif_excel_converter~can_convert_object( io_object = io_object ). - ENDTRY. + zif_excel_converter~can_convert_object( io_object = io_object ). ws_option = is_option. diff --git a/src/zcl_excel_converter_result_wd.clas.abap b/src/zcl_excel_converter_result_wd.clas.abap index 97333c1..99361ee 100644 --- a/src/zcl_excel_converter_result_wd.clas.abap +++ b/src/zcl_excel_converter_result_wd.clas.abap @@ -213,9 +213,7 @@ METHOD zif_excel_converter~create_fieldcatalog. FIELD-SYMBOLS: TYPE STANDARD TABLE. - TRY. - zif_excel_converter~can_convert_object( io_object = io_object ). - ENDTRY. + zif_excel_converter~can_convert_object( io_object = io_object ). ws_option = is_option. From 4f0393541d5ecde20a3345cf92169536d62c49fa Mon Sep 17 00:00:00 2001 From: larshp Date: Thu, 18 May 2017 16:03:12 +0000 Subject: [PATCH 2/3] remove end of method statements with no effect --- src/zcl_excel_autofilter.clas.abap | 2 -- src/zcl_excel_theme_color_scheme.clas.abap | 1 - src/zcl_excel_theme_font_scheme.clas.abap | 1 - 3 files changed, 4 deletions(-) diff --git a/src/zcl_excel_autofilter.clas.abap b/src/zcl_excel_autofilter.clas.abap index c0a9b42..bd95315 100644 --- a/src/zcl_excel_autofilter.clas.abap +++ b/src/zcl_excel_autofilter.clas.abap @@ -289,7 +289,6 @@ METHOD is_row_hidden_single_values. READ TABLE is_filter-t_values TRANSPORTING NO FIELDS WITH TABLE KEY table_line = lv_value. IF sy-subrc <> 0. rv_is_hidden = abap_true. - RETURN. ENDIF. ENDMETHOD. @@ -323,7 +322,6 @@ METHOD is_row_hidden_text_pattern. *--------------------------------------------------------------------* IF lv_value NOT IN is_filter-tr_textfilter1. rv_is_hidden = abap_true. - RETURN. ENDIF. ENDMETHOD. diff --git a/src/zcl_excel_theme_color_scheme.clas.abap b/src/zcl_excel_theme_color_scheme.clas.abap index c8be8fe..ef56165 100644 --- a/src/zcl_excel_theme_color_scheme.clas.abap +++ b/src/zcl_excel_theme_color_scheme.clas.abap @@ -298,7 +298,6 @@ method build_xml. lo_syscolor->set_attribute( name = c_val value = folhlink-syscolor-val ). lo_syscolor->set_attribute( name = c_lastclr value = folhlink-syscolor-lastclr ). endif. - clear: lo_color, lo_srgb, lo_syscolor. endif. diff --git a/src/zcl_excel_theme_font_scheme.clas.abap b/src/zcl_excel_theme_font_scheme.clas.abap index 85e4826..0c84f05 100644 --- a/src/zcl_excel_theme_font_scheme.clas.abap +++ b/src/zcl_excel_theme_font_scheme.clas.abap @@ -227,7 +227,6 @@ method build_xml. lo_font->set_attribute( name = c_typeface value = -typeface ). endif. endloop. - clear: lo_latin, lo_ea, lo_cs, lo_font. endif. From 77bedd78c4d708000ff600e57b4b490b1df1a717 Mon Sep 17 00:00:00 2001 From: larshp Date: Thu, 18 May 2017 16:44:58 +0000 Subject: [PATCH 3/3] remove unreferenced variables --- src/zcl_excel.clas.abap | 5 +-- src/zcl_excel_autofilter.clas.abap | 9 ++-- src/zcl_excel_autofilters.clas.abap | 4 -- src/zcl_excel_common.clas.abap | 14 ++---- src/zcl_excel_converter.clas.abap | 40 ++++------------- src/zcl_excel_converter_alv.clas.abap | 3 -- src/zcl_excel_converter_result_wd.clas.abap | 5 +-- src/zcl_excel_converter_salv_table.clas.abap | 6 +-- src/zcl_excel_drawing.clas.abap | 5 --- ...cel_reader_huge_file.clas.testclasses.abap | 4 +- src/zcl_excel_reader_xlsm.clas.abap | 5 +-- src/zcl_excel_table.clas.abap | 4 +- src/zcl_excel_theme_eclrschemelst.clas.abap | 1 - src/zcl_excel_theme_elements.clas.abap | 2 +- src/zcl_excel_theme_extlst.clas.abap | 1 - src/zcl_excel_theme_fmt_scheme.clas.abap | 2 - src/zcl_excel_theme_objectdefaults.clas.abap | 1 - src/zcl_excel_worksheet.clas.abap | 35 +-------------- src/zcl_excel_writer_2007.clas.abap | 45 +++---------------- src/zcl_excel_writer_xlsm.clas.abap | 24 +++------- src/zdemo_excel26.prog.abap | 1 - 21 files changed, 34 insertions(+), 182 deletions(-) diff --git a/src/zcl_excel.clas.abap b/src/zcl_excel.clas.abap index 28b095c..38af59c 100644 --- a/src/zcl_excel.clas.abap +++ b/src/zcl_excel.clas.abap @@ -178,7 +178,6 @@ ENDMETHOD. method ADD_NEW_DRAWING. - DATA: lv_guid TYPE guid_16. * Create default blank worksheet CREATE OBJECT eo_drawing EXPORTING @@ -224,7 +223,6 @@ method ADD_NEW_STYLE. method ADD_NEW_WORKSHEET. - DATA: lv_guid TYPE guid_16. * Create default blank worksheet CREATE OBJECT eo_worksheet @@ -258,8 +256,7 @@ ENDMETHOD. method CONSTRUCTOR. - DATA: lo_worksheet TYPE REF TO zcl_excel_worksheet, - lo_style TYPE REF TO zcl_excel_style. + DATA: lo_style TYPE REF TO zcl_excel_style. * Inizialize instance objects CREATE OBJECT security. diff --git a/src/zcl_excel_autofilter.clas.abap b/src/zcl_excel_autofilter.clas.abap index bd95315..42554ce 100644 --- a/src/zcl_excel_autofilter.clas.abap +++ b/src/zcl_excel_autofilter.clas.abap @@ -134,8 +134,7 @@ METHOD get_filter_range. DATA: l_row_start_c TYPE string, l_row_end_c TYPE string, l_col_start_c TYPE string, - l_col_end_c TYPE string, - l_value TYPE string. + l_col_end_c TYPE string. validate_area( ). @@ -203,8 +202,7 @@ METHOD is_row_hidden. DATA: lr_filter TYPE REF TO ts_filter, - lv_col TYPE i, - ls_value TYPE zexcel_s_autofilter_values. + lv_col TYPE i. FIELD-SYMBOLS: TYPE ts_filter. @@ -365,8 +363,7 @@ ENDMETHOD. METHOD set_value. - DATA: lr_filter TYPE REF TO ts_filter, - ls_value TYPE zexcel_s_autofilter_values. + DATA: lr_filter TYPE REF TO ts_filter. FIELD-SYMBOLS: TYPE ts_filter. diff --git a/src/zcl_excel_autofilters.clas.abap b/src/zcl_excel_autofilters.clas.abap index 6535ab5..59c82e6 100644 --- a/src/zcl_excel_autofilters.clas.abap +++ b/src/zcl_excel_autofilters.clas.abap @@ -88,8 +88,6 @@ ENDMETHOD. METHOD get. - DATA: ls_autofilter LIKE LINE OF me->mt_autofilters. - FIELD-SYMBOLS: LIKE LINE OF me->mt_autofilters. READ TABLE me->mt_autofilters ASSIGNING WITH TABLE KEY worksheet = io_worksheet. @@ -113,8 +111,6 @@ METHOD remove. DATA: lo_worksheet TYPE REF TO zcl_excel_worksheet. - FIELD-SYMBOLS: LIKE LINE OF me->mt_autofilters. - DELETE TABLE me->mt_autofilters WITH TABLE KEY worksheet = lo_worksheet. ENDMETHOD. diff --git a/src/zcl_excel_common.clas.abap b/src/zcl_excel_common.clas.abap index 4ea3e89..bc47261 100644 --- a/src/zcl_excel_common.clas.abap +++ b/src/zcl_excel_common.clas.abap @@ -745,7 +745,6 @@ endmethod. method DESCRIBE_STRUCTURE. DATA: lt_components TYPE abap_component_tab, lt_comps TYPE abap_component_tab, - lo_struct TYPE REF TO cl_abap_structdescr, ls_component TYPE abap_componentdescr, lo_elemdescr TYPE REF TO cl_abap_elemdescr, ls_dfies TYPE dfies, @@ -1111,12 +1110,10 @@ method RECURSIVE_CLASS_TO_STRUCT. DATA: descr TYPE REF TO cl_abap_structdescr, wa_component LIKE LINE OF descr->components, attribute_name TYPE fieldname, - flag_class TYPE flag, - o_border TYPE REF TO zcl_excel_style_border. + flag_class TYPE flag. FIELD-SYMBOLS: TYPE any, TYPE any, - TYPE REF TO object, TYPE any. @@ -1172,9 +1169,7 @@ METHOD recursive_struct_to_class. FIELD-SYMBOLS: TYPE any, TYPE any, - TYPE REF TO object, - TYPE any, - TYPE ANY TABLE. + TYPE any. descr ?= cl_abap_structdescr=>describe_by_data( i_source ). @@ -1257,8 +1252,6 @@ METHOD shift_formula. lv_errormessage TYPE string. - FIELD-SYMBOLS: TYPE ANY. - *--------------------------------------------------------------------* * When copying a cell in EXCEL to another cell any inherent formulas * are copied as well. Cell-references in the formula are being adjusted @@ -1613,8 +1606,7 @@ method SPLIT_FILE. DATA: lf_ext(10) TYPE c, lf_dot_ext(10) TYPE c. - DATA: lf_str TYPE text255, - lf_anz TYPE i, + DATA: lf_anz TYPE i, lf_len TYPE i. ** --------------------------------------------------------------------- diff --git a/src/zcl_excel_converter.clas.abap b/src/zcl_excel_converter.clas.abap index c259316..3353200 100644 --- a/src/zcl_excel_converter.clas.abap +++ b/src/zcl_excel_converter.clas.abap @@ -356,7 +356,6 @@ method BIND_TABLE. ls_field_catalog type zexcel_s_fieldcatalog, ls_fcat type zexcel_s_converter_fcat, lo_col_dim type ref to zcl_excel_worksheet_columndime, - lo_row_dim type ref to zcl_excel_worksheet_rowdimensi, l_col_int type zexcel_cell_column, l_col_alpha type zexcel_cell_column_alpha, ls_settings type zexcel_s_table_settings, @@ -786,8 +785,7 @@ method CREATE_TABLE. lt_components_tab TYPE cl_abap_structdescr=>component_table, ls_components TYPE abap_componentdescr, lo_table TYPE REF TO cl_abap_tabledescr, - lo_struc TYPE REF TO cl_abap_structdescr, - lt_fieldcatalog TYPE zexcel_t_converter_fcat. + lo_struc TYPE REF TO cl_abap_structdescr. FIELD-SYMBOLS: TYPE zexcel_s_converter_fcat, TYPE ANY, @@ -871,7 +869,6 @@ ENDMETHOD. method CREATE_WORKSHEET. DATA: l_freeze_col TYPE i. - DATA: l_guid TYPE oltpguid16. IF wo_data IS BOUND AND wo_worksheet IS BOUND. @@ -911,9 +908,7 @@ method CREATE_WORKSHEET. method EXECUTE_CONVERTER. - DATA: lt_fieldcatalog TYPE zexcel_t_fieldcatalog, - ls_fieldcatalog TYPE zexcel_s_converter_fcat, - lo_if TYPE REF TO zif_excel_converter, + DATA: lo_if TYPE REF TO zif_excel_converter, ls_types TYPE ts_alv_types, lo_addit TYPE REF TO cl_abap_classdescr, lo_addit_superclass type ref to cl_abap_classdescr. @@ -1027,8 +1022,7 @@ method GET_COLOR_STYLE. method GET_FILE. - data: lo_excel_writer type ref to zif_excel_writer, - lo_excel type ref to zcl_excel. + data: lo_excel_writer type ref to zif_excel_writer. data: ls_seoclass type seoclass. @@ -1158,19 +1152,13 @@ method INIT_OPTION. method LOOP_NORMAL. - DATA: lo_data TYPE REF TO data, - l_row_header TYPE zexcel_cell_row VALUE 2, - l_col_header TYPE zexcel_cell_column_alpha VALUE 'B', - l_row_int_start TYPE zexcel_cell_row, - l_row_int_end TYPE zexcel_cell_row, + DATA: l_row_int_end TYPE zexcel_cell_row, l_row_int TYPE zexcel_cell_row, l_col_int TYPE zexcel_cell_column, l_col_alpha TYPE zexcel_cell_column_alpha, - l_col_alpha_start TYPE zexcel_cell_column_alpha, l_cell_value TYPE zexcel_cell_value, l_s_color TYPE abap_bool, lo_col_dim TYPE REF TO zcl_excel_worksheet_columndime, - lo_row_dim TYPE REF TO zcl_excel_worksheet_rowdimensi, l_formula TYPE zexcel_cell_formula, l_style TYPE zexcel_cell_style, l_cells TYPE i, @@ -1180,8 +1168,7 @@ method LOOP_NORMAL. FIELD-SYMBOLS: TYPE ANY, TYPE STANDARD TABLE, TYPE zexcel_s_converter_fcat, - TYPE ANY, - TYPE zexcel_cell_value. + TYPE ANY. ASSIGN wo_data->* TO . @@ -1277,10 +1264,7 @@ method LOOP_NORMAL. method LOOP_SUBTOTAL. - DATA: lo_data TYPE REF TO data, - l_row_header TYPE zexcel_cell_row VALUE 2, - l_col_header TYPE zexcel_cell_column_alpha VALUE 'B', - l_row_int_start TYPE zexcel_cell_row, + DATA: l_row_int_start TYPE zexcel_cell_row, l_row_int_end TYPE zexcel_cell_row, l_row_int TYPE zexcel_cell_row, l_col_int TYPE zexcel_cell_column, @@ -1292,15 +1276,12 @@ method LOOP_SUBTOTAL. lo_row_dim TYPE REF TO zcl_excel_worksheet_rowdimensi, l_formula TYPE zexcel_cell_formula, l_style TYPE zexcel_cell_style, - l_subtotalled TYPE flag, l_text TYPE string, ls_sort_values TYPE ts_sort_values, ls_subtotal_rows TYPE ts_subtotal_rows, l_sort_level TYPE int4, l_hidden TYPE int4, l_line TYPE i, - l_guid TYPE guid_22, - l_tabix TYPE sy-tabix, l_cells TYPE i, l_count TYPE i, l_table_row TYPE i, @@ -1311,8 +1292,7 @@ method LOOP_SUBTOTAL. TYPE zexcel_s_converter_fcat, TYPE ANY, TYPE ANY, - TYPE ts_sort_values, - TYPE zexcel_cell_value. + TYPE ts_sort_values. ASSIGN wo_data->* TO . @@ -1623,8 +1603,7 @@ method LOOP_SUBTOTAL. method OPEN_FILE. data: l_bytecount type i, lt_file type solix_tab, - l_dir type string, - l_sep type c. + l_dir type string. field-symbols: type any table. @@ -1729,8 +1708,7 @@ method SET_FIELDCATALOG. DATA: lr_data TYPE REF TO data, lo_structdescr TYPE REF TO cl_abap_structdescr, lt_dfies TYPE ddfields, - ls_dfies TYPE dfies, - ls_fieldcatalog TYPE zexcel_s_fieldcatalog. + ls_dfies TYPE dfies. DATA: ls_fcat TYPE zexcel_s_converter_fcat. FIELD-SYMBOLS: TYPE ANY TABLE. diff --git a/src/zcl_excel_converter_alv.clas.abap b/src/zcl_excel_converter_alv.clas.abap index 019085b..7ede32e 100644 --- a/src/zcl_excel_converter_alv.clas.abap +++ b/src/zcl_excel_converter_alv.clas.abap @@ -305,8 +305,6 @@ method GET_COLOR. FIELD-SYMBOLS: TYPE STANDARD TABLE, TYPE ANY, TYPE ANY, - TYPE lvc_t_scol, - TYPE lvc_s_scol, type standard table, type any. @@ -493,7 +491,6 @@ ENDMETHOD. method UPDATE_CATALOG. DATA: ls_fieldcatalog TYPE zexcel_s_converter_fcat, - ls_ref TYPE salv_s_ddic_reference, ls_fcat TYPE lvc_s_fcat, ls_sort TYPE lvc_s_sort, l_decimals TYPE lvc_decmls. diff --git a/src/zcl_excel_converter_result_wd.clas.abap b/src/zcl_excel_converter_result_wd.clas.abap index 99361ee..ec8d480 100644 --- a/src/zcl_excel_converter_result_wd.clas.abap +++ b/src/zcl_excel_converter_result_wd.clas.abap @@ -45,8 +45,7 @@ method CREATE_WT_FCAT. DATA: lr_data TYPE REF TO data, lo_structdescr TYPE REF TO cl_abap_structdescr, lt_dfies TYPE ddfields, - ls_dfies TYPE dfies, - lv_sytabix TYPE sytabix. + ls_dfies TYPE dfies. DATA: ls_fcat TYPE lvc_s_fcat. @@ -79,8 +78,6 @@ method CREATE_WT_FCAT. method CREATE_WT_FILT. * No neeed for superclass. * Only for WD - DATA: lt_otab TYPE abap_sortorder_tab, - ls_otab TYPE abap_sortorder. DATA: lt_filters TYPE salv_wd_t_filter_rule_ref, ls_filt TYPE lvc_s_filt. diff --git a/src/zcl_excel_converter_salv_table.clas.abap b/src/zcl_excel_converter_salv_table.clas.abap index 267752e..edf2591 100644 --- a/src/zcl_excel_converter_salv_table.clas.abap +++ b/src/zcl_excel_converter_salv_table.clas.abap @@ -36,15 +36,11 @@ method LOAD_DATA. lo_sorts TYPE REF TO cl_salv_sorts, lo_filters TYPE REF TO cl_salv_filters, lo_functional TYPE REF TO cl_salv_functional_settings, - lo_display TYPE REF TO cl_salv_display_settings, - lo_selections TYPE REF TO cl_salv_selections. + lo_display TYPE REF TO cl_salv_display_settings. DATA: ls_vari TYPE disvariant, lo_layout TYPE REF TO cl_salv_layout. - DATA: lr_form_tol TYPE REF TO cl_salv_form, - lr_form_eol TYPE REF TO cl_salv_form. - DATA lt_kkblo_fieldcat TYPE kkblo_t_fieldcat. DATA ls_kkblo_layout TYPE kkblo_layout. DATA lt_kkblo_filter TYPE kkblo_t_filter. diff --git a/src/zcl_excel_drawing.clas.abap b/src/zcl_excel_drawing.clas.abap index 886c619..839996a 100644 --- a/src/zcl_excel_drawing.clas.abap +++ b/src/zcl_excel_drawing.clas.abap @@ -332,11 +332,6 @@ method LOAD_CHART_ATTRIBUTES. DATA: node2 TYPE REF TO if_ixml_element. DATA: node3 TYPE REF TO if_ixml_element. DATA: node4 TYPE REF TO if_ixml_element. - DATA: iterator TYPE REF TO if_ixml_node_iterator. - - DATA: chartspace TYPE REF TO if_ixml_node_collection. - DATA: coll_length TYPE i. - DATA: chartelem TYPE REF TO if_ixml_element. DATA lo_barchart TYPE REF TO zcl_excel_graph_bars. DATA lo_piechart TYPE REF TO zcl_excel_graph_pie. diff --git a/src/zcl_excel_reader_huge_file.clas.testclasses.abap b/src/zcl_excel_reader_huge_file.clas.testclasses.abap index dd51680..40aa290 100644 --- a/src/zcl_excel_reader_huge_file.clas.testclasses.abap +++ b/src/zcl_excel_reader_huge_file.clas.testclasses.abap @@ -116,9 +116,7 @@ class lcl_test implementation. * There is no need to store an empty cell in the ABAP worksheet structure - data: lo_reader type ref to if_sxml_reader, - lo_ex type ref to lcx_not_found, - lv_text type string. + data: lo_reader type ref to if_sxml_reader. append `` to out->shared_strings. append `t` to out->shared_strings. lo_reader = get_reader( diff --git a/src/zcl_excel_reader_xlsm.clas.abap b/src/zcl_excel_reader_xlsm.clas.abap index 776c345..816e5ee 100644 --- a/src/zcl_excel_reader_xlsm.clas.abap +++ b/src/zcl_excel_reader_xlsm.clas.abap @@ -58,8 +58,6 @@ method LOAD_WORKBOOK. fileversion TYPE t_fileversion, workbookpr TYPE t_workbookpr. - FIELD-SYMBOLS: TYPE t_relationship. - CALL FUNCTION 'TRINT_SPLIT_FILE_AND_PATH' EXPORTING full_name = iv_workbook_full_filename @@ -119,8 +117,7 @@ METHOD load_worksheet. super->load_worksheet( EXPORTING ip_path = ip_path io_worksheet = io_worksheet ). - DATA: path TYPE string, - node TYPE REF TO if_ixml_element, + DATA: node TYPE REF TO if_ixml_element, worksheet TYPE REF TO if_ixml_document, sheetpr TYPE t_sheetpr. diff --git a/src/zcl_excel_table.clas.abap b/src/zcl_excel_table.clas.abap index 67fc64f..fc7b2b3 100644 --- a/src/zcl_excel_table.clas.abap +++ b/src/zcl_excel_table.clas.abap @@ -211,9 +211,7 @@ method GET_REFERENCE. method GET_RIGHT_COLUMN_INTEGER. - DATA: lv_column TYPE zexcel_cell_column, - lv_table_lines TYPE i, - ls_field_catalog TYPE zexcel_s_fieldcatalog. + DATA: ls_field_catalog TYPE zexcel_s_fieldcatalog. IF settings-bottom_right_column IS NOT INITIAL. ev_column = zcl_excel_common=>convert_column2int( settings-bottom_right_column ). diff --git a/src/zcl_excel_theme_eclrschemelst.clas.abap b/src/zcl_excel_theme_eclrschemelst.clas.abap index b30af3c..5cadcc0 100644 --- a/src/zcl_excel_theme_eclrschemelst.clas.abap +++ b/src/zcl_excel_theme_eclrschemelst.clas.abap @@ -23,7 +23,6 @@ CLASS ZCL_EXCEL_THEME_ECLRSCHEMELST IMPLEMENTATION. method build_xml. - data: lo_theme_element type ref to if_ixml_element. data: lo_theme type ref to if_ixml_element. data: lo_theme_objdef type ref to if_ixml_element. check io_document is bound. diff --git a/src/zcl_excel_theme_elements.clas.abap b/src/zcl_excel_theme_elements.clas.abap index 994a075..df7a7a9 100644 --- a/src/zcl_excel_theme_elements.clas.abap +++ b/src/zcl_excel_theme_elements.clas.abap @@ -36,7 +36,7 @@ method build_xml. data: lo_theme_element type ref to if_ixml_element. data: lo_theme type ref to if_ixml_element. check io_document is bound. - lo_theme ?= io_document->get_root_element( ).. + lo_theme ?= io_document->get_root_element( ). if lo_theme is bound. lo_theme_element ?= io_document->create_simple_element_ns( prefix = zcl_excel_theme=>c_theme_prefix name = c_theme_elements diff --git a/src/zcl_excel_theme_extlst.clas.abap b/src/zcl_excel_theme_extlst.clas.abap index c2d07f0..f7b90d7 100644 --- a/src/zcl_excel_theme_extlst.clas.abap +++ b/src/zcl_excel_theme_extlst.clas.abap @@ -23,7 +23,6 @@ CLASS ZCL_EXCEL_THEME_EXTLST IMPLEMENTATION. method build_xml. - data: lo_theme_element type ref to if_ixml_element. data: lo_theme type ref to if_ixml_element. data: lo_theme_objdef type ref to if_ixml_element. check io_document is bound. diff --git a/src/zcl_excel_theme_fmt_scheme.clas.abap b/src/zcl_excel_theme_fmt_scheme.clas.abap index 4b205e3..1598513 100644 --- a/src/zcl_excel_theme_fmt_scheme.clas.abap +++ b/src/zcl_excel_theme_fmt_scheme.clas.abap @@ -29,8 +29,6 @@ CLASS ZCL_EXCEL_THEME_FMT_SCHEME IMPLEMENTATION. method build_xml. data: lo_xml type ref to cl_xml_document. data: lo_node type ref to if_ixml_node. - data: default_fmt_scheme type string. - data: lo_scheme_element type ref to if_ixml_element. data: lo_elements type ref to if_ixml_element. check io_document is bound. lo_elements ?= io_document->find_from_name_ns( name = zcl_excel_theme=>c_theme_elements ). diff --git a/src/zcl_excel_theme_objectdefaults.clas.abap b/src/zcl_excel_theme_objectdefaults.clas.abap index 26f58c0..85752be 100644 --- a/src/zcl_excel_theme_objectdefaults.clas.abap +++ b/src/zcl_excel_theme_objectdefaults.clas.abap @@ -23,7 +23,6 @@ CLASS ZCL_EXCEL_THEME_OBJECTDEFAULTS IMPLEMENTATION. method build_xml. - data: lo_theme_element type ref to if_ixml_element. data: lo_theme type ref to if_ixml_element. data: lo_theme_objdef type ref to if_ixml_element. check io_document is bound. diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap index 9b97c76..62f2d62 100644 --- a/src/zcl_excel_worksheet.clas.abap +++ b/src/zcl_excel_worksheet.clas.abap @@ -626,7 +626,6 @@ method BIND_ALV_OLE2. data: l_has_activex, l_doctype_excel_sheet(11) type c. - data: wa_DOC_HANDLE Type CNTL_HANDLE. * LVC data: lt_fieldcat_lvc type LVC_T_FCAT. @@ -773,8 +772,6 @@ method BIND_ALV_OLE2. * Data for session 4: write to excel * ------------------------------------------ - data: data_starting_at type i value 1. - data: data_ending_at type i value -1. data: sema_type type c. data l_error type ref to c_oi_proxy_error. @@ -1562,7 +1559,6 @@ method BIND_ALV_OLE2. endselect. data: comma_elim(4) type c. - data: help6 type i. field-symbols type any. data search_item(4) value ' #'. @@ -1907,7 +1903,6 @@ method BIND_ALV_OLE2. curritem-number = 1. curritem-input = -1. - data: conv_exit(10) type c. data: const type i. * Change for Correction request @@ -2323,7 +2318,6 @@ method BIND_ALV_OLE2. help = rowmax + realmit. " table + header lines - data: item type colxxl_t. data: lt_format type soi_format_table. data: wa_format like line of lt_format. data: wa_format_temp like line of lt_format. @@ -2712,7 +2706,6 @@ method BIND_TABLE. FIELD-SYMBOLS: TYPE zexcel_s_fieldcatalog, - TYPE zexcel_s_fieldcatalog, TYPE ANY, TYPE ANY. @@ -3252,8 +3245,6 @@ method CALCULATE_COLUMN_WIDTHS. DATA: auto_size TYPE flag. DATA: auto_sizes TYPE tt_auto_size. * DATA: col_alpha TYPE zexcel_cell_column_alpha." issue #155 - less restrictive typing for ip_column - DATA: cell_value TYPE zexcel_cell_value. - DATA: cell_style TYPE REF TO zcl_excel_style. DATA: count TYPE int4. DATA: highest_row TYPE int4. DATA: width TYPE float. @@ -3721,8 +3712,6 @@ ENDMETHOD. method FREEZE_PANES. - data: lv_xsplit type i, - lv_ysplit type i. IF ip_num_columns IS NOT SUPPLIED AND ip_num_rows IS NOT SUPPLIED. RAISE EXCEPTION TYPE zcx_excel @@ -3749,8 +3738,7 @@ method FREEZE_PANES. method GENERATE_TITLE. DATA: lo_worksheets_iterator TYPE REF TO cl_object_collection_iterator, - lo_worksheet TYPE REF TO zcl_excel_worksheet, - errormessage TYPE string. + lo_worksheet TYPE REF TO zcl_excel_worksheet. DATA: t_titles TYPE HASHED TABLE OF zexcel_sheet_title WITH UNIQUE KEY table_line, title TYPE zexcel_sheet_title, @@ -3800,8 +3788,6 @@ method GET_CELL. DATA: lv_column TYPE zexcel_cell_column, ls_sheet_content TYPE zexcel_s_cell_data. - FIELD-SYMBOLS: TYPE zexcel_s_cell_data. - lv_column = zcl_excel_common=>convert_column2int( ip_column ). READ TABLE sheet_content INTO ls_sheet_content WITH TABLE KEY cell_row = ip_row @@ -4341,7 +4327,6 @@ method SET_CELL. lv_value TYPE zexcel_cell_value, lv_data_type TYPE zexcel_cell_data_type, lv_value_type TYPE abap_typekind, - lo_style TYPE REF TO zcl_excel_style, lv_style_guid TYPE zexcel_cell_style, lo_addit TYPE REF TO cl_abap_elemdescr, lo_value TYPE REF TO data, @@ -4592,9 +4577,6 @@ method SET_CELL_FORMULA. method SET_CELL_STYLE. DATA: lv_column TYPE zexcel_cell_column, - ls_sheet_content TYPE zexcel_s_cell_data, - lv_row_alpha TYPE string, - lo_style TYPE REF TO zcl_excel_style, lv_style_guid TYPE zexcel_cell_style. FIELD-SYMBOLS: TYPE zexcel_s_cell_data. @@ -4664,8 +4646,6 @@ METHOD set_merge. DATA: ls_merge TYPE mty_merge, lv_errormessage TYPE string. - FIELD-SYMBOLS: LIKE LINE OF me->mt_merged_cells. - *--------------------------------------------------------------------* * Build new range area to insert into range table *--------------------------------------------------------------------* @@ -4807,11 +4787,8 @@ method SET_TABLE. DATA: lo_tabdescr TYPE REF TO cl_abap_structdescr, lr_data TYPE REF TO data, - ls_newline TYPE REF TO data, ls_header TYPE x030l, lt_dfies TYPE ddfields, - lv_row_header TYPE zexcel_cell_row VALUE 2, - lv_col_header TYPE zexcel_cell_column_alpha VALUE 'B', lv_row_int TYPE zexcel_cell_row, lv_column_int TYPE zexcel_cell_column, lv_column_alpha TYPE zexcel_cell_column_alpha, @@ -4820,8 +4797,7 @@ method SET_TABLE. FIELD-SYMBOLS: TYPE ANY, TYPE ANY, - TYPE dfies, - TYPE zexcel_cell_value. + TYPE dfies. lv_column_int = zcl_excel_common=>convert_column2int( ip_top_left_column ). lv_row_int = ip_top_left_row. @@ -5079,9 +5055,6 @@ method ZIF_EXCEL_SHEET_PRINTSETTINGS~SET_PRINT_REPEAT_COLUMNS. lv_col_to_int TYPE i, lv_errormessage TYPE string. - DATA: lo_range_iterator TYPE REF TO cl_object_collection_iterator, - lo_range TYPE REF TO zcl_excel_range. - lv_col_from_int = zcl_excel_common=>convert_column2int( iv_columns_from ). lv_col_to_int = zcl_excel_common=>convert_column2int( iv_columns_to ). @@ -5126,10 +5099,6 @@ method ZIF_EXCEL_SHEET_PRINTSETTINGS~SET_PRINT_REPEAT_ROWS. DATA: lv_errormessage TYPE string. - DATA: lo_range_iterator TYPE REF TO cl_object_collection_iterator, - lo_range TYPE REF TO zcl_excel_range. - - *--------------------------------------------------------------------* * Check if valid range is supplied diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap index e649841..3c86caf 100644 --- a/src/zcl_excel_writer_2007.clas.abap +++ b/src/zcl_excel_writer_2007.clas.abap @@ -425,7 +425,6 @@ method CREATE_CONTENT_TYPES. DATA: lv_worksheets_num TYPE i, lv_worksheets_numc TYPE numc3, lv_xml_node_worksheet_pn TYPE string, - lv_xml_size TYPE i, lv_value TYPE string, lv_drawing_index TYPE i VALUE 1, lv_index_str TYPE string. @@ -1012,8 +1011,7 @@ METHOD create_dxf_style. lc_xml_node_patternfill TYPE string VALUE 'patternFill', lc_xml_attr_patterntype TYPE string VALUE 'patternType', lc_xml_node_fgcolor TYPE string VALUE 'fgColor', - lc_xml_node_bgcolor TYPE string VALUE 'bgColor', - y TYPE i VALUE 0. + lc_xml_node_bgcolor TYPE string VALUE 'bgColor'. DATA: ls_styles_mapping TYPE zexcel_s_styles_mapping, ls_cellxfs TYPE zexcel_s_cellxfs, @@ -1025,8 +1023,7 @@ METHOD create_dxf_style. lo_element_font TYPE REF TO if_ixml_element, lv_value TYPE string, ls_fill TYPE zexcel_s_style_fill, - lo_element_fill TYPE REF TO if_ixml_element, - x. + lo_element_fill TYPE REF TO if_ixml_element. CHECK iv_cell_style IS NOT INITIAL. @@ -1338,12 +1335,10 @@ method CREATE_XL_CHARTS. DATA: lo_ixml TYPE REF TO if_ixml, lo_document TYPE REF TO if_ixml_document, lo_element_root TYPE REF TO if_ixml_element, - lo_element_cellanchor TYPE REF TO if_ixml_element, lo_encoding TYPE REF TO if_ixml_encoding, lo_streamfactory TYPE REF TO if_ixml_stream_factory, lo_ostream TYPE REF TO if_ixml_ostream, lo_renderer TYPE REF TO if_ixml_renderer. - DATA: lv_rel_id TYPE i. DATA lo_element TYPE REF TO if_ixml_element. DATA lo_element2 TYPE REF TO if_ixml_element. @@ -2147,9 +2142,6 @@ method CREATE_XL_DRAWINGS. lc_xml_node_ns_xdr TYPE string VALUE 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing', lc_xml_node_ns_a TYPE string VALUE 'http://schemas.openxmlformats.org/drawingml/2006/main'. - CONSTANTS: lc_on TYPE string VALUE '1', - lc_off TYPE string VALUE '0'. - DATA: lo_ixml TYPE REF TO if_ixml, lo_document TYPE REF TO if_ixml_document, lo_element_root TYPE REF TO if_ixml_element, @@ -2357,10 +2349,6 @@ method CREATE_XL_DRAWING_ANCHOR. lc_xml_node_astretch TYPE string VALUE 'a:stretch', lc_xml_node_ns_r TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships'. - - CONSTANTS: lc_on TYPE string VALUE '1', - lc_off TYPE string VALUE '0'. - DATA: lo_element_graphicframe TYPE REF TO if_ixml_element, lo_element TYPE REF TO if_ixml_element, lo_element2 TYPE REF TO if_ixml_element, @@ -2370,9 +2358,7 @@ method CREATE_XL_DRAWING_ANCHOR. lo_element_ext TYPE REF TO if_ixml_element, lo_element_pic TYPE REF TO if_ixml_element, lo_element_clientdata TYPE REF TO if_ixml_element, - ls_position TYPE zexcel_drawing_position, - lv_col TYPE string, " zexcel_cell_column, lv_row TYPE string, " zexcel_cell_row. lv_col_offset TYPE string, @@ -2801,7 +2787,6 @@ METHOD create_xl_sharedstrings. DATA: lt_cell_data TYPE zexcel_t_cell_data_unsorted, ls_shared_string TYPE zexcel_s_shared_string, - lv_value TYPE string, lv_count_str TYPE string, lv_uniquecount_str TYPE string, lv_sytabix TYPE sytabix, @@ -2930,10 +2915,6 @@ METHOD create_xl_sheet. *--------------------------------------------------------------------* * issue #220 - If cell in tables-area don't use default from row or column or sheet - Declarations 1 - end *--------------------------------------------------------------------* -** Constants - CONSTANTS: - lc_dummy_cell_content TYPE zexcel_s_cell_data-cell_value VALUE '})~~~ This is a dummy value for ABAP2XLSX and you should never find this in a real excelsheet Ihope'. - ** Constant node name DATA: lc_xml_node_worksheet TYPE string VALUE 'worksheet', @@ -3079,7 +3060,6 @@ METHOD create_xl_sheet. lc_xml_attr_colid TYPE string VALUE 'colId', lc_xml_attr_filtermode TYPE string VALUE 'filterMode', lc_xml_attr_tabcolor_rgb TYPE string VALUE 'rgb', - lc_xml_attr_tabcolor_theme TYPE string VALUE 'theme', " Node namespace lc_xml_node_ns TYPE string VALUE 'http://schemas.openxmlformats.org/spreadsheetml/2006/main', lc_xml_node_r_ns TYPE string VALUE 'http://schemas.openxmlformats.org/officeDocument/2006/relationships', @@ -3109,10 +3089,7 @@ METHOD create_xl_sheet. DATA: lv_value TYPE string, lt_range_merge TYPE string_table, - lv_merge TYPE string, - lv_column_p TYPE zexcel_cell_column_alpha, lv_column TYPE zexcel_cell_column, - lv_cell_value TYPE zexcel_cell_value, lv_style_guid TYPE zexcel_cell_style, lv_flag TYPE c, ls_databar TYPE zexcel_conditional_databar, " Databar by Albert Lladanosa @@ -3127,7 +3104,6 @@ METHOD create_xl_sheet. lt_colors TYPE TABLE OF colors, ls_colors TYPE colors, lv_cell_row_s TYPE string, - ls_last_row TYPE zexcel_s_cell_data, ls_style_mapping TYPE zexcel_s_styles_mapping, lv_freeze_cell_row TYPE zexcel_cell_row, lv_freeze_cell_column TYPE zexcel_cell_column, @@ -3160,11 +3136,8 @@ METHOD create_xl_sheet. - FIELD-SYMBOLS: TYPE zexcel_s_cell_data, - LIKE LINE OF lt_range_merge, - TYPE zexcel_s_worksheet_columndime, - TYPE zexcel_s_worksheet_rowdimensio, - LIKE LINE OF lts_row_outlines. + FIELD-SYMBOLS: LIKE LINE OF lt_range_merge, + TYPE zexcel_s_worksheet_columndime. *--------------------------------------------------------------------* * issue #220 - If cell in tables-area don't use default from row or column or sheet - Declarations 2 - start @@ -5133,9 +5106,7 @@ METHOD create_xl_sheet_sheet_data. lv_value TYPE string, lv_style_guid TYPE zexcel_cell_style, - lv_column_p TYPE zexcel_cell_column_alpha, - - xxx. + lv_column_p TYPE zexcel_cell_column_alpha. FIELD-SYMBOLS: TYPE zexcel_s_cell_data, TYPE zexcel_s_worksheet_columndime, @@ -5143,9 +5114,6 @@ METHOD create_xl_sheet_sheet_data. LIKE LINE OF lts_row_outlines. - DATA: lv_xstring_partial TYPE xstring, - lv_xstring TYPE xstring. - " sheetData node rv_ixml_sheet_data_root = io_document->create_simple_element( name = lc_xml_node_sheetdata parent = io_document ). @@ -5529,7 +5497,6 @@ METHOD create_xl_styles. lc_xml_node_cellstyles TYPE string VALUE 'cellStyles', lc_xml_node_cellstyle TYPE string VALUE 'cellStyle', lc_xml_node_dxfs TYPE string VALUE 'dxfs', - lc_xml_node_dxf TYPE string VALUE 'dxf', lc_xml_node_tablestyles TYPE string VALUE 'tableStyles', " Colors lc_xml_node_colors TYPE string VALUE 'colors', @@ -6750,7 +6717,6 @@ METHOD create_xl_workbook. lc_xml_attr_lastedited TYPE string VALUE 'lastEdited', lc_xml_attr_lowestedited TYPE string VALUE 'lowestEdited', lc_xml_attr_rupbuild TYPE string VALUE 'rupBuild', - lc_xml_attr_themeversion TYPE string VALUE 'defaultThemeVersion', lc_xml_attr_xwindow TYPE string VALUE 'xWindow', lc_xml_attr_ywindow TYPE string VALUE 'yWindow', lc_xml_attr_windowwidth TYPE string VALUE 'windowWidth', @@ -7083,7 +7049,6 @@ METHOD render_ixml_element_no_header. DATA: lv_content TYPE string. - DATA: lv_contentx TYPE xstring. ********************************************************************** * STEP 1: Create [Content_Types].xml into the root of the ZIP diff --git a/src/zcl_excel_writer_xlsm.clas.abap b/src/zcl_excel_writer_xlsm.clas.abap index 9689c20..dc164af 100644 --- a/src/zcl_excel_writer_xlsm.clas.abap +++ b/src/zcl_excel_writer_xlsm.clas.abap @@ -244,7 +244,6 @@ METHOD create_content_types. lc_xml_attr_partname TYPE string VALUE 'PartName', lc_xml_attr_extension TYPE string VALUE 'Extension', lc_xml_attr_contenttype TYPE string VALUE 'ContentType', - lc_xml_attr_codename TYPE string VALUE 'codeName', lc_xml_node_workb_pn TYPE string VALUE '/xl/workbook.xml', lc_xml_node_bin_ext TYPE string VALUE 'bin', lc_xml_node_bin_ct TYPE string VALUE 'application/vnd.ms-office.vbaProject'. @@ -257,15 +256,12 @@ METHOD create_content_types. lo_element TYPE REF TO if_ixml_element, lo_collection TYPE REF TO if_ixml_node_collection, lo_iterator TYPE REF TO if_ixml_node_iterator, - lo_node TYPE REF TO if_ixml_node, - lo_encoding TYPE REF TO if_ixml_encoding, lo_streamfactory TYPE REF TO if_ixml_stream_factory, lo_ostream TYPE REF TO if_ixml_ostream, lo_renderer TYPE REF TO if_ixml_renderer. DATA: lv_subrc TYPE sysubrc, - lv_contenttype TYPE string, - lv_syindex(2) TYPE c. + lv_contenttype TYPE string. ********************************************************************** * STEP 3: Create standard contentType @@ -321,8 +317,7 @@ ENDMETHOD. METHOD create_xl_relationships. ** Constant node name - DATA: lc_xml_node_relationships TYPE string VALUE 'Relationships', - lc_xml_node_relationship TYPE string VALUE 'Relationship', + DATA: lc_xml_node_relationship TYPE string VALUE 'Relationship', " Node attributes lc_xml_attr_id TYPE string VALUE 'Id', lc_xml_attr_type TYPE string VALUE 'Type', @@ -339,14 +334,11 @@ METHOD create_xl_relationships. lo_document_xml TYPE REF TO cl_xml_document, lo_element_root TYPE REF TO if_ixml_node, lo_element TYPE REF TO if_ixml_element, - lo_node TYPE REF TO if_ixml_node, - lo_encoding TYPE REF TO if_ixml_encoding, lo_streamfactory TYPE REF TO if_ixml_stream_factory, lo_ostream TYPE REF TO if_ixml_ostream, lo_renderer TYPE REF TO if_ixml_renderer. - DATA: lv_xml_node_ridx_tg TYPE string, - lv_xml_node_ridx_id TYPE string, + DATA: lv_xml_node_ridx_id TYPE string, lv_size TYPE i, lv_subrc TYPE sysubrc, lv_syindex(2) TYPE c. @@ -408,14 +400,11 @@ METHOD create_xl_sheet. lo_element TYPE REF TO if_ixml_element, lo_collection TYPE REF TO if_ixml_node_collection, lo_iterator TYPE REF TO if_ixml_node_iterator, - lo_node TYPE REF TO if_ixml_node, - lo_encoding TYPE REF TO if_ixml_encoding, lo_streamfactory TYPE REF TO if_ixml_stream_factory, lo_ostream TYPE REF TO if_ixml_ostream, lo_renderer TYPE REF TO if_ixml_renderer. - DATA: lv_subrc TYPE sysubrc, - lv_syindex(2) TYPE c. + DATA: lv_subrc TYPE sysubrc. ********************************************************************** * STEP 3: Create standard relationship @@ -463,14 +452,11 @@ METHOD create_xl_workbook. lo_element TYPE REF TO if_ixml_element, lo_collection TYPE REF TO if_ixml_node_collection, lo_iterator TYPE REF TO if_ixml_node_iterator, - lo_node TYPE REF TO if_ixml_node, - lo_encoding TYPE REF TO if_ixml_encoding, lo_streamfactory TYPE REF TO if_ixml_stream_factory, lo_ostream TYPE REF TO if_ixml_ostream, lo_renderer TYPE REF TO if_ixml_renderer. - DATA: lv_subrc TYPE sysubrc, - lv_syindex(2) TYPE c. + DATA: lv_subrc TYPE sysubrc. ********************************************************************** * STEP 3: Create standard relationship diff --git a/src/zdemo_excel26.prog.abap b/src/zdemo_excel26.prog.abap index 2961721..9d379cd 100644 --- a/src/zdemo_excel26.prog.abap +++ b/src/zdemo_excel26.prog.abap @@ -129,7 +129,6 @@ endform. " USER_COMMAND * This subroutine is principal demo session *--------------------------------------------------------------------* form export_to_excel. - data: lo_converter type ref to zcl_excel_converter. * create zcl_excel_worksheet object create object lo_excel.