Merge branch 'main' into patch-converter-alv-get-filter

This commit is contained in:
Domi Bigl 2024-08-30 19:16:07 +02:00 committed by GitHub
commit c5e799a480
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 12 deletions

View File

@ -1304,6 +1304,8 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
ld_flag_italic TYPE abap_bool VALUE abap_false, ld_flag_italic TYPE abap_bool VALUE abap_false,
ld_date TYPE d, ld_date TYPE d,
ld_date_char TYPE c LENGTH 50, ld_date_char TYPE c LENGTH 50,
ld_time TYPE t,
ld_time_char TYPE c LENGTH 20,
ld_font_height TYPE zcl_excel_font=>ty_font_height VALUE zcl_excel_font=>lc_default_font_height, ld_font_height TYPE zcl_excel_font=>ty_font_height VALUE zcl_excel_font=>lc_default_font_height,
ld_font_name TYPE zexcel_style_font_name VALUE zcl_excel_font=>lc_default_font_name. ld_font_name TYPE zexcel_style_font_name VALUE zcl_excel_font=>lc_default_font_name.
@ -1349,8 +1351,8 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
" If the current cell contains the default date format, " If the current cell contains the default date format,
" convert the cell value to a date and calculate its length " convert the cell value to a date and calculate its length
IF ls_stylemapping-complete_style-number_format-format_code = CASE ls_stylemapping-complete_style-number_format-format_code.
zcl_excel_style_number_format=>c_format_date_std. WHEN zcl_excel_style_number_format=>c_format_date_std.
" Convert excel date to ABAP date " Convert excel date to ABAP date
ld_date = ld_date =
@ -1362,7 +1364,14 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
" Remember the formatted date to calculate the cell size " Remember the formatted date to calculate the cell size
ld_cell_value = ld_date_char. ld_cell_value = ld_date_char.
ENDIF. WHEN get_default_excel_time_format( ).
ld_time = zcl_excel_common=>excel_string_to_time( ld_cell_value ).
WRITE ld_time TO ld_time_char.
ld_cell_value = ld_time_char.
ENDCASE.
" Read the font size and convert it to the font height " Read the font size and convert it to the font height
" used by SAPscript (multiplication by 10) " used by SAPscript (multiplication by 10)

View File

@ -40,7 +40,7 @@
</DD03P> </DD03P>
<DD03P> <DD03P>
<FIELDNAME>GRADTYPE</FIELDNAME> <FIELDNAME>GRADTYPE</FIELDNAME>
<ROLLNAME>ZEXCEL_S_CSTYLEX_GRADTYPE</ROLLNAME> <ROLLNAME>ZEXCEL_S_GRADIENT_TYPE</ROLLNAME>
<ADMINFIELD>0</ADMINFIELD> <ADMINFIELD>0</ADMINFIELD>
<DATATYPE>STRU</DATATYPE> <DATATYPE>STRU</DATATYPE>
<MASK> STRUS</MASK> <MASK> STRUS</MASK>