From ea40b6860e80209ddaae571915b1a64f114ae7f4 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Sun, 7 Nov 2021 20:44:40 +0100 Subject: [PATCH] DDIC reference fixes (#884) * DATS -> D, and propagate exceptions to caller * replace sydatum and syuzeit * ZEXCEL_CONDITIONAL_ABOVE_AVG, change to builtin ty * fix ZEXCEL_DOCSECURITY * fix NUMC3 * fix numc3 Co-authored-by: sandraros <34005250+sandraros@users.noreply.github.com> --- src/zcl_excel_converter.clas.abap | 14 +++++++------- src/zcl_excel_writer_2007.clas.abap | 6 +++--- src/zcl_excel_writer_csv.clas.abap | 19 ++++++++++++------- src/zexcel_conditional_above_avg.tabl.xml | 11 +++++++---- src/zexcel_docsecurity.dtel.xml | 5 +++-- src/zif_excel_writer.intf.abap | 4 +++- 6 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/zcl_excel_converter.clas.abap b/src/zcl_excel_converter.clas.abap index 43b9aa4..8e599e4 100644 --- a/src/zcl_excel_converter.clas.abap +++ b/src/zcl_excel_converter.clas.abap @@ -100,15 +100,15 @@ CLASS zcl_excel_converter DEFINITION DATA wt_colors TYPE zexcel_t_converter_col . DATA wt_filter TYPE zexcel_t_converter_fil . CLASS-DATA wt_objects TYPE tt_alv_types . - CLASS-DATA w_fcount TYPE numc3 . + CLASS-DATA w_fcount TYPE n LENGTH 3 . DATA wt_sort_values TYPE tt_sort_values . DATA wt_subtotal_rows TYPE tt_subtotal_rows . DATA wt_styles TYPE tt_styles . - CONSTANTS c_type_hdr TYPE c VALUE 'H'. "#EC NOTEXT - CONSTANTS c_type_str TYPE c VALUE 'P'. "#EC NOTEXT - CONSTANTS c_type_nor TYPE c VALUE 'N'. "#EC NOTEXT - CONSTANTS c_type_sub TYPE c VALUE 'S'. "#EC NOTEXT - CONSTANTS c_type_tot TYPE c VALUE 'T'. "#EC NOTEXT + CONSTANTS c_type_hdr TYPE c VALUE 'H'. "#EC NOTEXT + CONSTANTS c_type_str TYPE c VALUE 'P'. "#EC NOTEXT + CONSTANTS c_type_nor TYPE c VALUE 'N'. "#EC NOTEXT + CONSTANTS c_type_sub TYPE c VALUE 'S'. "#EC NOTEXT + CONSTANTS c_type_tot TYPE c VALUE 'T'. "#EC NOTEXT DATA wt_color_styles TYPE tt_color_styles . CLASS-DATA ws_option TYPE zexcel_s_converter_option . CLASS-DATA ws_indx TYPE indx . @@ -249,7 +249,7 @@ ENDCLASS. -CLASS zcl_excel_converter IMPLEMENTATION. +CLASS ZCL_EXCEL_CONVERTER IMPLEMENTATION. METHOD ask_option. diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap index 4ad3139..4319c63 100644 --- a/src/zcl_excel_writer_2007.clas.abap +++ b/src/zcl_excel_writer_2007.clas.abap @@ -597,7 +597,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lo_table TYPE REF TO zcl_excel_table. DATA: lv_worksheets_num TYPE i, - lv_worksheets_numc TYPE numc3, + lv_worksheets_numc TYPE n LENGTH 3, lv_xml_node_worksheet_pn TYPE string, lv_value TYPE string, lv_comment_index TYPE i VALUE 1, " (+) GGAR @@ -1075,8 +1075,8 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. lo_element TYPE REF TO if_ixml_element. DATA: lv_value TYPE string, - lv_date TYPE sydatum, - lv_time TYPE syuzeit. + lv_date TYPE d, + lv_time TYPE t. ********************************************************************** * STEP 1: Create [Content_Types].xml into the root of the ZIP diff --git a/src/zcl_excel_writer_csv.clas.abap b/src/zcl_excel_writer_csv.clas.abap index 5defa92..44f4560 100644 --- a/src/zcl_excel_writer_csv.clas.abap +++ b/src/zcl_excel_writer_csv.clas.abap @@ -32,23 +32,28 @@ CLASS zcl_excel_writer_csv DEFINITION PRIVATE SECTION. DATA excel TYPE REF TO zcl_excel . - CLASS-DATA delimiter TYPE c VALUE ';'. "#EC NOTEXT . . . . . . . . . " . - CLASS-DATA enclosure TYPE c VALUE '"'. "#EC NOTEXT . . . . . . . . . " . - CLASS-DATA eol TYPE c LENGTH 2 VALUE cl_abap_char_utilities=>cr_lf. "#EC NOTEXT . . . . . . . . . " . + CLASS-DATA delimiter TYPE c VALUE ';' ##NO_TEXT. + CLASS-DATA enclosure TYPE c VALUE '"' ##NO_TEXT. + CLASS-DATA: + eol TYPE c LENGTH 2 VALUE cl_abap_char_utilities=>cr_lf ##NO_TEXT. CLASS-DATA worksheet_name TYPE zexcel_worksheets_name . CLASS-DATA worksheet_index TYPE zexcel_active_worksheet . METHODS create RETURNING - VALUE(ep_excel) TYPE xstring . + VALUE(ep_excel) TYPE xstring + RAISING + zcx_excel. METHODS create_csv RETURNING - VALUE(ep_content) TYPE xstring . + VALUE(ep_content) TYPE xstring + RAISING + zcx_excel . ENDCLASS. -CLASS zcl_excel_writer_csv IMPLEMENTATION. +CLASS ZCL_EXCEL_WRITER_CSV IMPLEMENTATION. METHOD create. @@ -68,7 +73,7 @@ CLASS zcl_excel_writer_csv IMPLEMENTATION. END OF lty_format. DATA: lt_format TYPE STANDARD TABLE OF lty_format, ls_format LIKE LINE OF lt_format, - lv_date TYPE dats, + lv_date TYPE d, lv_tmp TYPE string, lv_time TYPE c LENGTH 8. diff --git a/src/zexcel_conditional_above_avg.tabl.xml b/src/zexcel_conditional_above_avg.tabl.xml index 6fac646..c932505 100644 --- a/src/zexcel_conditional_above_avg.tabl.xml +++ b/src/zexcel_conditional_above_avg.tabl.xml @@ -12,7 +12,7 @@ ABOVE_AVERAGE - FLAG + XSDBOOLEAN 0 X F @@ -20,7 +20,7 @@ EQUAL_AVERAGE - FLAG + XSDBOOLEAN 0 X F @@ -28,9 +28,12 @@ STANDARD_DEVIATION - NUM1 0 - E + N + 000002 + NUMC + 000001 + NUMC CELL_STYLE diff --git a/src/zexcel_docsecurity.dtel.xml b/src/zexcel_docsecurity.dtel.xml index 0fa7df3..20e3f22 100644 --- a/src/zexcel_docsecurity.dtel.xml +++ b/src/zexcel_docsecurity.dtel.xml @@ -5,7 +5,6 @@ ZEXCEL_DOCSECURITY E - NUMC1 55 10 15 @@ -16,7 +15,9 @@ DocSecurity DocSecurity E - D + NUMC + 000001 + 000001 diff --git a/src/zif_excel_writer.intf.abap b/src/zif_excel_writer.intf.abap index 8fbf52a..9b7dfd7 100644 --- a/src/zif_excel_writer.intf.abap +++ b/src/zif_excel_writer.intf.abap @@ -6,5 +6,7 @@ INTERFACE zif_excel_writer IMPORTING !io_excel TYPE REF TO zcl_excel RETURNING - VALUE(ep_file) TYPE xstring . + VALUE(ep_file) TYPE xstring + RAISING + zcx_excel. ENDINTERFACE.