SAP/abap2xlsx
1
0
Fork 0
mirror of https://github.com/abap2xlsx/abap2xlsx.git synced 2025-05-05 16:46:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #507 from larshp/master

Browse Source 
simplify some IFs
This commit is contained in:
Ivan 2017-11-15 10:04:15 -06:00 committed by GitHub
commit 58d98d362b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 65 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zcl_excel_common.clas.abap
View File

@ -1029,10 +1029,9 @@ METHOD get_fieldcatalog.
<fcat>-abap_type = lo_salv_column_table->get_ddic_inttype( ). <fcat>-abap_type = lo_salv_column_table->get_ddic_inttype( ).
<fcat>-dynpfld = 'X'. " What in the world would we exclude here? <fcat>-dynpfld = 'X'. " What in the world would we exclude here?
IF <fcat>-position = 1. " except for the MANDT-field of most tables ( 1st column that is ) " except for the MANDT-field of most tables ( 1st column that is )
IF lo_salv_column_table->get_ddic_datatype( ) = 'CLNT'. IF <fcat>-position = 1 AND lo_salv_column_table->get_ddic_datatype( ) = 'CLNT'.
CLEAR <fcat>-dynpfld. CLEAR <fcat>-dynpfld.
ENDIF.
ENDIF. ENDIF.
* For fields that don't a description ( i.e. defined by "field type i," ) * For fields that don't a description ( i.e. defined by "field type i," )

37
src/zcl_excel_converter.clas.abap
View File

@ -302,19 +302,17 @@ METHOD ask_option.
IF sy-subrc <> 0. IF sy-subrc <> 0.
MESSAGE ID sy-msgid TYPE sy-msgty NUMBER sy-msgno MESSAGE ID sy-msgid TYPE sy-msgty NUMBER sy-msgno
WITH sy-msgv1 sy-msgv2 sy-msgv3 sy-msgv4. WITH sy-msgv1 sy-msgv2 sy-msgv3 sy-msgv4.
ELSE. ELSEIF l_returncode = 'A'.
IF l_returncode = 'A'.
RAISE EXCEPTION TYPE zcx_excel. RAISE EXCEPTION TYPE zcx_excel.
ELSE. ELSE.
LOOP AT lt_sval INTO ls_sval. LOOP AT lt_sval INTO ls_sval.
ASSIGN COMPONENT ls_sval-fieldname OF STRUCTURE ws_option TO <fs>. ASSIGN COMPONENT ls_sval-fieldname OF STRUCTURE ws_option TO <fs>.
IF sy-subrc = 0. IF sy-subrc = 0.
<fs> = ls_sval-value. <fs> = ls_sval-value.
ENDIF. ENDIF.
ENDLOOP. ENDLOOP.
set_option( is_option = ws_option ) . set_option( is_option = ws_option ) .
rs_option = ws_option. rs_option = ws_option.
ENDIF.
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD.
@ -865,16 +863,13 @@ method CREATE_WORKSHEET.
IF i_table = abap_true. IF i_table = abap_true.
l_freeze_col = bind_table( i_style_table = i_style_table ) . l_freeze_col = bind_table( i_style_table = i_style_table ) .
ELSE. ELSEIF wt_filter IS NOT INITIAL.
* Let's check for filter. * Let's check for filter.
IF wt_filter IS NOT INITIAL. wo_autofilter = wo_excel->add_new_autofilter( io_sheet = wo_worksheet ).
wo_autofilter = wo_excel->add_new_autofilter( io_sheet = wo_worksheet ). l_freeze_col = bind_cells( ) .
l_freeze_col = bind_cells( ) . set_autofilter_area( ) .
set_autofilter_area( ) . ELSE.
ELSE. l_freeze_col = bind_cells( ) .
l_freeze_col = bind_cells( ) .
ENDIF.
ENDIF. ENDIF.
* Check for freeze panes * Check for freeze panes

