diff --git a/abaplint.json b/abaplint.json index 9e6c310..2c9e71e 100644 --- a/abaplint.json +++ b/abaplint.json @@ -177,6 +177,7 @@ "method_parameter_names": false, "inline_data_old_versions": true, "local_variable_names": false, - "class_attribute_names": false + "class_attribute_names": false, + "commented_code": true } } diff --git a/src/demos/zangry_birds.prog.abap b/src/demos/zangry_birds.prog.abap index 1c3b053..3ad0d17 100644 --- a/src/demos/zangry_birds.prog.abap +++ b/src/demos/zangry_birds.prog.abap @@ -148,7 +148,6 @@ START-OF-SELECTION. lo_style_link = lo_excel->add_new_style( ). lo_style_link->alignment->horizontal = zcl_excel_style_alignment=>c_horizontal_center. lo_style_link->alignment->vertical = zcl_excel_style_alignment=>c_vertical_center. -* lo_style_link->font->size = 20. lv_style_link_guid = lo_style_link->get_guid( ). " Create image map " line 2 @@ -745,9 +744,6 @@ START-OF-SELECTION. output_length = lv_bytecount TABLES binary_tab = lt_file_tab. -* " This method is only available on AS ABAP > 6.40 -* lt_file_tab = cl_bcs_convert=>xstring_to_solix( iv_xstring = lv_file ). -* lv_bytecount = xstrlen( lv_file ). " Save the file cl_gui_frontend_services=>gui_download( EXPORTING bin_filesize = lv_bytecount diff --git a/src/demos/zdemo_calendar.prog.abap b/src/demos/zdemo_calendar.prog.abap index 992ea10..90450af 100644 --- a/src/demos/zdemo_calendar.prog.abap +++ b/src/demos/zdemo_calendar.prog.abap @@ -271,17 +271,6 @@ START-OF-SELECTION. ip_style = lv_style_month_guid ). -* to_col_int = zcl_excel_common=>convert_column2int( from_col ) + 7. -* to_col = zcl_excel_common=>convert_column2alpha( to_col_int ). -* -* lo_worksheet->set_merge( -* EXPORTING -* ip_column_start = from_col " Cell Column Start -* ip_column_end = to_col " Cell Column End -* ip_row = row " Cell Row -* ip_row_to = row " Cell Row -* ). - " Add drawing from a XSTRING read from a file UNASSIGN . READ TABLE image_descriptions WITH KEY month_nr = month_nr ASSIGNING . @@ -354,11 +343,6 @@ START-OF-SELECTION. ENDIF. " Add Calendar -* CALL FUNCTION 'SLS_MISC_GET_LAST_DAY_OF_MONTH' -* EXPORTING -* day_in = date_from -* IMPORTING -* last_day_of_month = date_to. date_to = date_from. date_to+6(2) = '01'. " First of month ADD 31 TO date_to. " Somewhere in following month diff --git a/src/demos/zdemo_excel1.prog.abap b/src/demos/zdemo_excel1.prog.abap index 5c3c083..babc0e4 100644 --- a/src/demos/zdemo_excel1.prog.abap +++ b/src/demos/zdemo_excel1.prog.abap @@ -24,7 +24,6 @@ START-OF-SELECTION. " Get active sheet lo_worksheet = lo_excel->get_active_worksheet( ). -* lo_worksheet->set_title( ip_title = 'Sheet1' ). lo_worksheet->set_cell( ip_column = 'B' ip_row = 2 ip_value = 'Hello world' ). lo_worksheet->set_cell( ip_column = 'B' ip_row = 3 ip_value = sy-datum ). lo_worksheet->set_cell( ip_column = 'C' ip_row = 3 ip_value = sy-uzeit ). diff --git a/src/demos/zdemo_excel15.prog.abap b/src/demos/zdemo_excel15.prog.abap index 21cfdb7..0c16995 100644 --- a/src/demos/zdemo_excel15.prog.abap +++ b/src/demos/zdemo_excel15.prog.abap @@ -150,9 +150,6 @@ START-OF-SELECTION. output_length = lv_bytecount TABLES binary_tab = lt_file_tab. -* " This method is only available on AS ABAP > 6.40 -* lt_file_tab = cl_bcs_convert=>xstring_to_solix( iv_xstring = lv_file ). -* lv_bytecount = xstrlen( lv_file ). " Save the file cl_gui_frontend_services=>gui_download( EXPORTING bin_filesize = lv_bytecount diff --git a/src/demos/zdemo_excel16.prog.abap b/src/demos/zdemo_excel16.prog.abap index e7942f5..15368b5 100644 --- a/src/demos/zdemo_excel16.prog.abap +++ b/src/demos/zdemo_excel16.prog.abap @@ -63,8 +63,6 @@ START-OF-SELECTION. error_no_gui = 18 OTHERS = 19. IF sy-subrc <> 0. -* MESSAGE ID sy-msgid TYPE sy-msgty NUMBER sy-msgno -* WITH sy-msgv1 sy-msgv2 sy-msgv3 sy-msgv4. ENDIF. CALL FUNCTION 'SCMS_BINARY_TO_XSTRING' diff --git a/src/demos/zdemo_excel19.prog.abap b/src/demos/zdemo_excel19.prog.abap index 2e55fda..34bd240 100644 --- a/src/demos/zdemo_excel19.prog.abap +++ b/src/demos/zdemo_excel19.prog.abap @@ -40,7 +40,6 @@ START-OF-SELECTION. lo_worksheet->set_cell( ip_row = 1 ip_column = 'A' ip_value = 'This is Sheet 3' ). IF p_noout EQ abap_false. - " lo_excel->set_active_sheet_index_by_name( data_sheet_name ). DATA: active_sheet_index TYPE zexcel_active_worksheet. active_sheet_index = lo_excel->get_active_sheet_index( ). WRITE: 'Sheet Index before: ', active_sheet_index. diff --git a/src/demos/zdemo_excel2.prog.abap b/src/demos/zdemo_excel2.prog.abap index 7a4d778..b4972f9 100644 --- a/src/demos/zdemo_excel2.prog.abap +++ b/src/demos/zdemo_excel2.prog.abap @@ -305,26 +305,4 @@ START-OF-SELECTION. lo_row->set_row_height( ip_row_height = 30 ). - -* CREATE OBJECT lo_excel_writer TYPE zcl_excel_writer_2007. -* lv_file = lo_excel_writer->write_file( lo_excel ). -* -* " Convert to binary -* CALL FUNCTION 'SCMS_XSTRING_TO_BINARY' -* EXPORTING -* buffer = lv_file -* IMPORTING -* output_length = lv_bytecount -* TABLES -* binary_tab = lt_file_tab. -** " This method is only available on AS ABAP > 6.40 -** lt_file_tab = cl_bcs_convert=>xstring_to_solix( iv_xstring = lv_file ). -** lv_bytecount = xstrlen( lv_file ). -* -* " Save the file -* cl_gui_frontend_services=>gui_download( EXPORTING bin_filesize = lv_bytecount -* filename = lv_full_path -* filetype = 'BIN' -* CHANGING data_tab = lt_file_tab ). - lcl_output=>output( lo_excel ). diff --git a/src/demos/zdemo_excel23.prog.abap b/src/demos/zdemo_excel23.prog.abap index a20ed2e..5a09ff4 100644 --- a/src/demos/zdemo_excel23.prog.abap +++ b/src/demos/zdemo_excel23.prog.abap @@ -82,7 +82,6 @@ START-OF-SELECTION. lo_worksheet->zif_excel_sheet_properties~zoomscale = 150. lo_worksheet->zif_excel_sheet_properties~zoomscale_normal = 150. - " lo_worksheet->sheet_setup->vertical_centered = abap_true. lo_worksheet->sheet_setup->horizontal_centered = abap_true. diff --git a/src/demos/zdemo_excel28.prog.abap b/src/demos/zdemo_excel28.prog.abap index 2809c1f..2cd4ec0 100644 --- a/src/demos/zdemo_excel28.prog.abap +++ b/src/demos/zdemo_excel28.prog.abap @@ -66,7 +66,6 @@ START-OF-SELECTION. zcl_excel_writer_csv=>set_endofline( ip_value = cl_abap_char_utilities=>cr_lf ). zcl_excel_writer_csv=>set_active_sheet_index( i_active_worksheet = 2 ). -* zcl_excel_writer_csv=>set_active_sheet_index_by_name( I_WORKSHEET_NAME = 'Sheet2' ). lv_file = lo_excel_writer->write_file( lo_excel ). @@ -78,9 +77,6 @@ START-OF-SELECTION. output_length = lv_bytecount TABLES binary_tab = lt_file_tab. -* " This method is only available on AS ABAP > 6.40 -* lt_file_tab = cl_bcs_convert=>xstring_to_solix( iv_xstring = lv_file ). -* lv_bytecount = xstrlen( lv_file ). " Save the file REPLACE FIRST OCCURRENCE OF '.csv' IN lv_full_path WITH '_Sheet2.csv'. @@ -89,7 +85,6 @@ START-OF-SELECTION. filetype = 'BIN' CHANGING data_tab = lt_file_tab ). -* zcl_excel_writer_csv=>set_active_sheet_index( i_active_worksheet = 2 ). zcl_excel_writer_csv=>set_active_sheet_index_by_name( i_worksheet_name = 'Sheet1' ). lv_file = lo_excel_writer->write_file( lo_excel ). REPLACE FIRST OCCURRENCE OF '_Sheet2.csv' IN lv_full_path WITH '_Sheet1.csv'. @@ -102,9 +97,6 @@ START-OF-SELECTION. output_length = lv_bytecount TABLES binary_tab = lt_file_tab. -* " This method is only available on AS ABAP > 6.40 -* lt_file_tab = cl_bcs_convert=>xstring_to_solix( iv_xstring = lv_file ). -* lv_bytecount = xstrlen( lv_file ). " Save the file cl_gui_frontend_services=>gui_download( EXPORTING bin_filesize = lv_bytecount diff --git a/src/demos/zdemo_excel32.prog.abap b/src/demos/zdemo_excel32.prog.abap index 555d894..0a16bca 100644 --- a/src/demos/zdemo_excel32.prog.abap +++ b/src/demos/zdemo_excel32.prog.abap @@ -149,21 +149,12 @@ FORM export_to_excel_conv RAISING zcx_excel. DATA: lo_converter TYPE REF TO zcl_excel_converter. CREATE OBJECT lo_converter. -*TRY. lo_converter->convert( EXPORTING io_alv = lo_salv it_table = gt_sbook i_row_int = 2 - i_column_int = 2 -* i_table = -* i_style_table = -* io_worksheet = -* CHANGING -* co_excel = - ). -* CATCH zcx_excel . -*ENDTRY. + i_column_int = 2 ). lo_converter->write_file( i_path = l_path ). ENDFORM. "EXPORT_TO_EXCEL_CONV @@ -180,16 +171,12 @@ FORM export_to_excel_bind RAISING zcx_excel. lo_worksheet->set_title( ip_title = 'Sheet1' ). * write to excel using method Bin_object -*try. lo_worksheet->bind_alv( io_alv = lo_salv it_table = gt_sbook i_top = 2 i_left = 1 ). -* catch zcx_excel . -*endtry. - PERFORM write_file. diff --git a/src/demos/zdemo_excel35.prog.abap b/src/demos/zdemo_excel35.prog.abap index 4a57325..32f8b04 100644 --- a/src/demos/zdemo_excel35.prog.abap +++ b/src/demos/zdemo_excel35.prog.abap @@ -163,9 +163,6 @@ START-OF-SELECTION. output_length = lv_bytecount TABLES binary_tab = lt_file_tab. -* " This method is only available on AS ABAP > 6.40 -* lt_file_tab = cl_bcs_convert=>xstring_to_solix( iv_xstring = lv_file ). -* lv_bytecount = xstrlen( lv_file ). " Save the file cl_gui_frontend_services=>gui_download( EXPORTING bin_filesize = lv_bytecount diff --git a/src/demos/zdemo_excel_comments.prog.abap b/src/demos/zdemo_excel_comments.prog.abap index dfaea09..4835f70 100644 --- a/src/demos/zdemo_excel_comments.prog.abap +++ b/src/demos/zdemo_excel_comments.prog.abap @@ -23,7 +23,6 @@ START-OF-SELECTION. " Get active sheet lo_worksheet = lo_excel->get_active_worksheet( ). -* lo_worksheet->set_title( ip_title = 'Sheet1' ). lo_worksheet->set_cell( ip_column = 'B' ip_row = 2 ip_value = 'Hello world' ). lo_worksheet->set_cell( ip_column = 'B' ip_row = 3 ip_value = sy-datum ). lo_worksheet->set_cell( ip_column = 'C' ip_row = 3 ip_value = sy-uzeit ). @@ -55,7 +54,6 @@ START-OF-SELECTION. lo_comment = lo_excel->add_new_comment( ). lo_comment->set_text( ip_ref = 'A8' ip_text = 'What about a comment on second sheet?' ). - " lo_comment->set_text( ip_column = 'A' ip_row = 8 ip_text = 'What about a comment on second sheet?' ). lo_worksheet->add_comment( lo_comment ). lo_excel->set_active_sheet_index_by_name( 'Sheet1' ). diff --git a/src/demos/zdemo_excel_outputopt_incl.prog.abap b/src/demos/zdemo_excel_outputopt_incl.prog.abap index fecdc97..62e5bd6 100644 --- a/src/demos/zdemo_excel_outputopt_incl.prog.abap +++ b/src/demos/zdemo_excel_outputopt_incl.prog.abap @@ -86,19 +86,9 @@ CLASS lcl_output IMPLEMENTATION. ENDIF. cl_output->xdata = cl_writer->write_file( cl_excel ). -* After 6.40 via cl_bcs_convert cl_output->t_rawdata = cl_bcs_convert=>xstring_to_solix( iv_xstring = cl_output->xdata ). cl_output->bytecount = xstrlen( cl_output->xdata ). -* before 6.40 -* CALL FUNCTION 'SCMS_XSTRING_TO_BINARY' -* EXPORTING -* buffer = cl_output->xdata -* IMPORTING -* output_length = cl_output->bytecount -* TABLES -* binary_tab = cl_output->t_rawdata. - CASE 'X'. WHEN rb_down. IF sy-batch IS INITIAL. @@ -348,10 +338,6 @@ CLASS lcl_output IMPLEMENTATION. * add document to send request cl_send_request->set_document( cl_document ). -* set sender in case if no own email is availabe -* cl_sender = cl_cam_address_bcs=>create_internet_address( 'sender@sender.sender' ). -* cl_send_request->set_sender( cl_sender ). - * add recipient(s) - here only 1 will be needed send_to = p_email. IF send_to IS INITIAL. diff --git a/src/not_cloud/zcl_excel_ole.clas.abap b/src/not_cloud/zcl_excel_ole.clas.abap index b97e571..0c1a7b3 100644 --- a/src/not_cloud/zcl_excel_ole.clas.abap +++ b/src/not_cloud/zcl_excel_ole.clas.abap @@ -1960,11 +1960,6 @@ CLASS zcl_excel_ole IMPLEMENTATION. lo_error_w = l_error. lc_retcode = lo_error_w->error_code. -** catch no_flush -> led to dump ( optional ) -* go_error = l_error. -* gc_retcode = go_error->error_code. -* error_doi. - CLEAR: lt_sema, wa_sema, @@ -2051,8 +2046,6 @@ CLASS zcl_excel_ole IMPLEMENTATION. IF l_is_closed IS INITIAL. CALL METHOD lo_proxy->close_document -* EXPORTING -* do_save = do_save IMPORTING error = lo_error retcode = lc_retcode. diff --git a/src/zcl_excel.clas.abap b/src/zcl_excel.clas.abap index 738d760..4b140fa 100644 --- a/src/zcl_excel.clas.abap +++ b/src/zcl_excel.clas.abap @@ -460,9 +460,6 @@ CLASS zcl_excel IMPLEMENTATION. IF sy-subrc <> 0. style-complete_style = ip_cstyle_complete. style-complete_stylex = ip_cstylex_complete. -* CALL FUNCTION 'GUID_CREATE' " del issue #379 - function is outdated in newer releases -* IMPORTING -* ev_guid_16 = style-guid. style-guid = zcl_excel_obsolete_func_wrap=>guid_create( ). " ins issue #379 - replacement for outdated function call INSERT style INTO TABLE me->t_stylemapping1. INSERT style INTO TABLE me->t_stylemapping2. diff --git a/src/zcl_excel_common.clas.abap b/src/zcl_excel_common.clas.abap index f035070..c5d3e37 100644 --- a/src/zcl_excel_common.clas.abap +++ b/src/zcl_excel_common.clas.abap @@ -375,11 +375,9 @@ CLASS zcl_excel_common IMPLEMENTATION. * Normalize input ( upper case , no gaps ) *--------------------------------------------------------------------* lv_column_c = ip_column. -* TRANSLATE lv_column TO UPPER CASE. " Fix #246 TRANSLATE lv_column_c TO UPPER CASE. " Fix #246 CONDENSE lv_column_c NO-GAPS. IF lv_column_c EQ ''. -* lv_errormessage = 'Unable to interpret input as column'(003). MESSAGE e800(zabap2xlsx) INTO lv_errormessage. zcx_excel=>raise_symsg( ). ENDIF. @@ -420,7 +418,6 @@ CLASS zcl_excel_common IMPLEMENTATION. *--------------------------------------------------------------------* lv_column_s = lv_column_c. IF lv_column_s CN sy-abcde. -* lv_errormessage = 'Unable to interpret input as column'(003). MESSAGE e800(zabap2xlsx) INTO lv_errormessage. zcx_excel=>raise_symsg( ). ENDIF. @@ -435,7 +432,6 @@ CLASS zcl_excel_common IMPLEMENTATION. lv_column = lv_column_c. lv_modulo = cl_abap_conv_out_ce=>uccpi( lv_column+0(1) ) MOD zcl_excel_common=>c_excel_col_module. IF lv_modulo < 1 OR lv_modulo > 26. -* lv_errormessage = 'Unable to interpret input as column'(003). MESSAGE e800(zabap2xlsx) INTO lv_errormessage. zcx_excel=>raise_symsg( ). ENDIF. @@ -447,7 +443,6 @@ CLASS zcl_excel_common IMPLEMENTATION. CHECK lv_column+1(1) IS NOT INITIAL. " No need to continue if string ended lv_modulo = cl_abap_conv_out_ce=>uccpi( lv_column+1(1) ) MOD zcl_excel_common=>c_excel_col_module. IF lv_modulo < 1 OR lv_modulo > 26. -* lv_errormessage = 'Unable to interpret input as column'(003). MESSAGE e800(zabap2xlsx) INTO lv_errormessage. zcx_excel=>raise_symsg( ). ENDIF. @@ -459,7 +454,6 @@ CLASS zcl_excel_common IMPLEMENTATION. CHECK lv_column+2(1) IS NOT INITIAL. " No need to continue if string ended lv_modulo = cl_abap_conv_out_ce=>uccpi( lv_column+2(1) ) MOD zcl_excel_common=>c_excel_col_module. IF lv_modulo < 1 OR lv_modulo > 26. -* lv_errormessage = 'Unable to interpret input as column'(003). MESSAGE e800(zabap2xlsx) INTO lv_errormessage. zcx_excel=>raise_symsg( ). ENDIF. @@ -993,9 +987,6 @@ CLASS zcl_excel_common IMPLEMENTATION. CASE wa_component-type_kind. WHEN cl_abap_structdescr=>typekind_struct1 OR cl_abap_structdescr=>typekind_struct2. " Structure --> use recursio -* IF flag_class = abap_true. -** Only borders will be passed as unbound references. But since we want to set a value we have to create an instance -* ENDIF. zcl_excel_common=>recursive_class_to_struct( EXPORTING i_source = CHANGING e_target = e_targetx = ). @@ -1062,9 +1053,6 @@ CLASS zcl_excel_common IMPLEMENTATION. zcl_excel_common=>recursive_struct_to_class( EXPORTING i_source = i_sourcex = CHANGING e_target = ). -* WHEN cl_abap_structdescr=>typekind_struct2. " String -* CHECK = abap_true. " Marked for change -* = . WHEN OTHERS. CHECK = abap_true. " Marked for change = . @@ -1418,8 +1406,6 @@ CLASS zcl_excel_common IMPLEMENTATION. CONCATENATE lv_cur_form lv_absrow lv_trow1 INTO lv_cur_form. ELSEIF iv_shift_rows = 0. CONCATENATE lv_cur_form lv_trow1 INTO lv_cur_form. -* elseif lv_trow2 < 1. -* CONCATENATE lv_cur_form lc_cell_reference_error INTO lv_cur_form. ELSE. CONCATENATE lv_cur_form lv_trow2 INTO lv_cur_form. ENDIF. diff --git a/src/zcl_excel_converter.clas.abap b/src/zcl_excel_converter.clas.abap index 4fa17c8..a462297 100644 --- a/src/zcl_excel_converter.clas.abap +++ b/src/zcl_excel_converter.clas.abap @@ -529,8 +529,6 @@ CLASS zcl_excel_converter IMPLEMENTATION. READ TABLE wt_styles INTO ls_styles WITH KEY guid = i_style. IF sy-subrc = 0. lo_style = wo_excel->add_new_style( ). -* lo_style->borders = ls_styles-style->borders. -* lo_style->protection = ls_styles-style->protection. lo_style->font->bold = ls_styles-style->font->bold. lo_style->alignment->horizontal = ls_styles-style->alignment->horizontal. lo_style->number_format->format_code = ls_styles-style->number_format->format_code. @@ -586,8 +584,6 @@ CLASS zcl_excel_converter IMPLEMENTATION. not_supported_by_gui = 4 ). IF sy-subrc <> 0. -* MESSAGE ID SY-MSGID TYPE SY-MSGTY NUMBER SY-MSGNO -* WITH SY-MSGV1 SY-MSGV2 SY-MSGV3 SY-MSGV4. CONCATENATE 'Excel_' w_fcount '.xlsx' INTO r_path. ELSE. DO. @@ -1656,8 +1652,6 @@ CLASS zcl_excel_converter IMPLEMENTATION. ASSIGN wo_data->* TO . -* catch zcx_excel . -*endtry. IF wo_excel IS BOUND. get_file( IMPORTING e_bytecount = l_bytecount et_file = lt_file ) . @@ -1671,13 +1665,6 @@ CLASS zcl_excel_converter IMPLEMENTATION. cl_gui_frontend_services=>execute( EXPORTING document = l_dir -* application = -* parameter = -* default_directory = -* maximized = -* minimized = -* synchronous = -* operation = 'OPEN' EXCEPTIONS cntl_error = 1 error_no_gui = 2 @@ -1810,8 +1797,6 @@ CLASS zcl_excel_converter IMPLEMENTATION. ASSIGN wo_data->* TO . -* catch zcx_excel . -*endtry. IF wo_excel IS BOUND. get_file( IMPORTING e_bytecount = l_bytecount et_file = lt_file ) . diff --git a/src/zcl_excel_converter_alv.clas.abap b/src/zcl_excel_converter_alv.clas.abap index ef4f446..48ed4cf 100644 --- a/src/zcl_excel_converter_alv.clas.abap +++ b/src/zcl_excel_converter_alv.clas.abap @@ -580,11 +580,7 @@ CLASS zcl_excel_converter_alv IMPLEMENTATION. READ TABLE wt_sort INTO ls_sort WITH KEY fieldname = ls_fcat-fieldname. IF sy-subrc = 0 AND ws_option-subtot <> abap_false. ls_fieldcatalog-sort_level = 0 . -* IF ls_fieldcatalog-totals_function IS INITIAL. " Not clear why not -* CLEAR ls_fieldcatalog-is_subtotalled. -* ELSE. ls_fieldcatalog-is_subtotalled = ls_sort-subtot. -* ENDIF. ls_fieldcatalog-is_collapsed = ls_sort-expa. IF ls_fieldcatalog-is_subtotalled = abap_true. ls_fieldcatalog-sort_level = ls_sort-spos. diff --git a/src/zcl_excel_converter_result_wd.clas.abap b/src/zcl_excel_converter_result_wd.clas.abap index f247f3e..c7a475c 100644 --- a/src/zcl_excel_converter_result_wd.clas.abap +++ b/src/zcl_excel_converter_result_wd.clas.abap @@ -64,7 +64,6 @@ CLASS zcl_excel_converter_result_wd IMPLEMENTATION. LOOP AT lt_dfies INTO ls_dfies. MOVE-CORRESPONDING ls_dfies TO ls_fcat. -* ls_fcat-columnname = ls_dfies-fieldname. ls_fcat-col_pos = ls_dfies-position. ls_fcat-key = ls_dfies-keyflag. get_fields_info( CHANGING xs_fcat = ls_fcat ) . @@ -123,14 +122,7 @@ CLASS zcl_excel_converter_result_wd IMPLEMENTATION. CLEAR ls_sort. ls_sort-spos = lo_sort->get_sort_position( ). ls_sort-fieldname = -fieldname. -* ls_sort-GROUP ls_sort-subtot = lo_sort->get_group_aggregation( ). -* ls_sort-COMP -* ls_sort-EXPA -* ls_sort-SELTEXT -* ls_sort-OBLIGATORY -* ls_sort-LEVEL -* ls_sort-NO_OUT IF l_sort_order = if_salv_wd_c_sort=>sort_order_ascending. ls_sort-up = abap_true. ELSE. @@ -245,9 +237,6 @@ CLASS zcl_excel_converter_result_wd IMPLEMENTATION. apply_sort( EXPORTING it_table = IMPORTING eo_table = eo_table ) . -* get_color( EXPORTING io_table = eo_table -* IMPORTING et_colors = et_colors ) . - get_filter( IMPORTING et_filter = et_filter CHANGING xo_table = eo_table ) . diff --git a/src/zcl_excel_converter_salv_table.clas.abap b/src/zcl_excel_converter_salv_table.clas.abap index 4b9d5fb..8f25663 100644 --- a/src/zcl_excel_converter_salv_table.clas.abap +++ b/src/zcl_excel_converter_salv_table.clas.abap @@ -113,7 +113,6 @@ CLASS zcl_excel_converter_salv_table IMPLEMENTATION. i_test = '1' i_fcat_complete = 'X' IMPORTING -* E_EDIT = es_layout = ws_layo CHANGING ct_fieldcat = wt_fcat. @@ -135,23 +134,15 @@ CLASS zcl_excel_converter_salv_table IMPLEMENTATION. it_fieldcat_lvc_missing = 2 OTHERS = 3. IF sy-subrc <> 0. -* MESSAGE ID SY-MSGID TYPE SY-MSGTY NUMBER SY-MSGNO -* WITH SY-MSGV1 SY-MSGV2 SY-MSGV3 SY-MSGV4. ENDIF. CALL FUNCTION 'LT_VARIANT_LOAD' EXPORTING -* I_TOOL = 'LT' i_tabname = '1' -* I_TABNAME_SLAVE = i_dialog = ' ' i_user_specific = 'X' -* I_DEFAULT = 'X' -* I_NO_REPTEXT_OPTIMIZE = -* I_VIA_GRID = i_fcat_complete = 'X' IMPORTING -* E_EXIT = et_fieldcat = lt_kkblo_fieldcat et_sort = lt_kkblo_sort et_filter = lt_kkblo_filter @@ -165,51 +156,25 @@ CLASS zcl_excel_converter_salv_table IMPLEMENTATION. not_found = 3 OTHERS = 4. IF sy-subrc <> 0. -* MESSAGE ID SY-MSGID TYPE SY-MSGTY NUMBER SY-MSGNO -* WITH SY-MSGV1 SY-MSGV2 SY-MSGV3 SY-MSGV4. ENDIF. CALL FUNCTION 'LVC_TRANSFER_FROM_KKBLO' EXPORTING -* I_TECH_COMPLETE = -* I_STRUCTURE_NAME = it_fieldcat_kkblo = lt_kkblo_fieldcat it_sort_kkblo = lt_kkblo_sort it_filter_kkblo = lt_kkblo_filter -* IT_SPECIAL_GROUPS_KKBLO = -* IT_FILTERED_ENTRIES_KKBLO = -* IT_GROUPLEVELS_KKBLO = -* IS_SUBTOT_OPTIONS_KKBLO = is_layout_kkblo = ls_kkblo_layout -* IS_REPREP_ID_KKBLO = -* I_CALLBACK_PROGRAM_KKBLO = -* IT_ADD_FIELDCAT = -* IT_EXCLUDING_KKBLO = -* IT_EXCEPT_QINFO_KKBLO = IMPORTING et_fieldcat_lvc = wt_fcat et_sort_lvc = wt_sort et_filter_lvc = wt_filt -* ET_SPECIAL_GROUPS_LVC = -* ET_FILTER_INDEX_LVC = -* ET_GROUPLEVELS_LVC = -* ES_TOTAL_OPTIONS_LVC = es_layout_lvc = ws_layo -* ES_VARIANT_LVC = -* E_VARIANT_SAVE_LVC = -* ES_PRINT_INFO_LVC = -* ES_REPREP_LVC = -* E_REPREP_ACTIVE_LVC = -* ET_EXCLUDING_LVC = -* ET_EXCEPT_QINFO_LVC = TABLES it_data = it_table EXCEPTIONS it_data_missing = 1 OTHERS = 2. IF sy-subrc <> 0. -* MESSAGE ID SY-MSGID TYPE SY-MSGTY NUMBER SY-MSGNO -* WITH SY-MSGV1 SY-MSGV2 SY-MSGV3 SY-MSGV4. ENDIF. ELSE. diff --git a/src/zcl_excel_drawing.clas.abap b/src/zcl_excel_drawing.clas.abap index f08e51c..1c579e4 100644 --- a/src/zcl_excel_drawing.clas.abap +++ b/src/zcl_excel_drawing.clas.abap @@ -153,9 +153,6 @@ CLASS zcl_excel_drawing IMPLEMENTATION. METHOD constructor. -* CALL FUNCTION 'GUID_CREATE' " del issue #379 - function is outdated in newer releases -* IMPORTING -* ev_guid_16 = me->guid. me->guid = zcl_excel_obsolete_func_wrap=>guid_create( ). " ins issue #379 - replacement for outdated function call IF ip_title IS NOT INITIAL. @@ -187,11 +184,9 @@ CLASS zcl_excel_drawing IMPLEMENTATION. METHOD emu2pixel. * suppose 96 DPI IF ip_dpi IS SUPPLIED. -* r_emu = ip_pixel * 914400 / ip_dpi. r_pixel = ip_emu * ip_dpi / 914400. ELSE. * suppose 96 DPI -* r_emu = ip_pixel * 914400 / 96. r_pixel = ip_emu * 96 / 914400. ENDIF. ENDMETHOD. @@ -865,10 +860,6 @@ CLASS zcl_excel_drawing IMPLEMENTATION. node3 ?= node2->find_from_name( name = 'axPos' namespace = 'c' ). zcl_excel_reader_2007=>fill_struct_from_attributes( EXPORTING ip_element = node3 CHANGING cp_structure = ls_prop ). lv_axpos = ls_prop-val. -* node3 ?= node2->find_from_name( name = 'numFmt' namespace = 'c' ). -* zcl_excel_reader_2007=>fill_struct_from_attributes( EXPORTING ip_element = node3 CHANGING cp_structure = ls_prop ). -* lv_formatcode = ls_prop-formatcode. -* lv_sourcelinked = ls_prop-sourcelinked. node3 ?= node2->find_from_name( name = 'majorTickMark' namespace = 'c' ). zcl_excel_reader_2007=>fill_struct_from_attributes( EXPORTING ip_element = node3 CHANGING cp_structure = ls_prop ). lv_majortickmark = ls_prop-val. diff --git a/src/zcl_excel_obsolete_func_wrap.clas.abap b/src/zcl_excel_obsolete_func_wrap.clas.abap index 8558dfc..96c8d8a 100644 --- a/src/zcl_excel_obsolete_func_wrap.clas.abap +++ b/src/zcl_excel_obsolete_func_wrap.clas.abap @@ -30,9 +30,9 @@ CLASS zcl_excel_obsolete_func_wrap IMPLEMENTATION. * in newer SAP releases *--------------------------------------------------------------------* * -* CALL FUNCTION 'GUID_CREATE' -* IMPORTING -* ev_guid_16 = rv_guid_16. +*Before ABAP 7.02: CALL FUNCTION 'GUID_CREATE' +*Before ABAP 7.02: IMPORTING +*Before ABAP 7.02: ev_guid_16 = rv_guid_16. ENDMETHOD. ENDCLASS. diff --git a/src/zcl_excel_reader_2007.clas.abap b/src/zcl_excel_reader_2007.clas.abap index 1bc3cc3..e9f3ba5 100644 --- a/src/zcl_excel_reader_2007.clas.abap +++ b/src/zcl_excel_reader_2007.clas.abap @@ -574,18 +574,6 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION. ENDIF. ENDIF. -* 2do - borders into dxf-styles. Here and in writerclass -* WHEN 'border'. -* lo_ixml_element = lo_ixml_dxf_child->find_from_name( 'left' ). -* IF lo_ixml_element IS BOUND. -* CLEAR lv_val. -* lv_val = lo_ixml_element2->get_attribute_ns( 'style' ). -* IF lv_val IS NOT INITIAL. -* ls_cstyle-borders-left-border_style = lv_val. -* ls_cstylex-borders-left-border_style = 'X'. -* ENDIF. -* ENDIF. - ENDCASE. lo_ixml_dxf_child ?= lo_ixml_iterator_dxf_children->get_next( ). @@ -2680,7 +2668,6 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION. ENDIF. IF ls_column-outlinelevel > ''. -* outline_level = condense( column-outlineLevel ). CONDENSE ls_column-outlinelevel. lv_outline_level = ls_column-outlinelevel. IF lv_outline_level > 0. @@ -3054,8 +3041,6 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION. lv_rule TYPE zexcel_condition_rule. -* FIELD-SYMBOLS: LIKE LINE OF it_external_hyperlinks. - lo_ixml_cond_formats = io_ixml_worksheet->get_elements_by_tag_name( name = 'conditionalFormatting' ). lo_ixml_iterator = lo_ixml_cond_formats->create_iterator( ). lo_ixml_cond_format ?= lo_ixml_iterator->get_next( ). diff --git a/src/zcl_excel_style_cond.clas.abap b/src/zcl_excel_style_cond.clas.abap index 3506785..fb4efc3 100644 --- a/src/zcl_excel_style_cond.clas.abap +++ b/src/zcl_excel_style_cond.clas.abap @@ -145,9 +145,7 @@ CLASS zcl_excel_style_cond IMPLEMENTATION. lv_column = zcl_excel_common=>convert_column2int( ip_start_column ). -* me->mv_cell_data-cell_row = 1. -* me->mv_cell_data-cell_column = lv_column. -* + lv_col_alpha = ip_start_column. lv_row_alpha = ip_start_row. SHIFT lv_row_alpha RIGHT DELETING TRAILING space. @@ -200,7 +198,6 @@ CLASS zcl_excel_style_cond IMPLEMENTATION. me->rule = zcl_excel_style_cond=>c_rule_none. -* me->iconset->operator = zcl_excel_style_conditional=>c_operator_none. me->mode_iconset = ls_iconset. me->priority = 1. @@ -218,41 +215,6 @@ CLASS zcl_excel_style_cond IMPLEMENTATION. METHOD factory_cond_style_iconset. -*--------------------------------------------------------------------* -* Work in progress -* Missing: LE or LT may be specified --> extend structure ZEXCEL_CONDITIONAL_ICONSET to hold this information as well -*--------------------------------------------------------------------* - -* DATA: lv_needed_values TYPE i. -* CASE icon_type. -* -* WHEN 'C_ICONSET_3ARROWS' -* OR 'C_ICONSET_3ARROWSGRAY' -* OR 'C_ICONSET_3FLAGS' -* OR 'C_ICONSET_3SIGNS' -* OR 'C_ICONSET_3SYMBOLS' -* OR 'C_ICONSET_3SYMBOLS2' -* OR 'C_ICONSET_3TRAFFICLIGHTS' -* OR 'C_ICONSET_3TRAFFICLIGHTS2'. -* lv_needed_values = 3. -* -* WHEN 'C_ICONSET_4ARROWS' -* OR 'C_ICONSET_4ARROWSGRAY' -* OR 'C_ICONSET_4RATING' -* OR 'C_ICONSET_4REDTOBLACK' -* OR 'C_ICONSET_4TRAFFICLIGHTS'. -* lv_needed_values = 4. -* -* WHEN 'C_ICONSET_5ARROWS' -* OR 'C_ICONSET_5ARROWSGRAY' -* OR 'C_ICONSET_5QUARTERS' -* OR 'C_ICONSET_5RATING'. -* lv_needed_values = 5. -* -* WHEN OTHERS. -* RETURN. -* ENDCASE. - ENDMETHOD. diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap index aa516f2..58a48fa 100644 --- a/src/zcl_excel_worksheet.clas.abap +++ b/src/zcl_excel_worksheet.clas.abap @@ -987,7 +987,6 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. lo_table->set_data( ir_data = ip_table ). lv_id = me->excel->get_next_table_id( ). lo_table->set_id( iv_id = lv_id ). -* lo_table->fieldcat = lt_field_catalog[]. me->tables->add( lo_table ). @@ -999,7 +998,6 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. " Due restrinction of new table object we cannot have two column with the same name " Check if a column with the same name exists, if exists add a counter " If no medium description is provided we try to use small or long -* lv_value = -scrtext_m. FIELD-SYMBOLS: TYPE any, TYPE any, TYPE any. @@ -1947,15 +1945,11 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. me->excel = ip_excel. -* CALL FUNCTION 'GUID_CREATE' " del issue #379 - function is outdated in newer releases -* IMPORTING -* ev_guid_16 = me->guid. me->guid = zcl_excel_obsolete_func_wrap=>guid_create( ). " ins issue #379 - replacement for outdated function call IF ip_title IS NOT INITIAL. lv_title = ip_title. ELSE. -* lv_title = me->guid. " del issue #154 - Names of worksheets lv_title = me->generate_title( ). " ins issue #154 - Names of worksheets ENDIF. @@ -2294,7 +2288,6 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. me->update_dimension_range( ). IF upper_cell EQ lower_cell. "only one cell " Worksheet not filled -* IF upper_cell-cell_coords = '0'. IF upper_cell-cell_coords IS INITIAL. ep_dimension_range = 'A1'. ELSE. @@ -2805,14 +2798,10 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. EXPORTING input = ip_value IMPORTING -* LONG_TEXT = output = l_value -* SHORT_TEXT = EXCEPTIONS OTHERS = 1. IF sy-subrc <> 0. -* MESSAGE ID SY-MSGID TYPE SY-MSGTY NUMBER SY-MSGNO -* WITH SY-MSGV1 SY-MSGV2 SY-MSGV3 SY-MSGV4. ELSE. TRY. ep_value = l_value. @@ -3283,7 +3272,6 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. ENDIF. * Begin of change issue #152 - don't touch exisiting style if only value is passed -* lv_style_guid = ip_style. lv_column = zcl_excel_common=>convert_column2int( ip_column ). IF ip_column_formula_id <> 0. check_cell_column_formula( @@ -3426,12 +3414,7 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. * Begin of change issue #152 - don't touch exisiting style if only value is passed * Read table moved up, so that current style may be evaluated -* lv_column = zcl_excel_common=>convert_column2int( ip_column ). -* READ TABLE sheet_content ASSIGNING WITH KEY cell_row = ip_row -* cell_column = lv_column. -* -* IF sy-subrc EQ 0. IF IS ASSIGNED. * End of change issue #152 - don't touch exisiting style if only value is passed -cell_value = lv_value. @@ -3448,15 +3431,10 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. ls_sheet_content-cell_style = lv_style_guid. ls_sheet_content-data_type = lv_data_type. lv_row_alpha = ip_row. -* SHIFT lv_row_alpha RIGHT DELETING TRAILING space."del #152 - replaced with condense - should be faster -* SHIFT lv_row_alpha LEFT DELETING LEADING space. "del #152 - replaced with condense - should be faster CONDENSE lv_row_alpha NO-GAPS. "ins #152 - replaced 2 shifts - should be faster lv_col_alpha = zcl_excel_common=>convert_column2alpha( ip_column ). " issue #155 - less restrictive typing for ip_column CONCATENATE lv_col_alpha lv_row_alpha INTO ls_sheet_content-cell_coords. " issue #155 - less restrictive typing for ip_column INSERT ls_sheet_content INTO TABLE sheet_content ASSIGNING . "ins #152 - Now always holds the data -* APPEND ls_sheet_content TO sheet_content. -* SORT sheet_content BY cell_row cell_column. - " me->update_dimension_range( ). ENDIF. diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap index 47fe358..d1feb67 100644 --- a/src/zcl_excel_writer_2007.clas.abap +++ b/src/zcl_excel_writer_2007.clas.abap @@ -377,7 +377,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. ********************************************************************** * STEP 8: Add xl/workbook.xml to zip -* lv_content = me->create_xl_styles_static( ). lv_content = me->create_xl_styles( ). lo_zip->add( name = me->c_xl_styles content = lv_content ). @@ -513,14 +512,12 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lo_iterator = me->excel->get_drawings_iterator( zcl_excel_drawing=>type_image ). WHILE lo_iterator->has_next( ) EQ abap_true. lo_drawing ?= lo_iterator->get_next( ). -* IF lo_drawing->get_type( ) NE zcl_excel_drawing=>type_image_header_footer. lv_content = lo_drawing->get_media( ). lv_value = lo_drawing->get_media_name( ). CONCATENATE 'xl/media/' lv_value INTO lv_value. lo_zip->add( name = lv_value content = lv_content ). -* ENDIF. ENDWHILE. ********************************************************************** @@ -1146,8 +1143,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. CONVERT TIME STAMP excel->zif_excel_book_properties~created TIME ZONE sy-zonlo INTO DATE lv_date TIME lv_time. CONCATENATE lv_date lv_time INTO lv_value RESPECTING BLANKS. REPLACE ALL OCCURRENCES OF REGEX '([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})' IN lv_value WITH '$1-$2-$3T$4:$5:$6Z'. -* lv_value = excel->zif_excel_book_properties~created. -* lv_value = '2010-07-04T14:58:53Z'. lo_element->set_value( value = lv_value ). lo_element_root->append_child( new_child = lo_element ). @@ -1161,8 +1156,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. CONVERT TIME STAMP excel->zif_excel_book_properties~modified TIME ZONE sy-zonlo INTO DATE lv_date TIME lv_time. CONCATENATE lv_date lv_time INTO lv_value RESPECTING BLANKS. REPLACE ALL OCCURRENCES OF REGEX '([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})' IN lv_value WITH '$1-$2-$3T$4:$5:$6Z'. -* lv_value = excel->zif_excel_book_properties~modified. -* lv_value = '2010-07-04T14:58:53Z'. lo_element->set_value( value = lv_value ). lo_element_root->append_child( new_child = lo_element ). @@ -2093,12 +2086,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. parent = lo_element3 ). lo_element4->set_attribute_ns( name = 'val' value = ls_ax-axpos ). -* lo_element4 = lo_document->create_simple_element( name = lc_xml_node_numfmt -* parent = lo_element3 ). -* lo_element4->set_attribute_ns( name = 'formatCode' -* value = ls_ax-formatcode ). -* lo_element4->set_attribute_ns( name = 'sourceLinked' -* value = ls_ax-sourcelinked ). lo_element4 = lo_document->create_simple_element( name = lc_xml_node_majortickmark parent = lo_element3 ). lo_element4->set_attribute_ns( name = 'val' @@ -2545,7 +2532,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lt_drawings = io_worksheet->get_header_footer_drawings( ). LOOP AT lt_drawings ASSIGNING . "Header or footer image exist ADD 1 TO lv_relation_id. -* lv_value = lv_relation_id. lv_value = -drawing->get_index( ). READ TABLE lt_temp WITH KEY str = lv_value TRANSPORTING NO FIELDS. IF sy-subrc NE 0. @@ -2557,7 +2543,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lo_element = lo_document->create_simple_element( name = lc_xml_node_relationship parent = lo_document ). lo_element->set_attribute_ns( name = lc_xml_attr_id -* value = 'LOGO' ). value = lv_value ). lo_element->set_attribute_ns( name = lc_xml_attr_type value = lc_xml_node_rid_image_tp ). @@ -2565,7 +2550,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lv_value = '../media/#'. REPLACE '#' IN lv_value WITH -drawing->get_media_name( ). lo_element->set_attribute_ns( name = lc_xml_attr_target -* value = '../media/LOGO.png' ). value = lv_value ). lo_element_root->append_child( new_child = lo_element ). ENDIF. @@ -2678,12 +2662,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. EXPORTING stream = ld_stream. -* CALL FUNCTION 'CRM_IC_XML_STRING2XSTRING' -* EXPORTING -* instring = ld_stream -* IMPORTING -* outxstring = ep_content. - CALL FUNCTION 'SCMS_STRING_TO_XSTRING' EXPORTING text = ld_stream @@ -3618,7 +3596,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. CLEAR lv_count. LOOP AT lt_cell_data ASSIGNING WHERE data_type = 's'. -* lv_sytabix = sy-tabix - 1. lv_sytabix = lv_count. ls_shared_string-string_no = lv_sytabix. ls_shared_string-string_value = -cell_value. @@ -5909,30 +5886,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lo_element_root->append_child( new_child = lo_element ). ENDWHILE. -* IF io_worksheet->get_print_settings( )->is_empty( ) = abap_false. -* ADD 1 TO lv_relation_id. -* lv_value = lv_relation_id. -* CONDENSE lv_value. -* CONCATENATE 'rId' lv_value INTO lv_value. -* -* lo_element = lo_document->create_simple_element( name = lc_xml_node_relationship -* parent = lo_document ). -* lo_element->set_attribute_ns( name = lc_xml_attr_id -* value = lv_value ). -* lo_element->set_attribute_ns( name = lc_xml_attr_type -* value = lc_xml_node_rid_printer_tp ). -* -* lv_index_str = iv_printer_index. -* CONDENSE lv_index_str NO-GAPS. -* MOVE me->c_xl_printersettings TO lv_value. -* REPLACE 'xl' WITH '..' INTO lv_value. -* REPLACE '#' WITH lv_index_str INTO lv_value. -* lo_element->set_attribute_ns( name = lc_xml_attr_target -* value = lv_value ). -* -* lo_element_root->append_child( new_child = lo_element ). -* ENDIF. - ********************************************************************** * STEP 5: Create xstring stream ep_content = render_xml_document( lo_document ). @@ -6010,7 +5963,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. " Get column count col_count = io_worksheet->get_highest_column( ). " Get autofilter -*lv_guid = io_worksheet->get_guid( ) . lo_autofilters = excel->get_autofilters_reference( ). lo_autofilter = lo_autofilters->get( io_worksheet = io_worksheet ) . IF lo_autofilter IS BOUND. @@ -6131,9 +6083,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. l_autofilter_hidden = abap_true. lo_element_2->set_attribute_ns( name = 'hidden' value = 'true' ). ENDIF. -* lv_xstring_partial = render_ixml_element_no_header( lo_element_2 ). -* CONCATENATE lv_xstring lv_xstring_partial -* INTO lv_xstring IN BYTE MODE. rv_ixml_sheet_data_root->append_child( new_child = lo_element_2 ). " row node ENDIF. " Add new row @@ -6233,8 +6182,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. *issue #220 - If cell in tables-area don't use default from row or column or sheet - Coding 3 - end *--------------------------------------------------------------------* ENDIF. -* IF -cell_style IS NOT INITIAL. -* READ TABLE styles_mapping INTO ls_style_mapping WITH KEY guid = -cell_style. IF lv_style_guid IS NOT INITIAL. READ TABLE styles_mapping INTO ls_style_mapping WITH KEY guid = lv_style_guid. *end of change issue #157 - allow column cellstyles @@ -6317,9 +6264,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. l_autofilter_hidden = abap_true. lo_element_2->set_attribute_ns( name = 'hidden' value = 'true' ). ENDIF. -* lv_xstring_partial = render_ixml_element_no_header( lo_element_2 ). -* CONCATENATE lv_xstring lv_xstring_partial -* INTO lv_xstring IN BYTE MODE. rv_ixml_sheet_data_root->append_child( new_child = lo_element_2 ). " row node ENDIF. DELETE io_worksheet->sheet_content WHERE cell_value = lc_dummy_cell_content. " Get rid of dummyentries @@ -6614,8 +6558,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. ls_cellxfs-applynumberformat = 1. IF ls_numfmt-numfmt EQ zcl_excel_style_number_format=>c_format_date_std. ls_cellxfs-numfmtid = 14. -* elseif ls_numfmt-NUMFMT eq 'STD_NDEC'. -* ls_cellxfs-numfmtid = 2. ENDIF. ENDIF. "--- @@ -6663,7 +6605,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lo_element_numfmt->set_attribute_ns( name = lc_xml_attr_numfmtid value = lv_value ). lv_value = ls_numfmt-numfmt. -* REPLACE ALL OCCURRENCES OF '.' IN lv_value WITH '\.'. lo_element_numfmt->set_attribute_ns( name = lc_xml_attr_formatcode value = lv_value ). lo_element_numfmts->append_child( new_child = lo_element_numfmt ). @@ -7474,7 +7415,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lo_element = lo_document->create_simple_element( name = 'tableColumns' parent = lo_document ). -* lo_columns = io_table->get_columns( ). LOOP AT io_table->fieldcat INTO ls_fieldcat WHERE dynpfld = abap_true. ADD 1 TO lv_num_columns. ENDLOOP. @@ -7686,8 +7626,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. " fileVersion node lo_element = lo_document->create_simple_element( name = lc_xml_node_workbookpr parent = lo_document ). -* lo_element->set_attribute_ns( name = lc_xml_attr_themeversion -* value = '124226' ). lo_element_root->append_child( new_child = lo_element ). " workbookProtection node @@ -7917,7 +7855,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. DATA ls_shared_string TYPE zexcel_s_shared_string. -* READ TABLE shared_strings INTO ls_shared_string WITH KEY string_value = ip_cell_value BINARY SEARCH. IF it_rtf IS INITIAL. READ TABLE shared_strings INTO ls_shared_string WITH TABLE KEY string_value = ip_cell_value. ep_index = ls_shared_string-string_no. diff --git a/src/zcl_excel_writer_csv.clas.abap b/src/zcl_excel_writer_csv.clas.abap index 2b2c7c3..2be17af 100644 --- a/src/zcl_excel_writer_csv.clas.abap +++ b/src/zcl_excel_writer_csv.clas.abap @@ -202,8 +202,6 @@ CLASS zcl_excel_writer_csv IMPLEMENTATION. * --- Add empty rows WHILE lv_row < -cell_row. -* CONCATENATE lv_string cl_abap_char_utilities=>newline INTO lv_string. -* CONCATENATE lv_string cl_abap_char_utilities=>cr_lf INTO lv_string. CONCATENATE lv_string zcl_excel_writer_csv=>eol INTO lv_string. lv_row = lv_row + 1. lv_col = 1. @@ -211,15 +209,12 @@ CLASS zcl_excel_writer_csv IMPLEMENTATION. * --- Add empty columns WHILE lv_col < -cell_column. -* CONCATENATE lv_string ';' INTO lv_string. CONCATENATE lv_string zcl_excel_writer_csv=>delimiter INTO lv_string. lv_col = lv_col + 1. ENDWHILE. * ----- Use format to determine the data type and display format. CASE -data_type. -* WHEN 'n' OR 'N'. -* lc_value = zcl_excel_common=>excel_number_to_string( ip_value = -cell_value ). WHEN 'd' OR 'D'. lc_value = zcl_excel_common=>excel_string_to_date( ip_value = -cell_value ). @@ -250,12 +245,10 @@ CLASS zcl_excel_writer_csv IMPLEMENTATION. ENDCASE. -* REPLACE ALL OCCURRENCES OF '"' in lc_value with '""'. CONCATENATE zcl_excel_writer_csv=>enclosure zcl_excel_writer_csv=>enclosure INTO lv_tmp. CONDENSE lv_tmp. REPLACE ALL OCCURRENCES OF zcl_excel_writer_csv=>enclosure IN lc_value WITH lv_tmp. -* FIND FIRST OCCURRENCE OF ';' IN lc_value. FIND FIRST OCCURRENCE OF zcl_excel_writer_csv=>delimiter IN lc_value. IF sy-subrc = 0. CONCATENATE lv_string zcl_excel_writer_csv=>enclosure lc_value zcl_excel_writer_csv=>enclosure INTO lv_string. @@ -263,15 +256,13 @@ CLASS zcl_excel_writer_csv IMPLEMENTATION. CONCATENATE lv_string lc_value INTO lv_string. ENDIF. - ENDLOOP. " AT lt_cell_data + ENDLOOP. CLEAR ep_content. CALL FUNCTION 'SCMS_STRING_TO_XSTRING' EXPORTING text = lv_string -* MIMETYPE = ' ' -* ENCODING = IMPORTING buffer = ep_content EXCEPTIONS diff --git a/src/zcl_excel_writer_huge_file.clas.abap b/src/zcl_excel_writer_huge_file.clas.abap index a76ec2b..25894e6 100644 --- a/src/zcl_excel_writer_huge_file.clas.abap +++ b/src/zcl_excel_writer_huge_file.clas.abap @@ -466,7 +466,6 @@ CLASS zcl_excel_writer_huge_file IMPLEMENTATION. ENDWHILE. * Set column information (width, style, ...) -* IF lo_column_iterator->has_next( ) = abap_true. WHILE lo_column_iterator->has_next( ) = abap_true. lo_column ?= lo_column_iterator->get_next( ). IF lo_column->get_outline_level( ) > outline_level_col. @@ -507,7 +506,6 @@ CLASS zcl_excel_writer_huge_file IMPLEMENTATION. lv_column = zcl_excel_common=>convert_column2int( lo_column->get_column_index( ) ). INSERT lv_column INTO TABLE lts_sorted_columns. ENDWHILE. -* ENDIF. * * Now find all columns that were missing so far diff --git a/src/zcl_excel_writer_xlsm.clas.abap b/src/zcl_excel_writer_xlsm.clas.abap index fb78d81..bb7835c 100644 --- a/src/zcl_excel_writer_xlsm.clas.abap +++ b/src/zcl_excel_writer_xlsm.clas.abap @@ -123,7 +123,6 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. ********************************************************************** * STEP 8: Add xl/workbook.xml to zip -* lv_content = me->create_xl_styles_static( ). lv_content = me->create_xl_styles( ). lo_zip->add( name = me->c_xl_styles content = lv_content ).