26
src/zcl_excel_converter_alv.clas.abap
View File

@ -323,20 +323,18 @@ method GET_COLOR.
l_line = sy-tabix. l_line = sy-tabix.
IF ws_layo-info_fname IS NOT INITIAL. IF ws_layo-info_fname IS NOT INITIAL.
ASSIGN COMPONENT ws_layo-info_fname OF STRUCTURE <fs_stab> TO <fs>. ASSIGN COMPONENT ws_layo-info_fname OF STRUCTURE <fs_stab> TO <fs>.
IF sy-subrc = 0. IF sy-subrc = 0 AND <fs> IS NOT INITIAL.
IF <fs> IS NOT INITIAL. l_color = <fs>.
l_color = <fs>. IF l_color(1) = 'C'.
IF l_color(1) = 'C'. READ TABLE wt_colors INTO ls_color WITH TABLE KEY col = l_color+1(1)
READ TABLE wt_colors INTO ls_color WITH TABLE KEY col = l_color+1(1) int = l_color+2(1)
int = l_color+2(1) inv = l_color+3(1).
inv = l_color+3(1). IF sy-subrc = 0.
IF sy-subrc = 0. ls_con_col-rownumber = l_line.
ls_con_col-rownumber = l_line. ls_con_col-columnname = space.
ls_con_col-columnname = space. ls_con_col-fontcolor = ls_color-fontcolor.
ls_con_col-fontcolor = ls_color-fontcolor. ls_con_col-fillcolor = ls_color-fillcolor.
ls_con_col-fillcolor = ls_color-fillcolor. INSERT ls_con_col INTO TABLE et_colors.
INSERT ls_con_col INTO TABLE et_colors.
ENDIF.
ENDIF. ENDIF.
ENDIF. ENDIF.
ENDIF. ENDIF.

61
src/zcl_excel_worksheet.clas.abap
View File

@ -2176,10 +2176,8 @@ method BIND_ALV_OLE2.
clear: wa_subtot_indexs. clear: wa_subtot_indexs.
read table lt_subtot_indexs into wa_subtot_indexs read table lt_subtot_indexs into wa_subtot_indexs
with key index = l_save_index. with key index = l_save_index.
IF sy-subrc = 0. IF sy-subrc = 0 AND <item> = '0'.
if <item> = '0'. clear: contentsitem-value.
clear: contentsitem-value.
endif.
ENDIF. ENDIF.
endif. endif.
endif. endif.
@ -2422,17 +2420,15 @@ method BIND_ALV_OLE2.
read table currcells index counter into curritem2. read table currcells index counter into curritem2.
if curritem-left eq curritem2-left. if curritem-left eq curritem2-left.
length = curritem-top + curritem-rows. length = curritem-top + curritem-rows.
if length eq curritem2-top. if length eq curritem2-top and curritem-decimals eq curritem2-decimals.
if curritem-decimals eq curritem2-decimals. move curritem to curritem3.
move curritem to curritem3. curritem3-rows = curritem3-rows + curritem2-rows.
curritem3-rows = curritem3-rows + curritem2-rows. curritem-left = -1.
curritem-left = -1. modify currcells index sy-index from curritem.
modify currcells index sy-index from curritem. curritem2-left = -1.
curritem2-left = -1. modify currcells index counter from curritem2.
modify currcells index counter from curritem2. append curritem3 to currcells.
append curritem3 to currcells. found = 'X'.
found = 'X'.
endif.
endif. endif.
endif. endif.
enddo. enddo.
@ -2460,17 +2456,15 @@ method BIND_ALV_OLE2.
if curritem-top eq curritem2-top and curritem-rows eq if curritem-top eq curritem2-top and curritem-rows eq
curritem2-rows. curritem2-rows.
length = curritem-left + curritem-columns. length = curritem-left + curritem-columns.
if length eq curritem2-left. if length eq curritem2-left and curritem-decimals eq curritem2-decimals.
if curritem-decimals eq curritem2-decimals. move curritem to curritem3.
move curritem to curritem3. curritem3-columns = curritem3-columns + curritem2-columns.
curritem3-columns = curritem3-columns + curritem2-columns. curritem-left = -1.
curritem-left = -1. modify currcells index sy-index from curritem.
modify currcells index sy-index from curritem. curritem2-left = -1.
curritem2-left = -1. modify currcells index counter from curritem2.
modify currcells index counter from curritem2. append curritem3 to currcells.
append curritem3 to currcells. found = 'X'.
found = 'X'.
endif.
endif. endif.
endif. endif.
enddo. enddo.
@ -2922,18 +2916,15 @@ METHOD bind_table.
ip_formula = <fs_fldval> ip_formula = <fs_fldval>
ip_style = <ls_field_catalog>-style ). ip_style = <ls_field_catalog>-style ).
ENDIF. ENDIF.
ELSE. ELSEIF <ls_field_catalog>-abap_type IS NOT INITIAL.
IF <ls_field_catalog>-abap_type IS NOT INITIAL. me->set_cell( ip_column = lv_column_alpha
me->set_cell( ip_column = lv_column_alpha
ip_row = lv_row_int ip_row = lv_row_int
ip_formula = <fs_fldval> ip_formula = <fs_fldval>
ip_abap_type = <ls_field_catalog>-abap_type ). ip_abap_type = <ls_field_catalog>-abap_type ).
ELSE. ELSE.
me->set_cell( ip_column = lv_column_alpha me->set_cell( ip_column = lv_column_alpha
ip_row = lv_row_int ip_row = lv_row_int
ip_formula = <fs_fldval> ). ip_formula = <fs_fldval> ).
ENDIF.
ENDIF. ENDIF.
ELSE. ELSE.
IF <ls_field_catalog>-style IS NOT INITIAL. IF <ls_field_catalog>-style IS NOT INITIAL.

14
src/zcl_excel_writer_2007.clas.abap
View File

@ -3395,14 +3395,12 @@ METHOD create_xl_sheet.
value = lv_value ). value = lv_value ).
" defaultColWidth " defaultColWidth
lo_column_default = io_worksheet->get_default_column( ). lo_column_default = io_worksheet->get_default_column( ).
IF lo_column_default IS BOUND. IF lo_column_default IS BOUND AND lo_column_default->get_width( ) >= 0.
IF lo_column_default->get_width( ) >= 0. lv_value = lo_column_default->get_width( ).
lv_value = lo_column_default->get_width( ). SHIFT lv_value RIGHT DELETING TRAILING space.
SHIFT lv_value RIGHT DELETING TRAILING space. SHIFT lv_value LEFT DELETING LEADING space.
SHIFT lv_value LEFT DELETING LEADING space. lo_element->set_attribute_ns( name = lc_xml_attr_defaultcolwidth
lo_element->set_attribute_ns( name = lc_xml_attr_defaultcolwidth value = lv_value ).
value = lv_value ).
ENDIF.
ENDIF. ENDIF.
" outlineLevelCol " outlineLevelCol

6
src/zcl_excel_writer_huge_file.clas.abap
View File

@ -433,10 +433,8 @@ METHOD create_xl_sheet.
ENDIF. ENDIF.
lo_column_default = io_worksheet->get_default_column( ). lo_column_default = io_worksheet->get_default_column( ).
IF lo_column_default IS BOUND. IF lo_column_default IS BOUND AND lo_column_default->get_width( ) >= 0.
IF lo_column_default->get_width( ) >= 0. l_worksheet-defaultcolwidth = lo_column_default->get_width( ).
l_worksheet-defaultcolwidth = lo_column_default->get_width( ).
ENDIF.
ENDIF. ENDIF.
lo_row_default = io_worksheet->get_default_row( ). lo_row_default = io_worksheet->get_default_row( ).