From e4f0ca23338f4aea0b6eeacd0caf0c19ee72fb5c Mon Sep 17 00:00:00 2001 From: sandraros <34005250+sandraros@users.noreply.github.com> Date: Tue, 6 Feb 2024 15:15:51 +0100 Subject: [PATCH 1/4] Unused calls/variables about cl_xml_document (#1185) --- src/zcl_excel_writer_2007.clas.abap | 14 +------------- src/zcl_excel_writer_xlsm.clas.abap | 16 +++++----------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap index 6b9434e..c08567b 100644 --- a/src/zcl_excel_writer_2007.clas.abap +++ b/src/zcl_excel_writer_2007.clas.abap @@ -2666,7 +2666,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. METHOD create_xl_drawings_vml. DATA: - lo_xml_document TYPE REF TO cl_xml_document, ld_stream TYPE string. @@ -2677,11 +2676,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. * BODY ld_stream = set_vml_string( ). - CREATE OBJECT lo_xml_document. - CALL METHOD lo_xml_document->parse_string - EXPORTING - stream = ld_stream. - CALL FUNCTION 'SCMS_STRING_TO_XSTRING' EXPORTING text = ld_stream @@ -3334,8 +3328,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. ls_odd_footer TYPE zexcel_s_worksheet_head_foot, ls_even_header TYPE zexcel_s_worksheet_head_foot, ls_even_footer TYPE zexcel_s_worksheet_head_foot, - lv_content TYPE string, - lo_xml_document TYPE REF TO cl_xml_document. + lv_content TYPE string. * INIT_RESULT @@ -3383,11 +3376,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION. ld_7 INTO lv_content. - CREATE OBJECT lo_xml_document. - CALL METHOD lo_xml_document->parse_string - EXPORTING - stream = lv_content. - CALL FUNCTION 'SCMS_STRING_TO_XSTRING' EXPORTING text = lv_content diff --git a/src/zcl_excel_writer_xlsm.clas.abap b/src/zcl_excel_writer_xlsm.clas.abap index bb7835c..aa6ce92 100644 --- a/src/zcl_excel_writer_xlsm.clas.abap +++ b/src/zcl_excel_writer_xlsm.clas.abap @@ -262,8 +262,7 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. 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. + DATA: lv_contenttype TYPE string. ********************************************************************** * STEP 3: Create standard contentType @@ -273,7 +272,7 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. * STEP 2: modify XML adding the extension bin definition CREATE OBJECT lo_document_xml. - lv_subrc = lo_document_xml->parse_xstring( ep_content ). + lo_document_xml->parse_xstring( ep_content ). lo_document ?= lo_document_xml->m_document. lo_element_root = lo_document->if_ixml_node~get_first_child( ). @@ -342,7 +341,6 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. DATA: lv_xml_node_ridx_id TYPE string, lv_size TYPE i, - lv_subrc TYPE sysubrc, lv_syindex(2) TYPE c. ********************************************************************** @@ -353,7 +351,7 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. * STEP 2: modify XML adding the vbaProject relation CREATE OBJECT lo_document_xml. - lv_subrc = lo_document_xml->parse_xstring( ep_content ). + lo_document_xml->parse_xstring( ep_content ). lo_document ?= lo_document_xml->m_document. lo_element_root = lo_document->if_ixml_node~get_first_child( ). @@ -406,8 +404,6 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. lo_ostream TYPE REF TO if_ixml_ostream, lo_renderer TYPE REF TO if_ixml_renderer. - DATA: lv_subrc TYPE sysubrc. - ********************************************************************** * STEP 3: Create standard relationship ep_content = super->create_xl_sheet( io_worksheet = io_worksheet @@ -417,7 +413,7 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. * STEP 2: modify XML adding the vbaProject relation CREATE OBJECT lo_document_xml. - lv_subrc = lo_document_xml->parse_xstring( ep_content ). + lo_document_xml->parse_xstring( ep_content ). lo_document ?= lo_document_xml->m_document. lo_element_root = lo_document->if_ixml_node~get_first_child( ). @@ -458,8 +454,6 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. lo_ostream TYPE REF TO if_ixml_ostream, lo_renderer TYPE REF TO if_ixml_renderer. - DATA: lv_subrc TYPE sysubrc. - ********************************************************************** * STEP 3: Create standard relationship ep_content = super->create_xl_workbook( ). @@ -468,7 +462,7 @@ CLASS zcl_excel_writer_xlsm IMPLEMENTATION. * STEP 2: modify XML adding the vbaProject relation CREATE OBJECT lo_document_xml. - lv_subrc = lo_document_xml->parse_xstring( ep_content ). + lo_document_xml->parse_xstring( ep_content ). lo_document ?= lo_document_xml->m_document. lo_element_root = lo_document->if_ixml_node~get_first_child( ). From 242a3d4e43041a92146080f94ca11d82550317ee Mon Sep 17 00:00:00 2001 From: sandraros <34005250+sandraros@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:01:26 +0100 Subject: [PATCH 2/4] Ineffective Set_Namespace_Prefix on DOM document (#1186) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It always return an error but isn't handled → line removed --- src/zcl_excel_theme.clas.abap | 1 - 1 file changed, 1 deletion(-) diff --git a/src/zcl_excel_theme.clas.abap b/src/zcl_excel_theme.clas.abap index 43d223e..931c7a0 100644 --- a/src/zcl_excel_theme.clas.abap +++ b/src/zcl_excel_theme.clas.abap @@ -204,7 +204,6 @@ CLASS zcl_excel_theme IMPLEMENTATION. lo_document = lo_ixml->create_document( ). lo_document->set_encoding( lo_encoding ). lo_document->set_standalone( abap_true ). - lo_document->set_namespace_prefix( prefix = 'a' ). lo_element_root = lo_document->create_simple_element_ns( prefix = c_theme_prefix name = c_theme From 39f92725a0dc9886cb339228686c280cf1c7237c Mon Sep 17 00:00:00 2001 From: sandraros <34005250+sandraros@users.noreply.github.com> Date: Thu, 15 Feb 2024 11:16:49 +0100 Subject: [PATCH 3/4] Update LICENSE Copyright (#1191) Fix #1153 --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index e06d208..083d277 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Apache License + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -186,7 +186,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright 2010 abap2xlsx Contributors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 35425c3220b82644fd998c2a501001cb54fad3f3 Mon Sep 17 00:00:00 2001 From: Aditya Waghmare <98611511+aditya-deloitte@users.noreply.github.com> Date: Thu, 15 Feb 2024 19:50:09 +0530 Subject: [PATCH 4/4] CSV Initial External Date (#1190) * CSV Initial External Date Added code to set an initial external date other than the value returned by function module 'CONVERT_DATE_TO_EXTERNAL'. * Default value as public constant --------- Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> Co-authored-by: sandraros <34005250+sandraros@users.noreply.github.com> --- src/zcl_excel_writer_csv.clas.abap | 52 +++++++++++++++++++----------- src/zcl_excel_writer_csv.clas.xml | 23 +++++++++++++ 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/src/zcl_excel_writer_csv.clas.abap b/src/zcl_excel_writer_csv.clas.abap index 23f6853..7aa976b 100644 --- a/src/zcl_excel_writer_csv.clas.abap +++ b/src/zcl_excel_writer_csv.clas.abap @@ -9,6 +9,9 @@ CLASS zcl_excel_writer_csv DEFINITION INTERFACES zif_excel_writer . + "! Default value for initial dates e.g. user's format (DD.MM.YYYY, MM.DD.YYYY, etc.) + CONSTANTS c_default TYPE c LENGTH 10 VALUE 'DEFAULT' ##NO_TEXT. + CLASS-METHODS set_delimiter IMPORTING VALUE(ip_value) TYPE c DEFAULT ';' . @@ -24,7 +27,10 @@ CLASS zcl_excel_writer_csv DEFINITION CLASS-METHODS set_active_sheet_index_by_name IMPORTING !i_worksheet_name TYPE zexcel_worksheets_name . -*"* protected components of class ZCL_EXCEL_WRITER_2007 + CLASS-METHODS set_initial_ext_date + IMPORTING + !ip_value TYPE char10 DEFAULT c_default . +*"* protected components of class ZCL_EXCEL_WRITER_CSV *"* do not include other source files here!!! PROTECTED SECTION. *"* private components of class ZCL_EXCEL_WRITER_CSV @@ -38,6 +44,7 @@ CLASS zcl_excel_writer_csv DEFINITION 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 . + CLASS-DATA initial_ext_date TYPE char10 VALUE c_default. METHODS create RETURNING @@ -53,7 +60,7 @@ ENDCLASS. -CLASS zcl_excel_writer_csv IMPLEMENTATION. +CLASS ZCL_EXCEL_WRITER_CSV IMPLEMENTATION. METHOD create. @@ -220,24 +227,28 @@ CLASS zcl_excel_writer_csv IMPLEMENTATION. CASE -data_type. WHEN 'd' OR 'D'. - lc_value = zcl_excel_common=>excel_string_to_date( ip_value = -cell_value ). - TRY. - lv_date = lc_value. - CALL FUNCTION 'CONVERT_DATE_TO_EXTERNAL' - EXPORTING - date_internal = lv_date - IMPORTING - date_external = lv_tmp - EXCEPTIONS - date_internal_is_invalid = 1 - OTHERS = 2. - IF sy-subrc = 0. - lc_value = lv_tmp. - ENDIF. + IF -cell_value IS INITIAL AND initial_ext_date <> c_default. + lc_value = initial_ext_date. + ELSE. + lc_value = zcl_excel_common=>excel_string_to_date( ip_value = -cell_value ). + TRY. + lv_date = lc_value. + CALL FUNCTION 'CONVERT_DATE_TO_EXTERNAL' + EXPORTING + date_internal = lv_date + IMPORTING + date_external = lv_tmp + EXCEPTIONS + date_internal_is_invalid = 1 + OTHERS = 2. + IF sy-subrc = 0. + lc_value = lv_tmp. + ENDIF. - CATCH cx_sy_conversion_no_number. + CATCH cx_sy_conversion_no_number. - ENDTRY. + ENDTRY. + ENDIF. WHEN 't' OR 'T'. lc_value = zcl_excel_common=>excel_string_to_time( ip_value = -cell_value ). @@ -302,6 +313,11 @@ CLASS zcl_excel_writer_csv IMPLEMENTATION. ENDMETHOD. + METHOD set_initial_ext_date. + initial_ext_date = ip_value. + ENDMETHOD. + + METHOD zif_excel_writer~write_file. me->excel = io_excel. ep_file = me->create( ). diff --git a/src/zcl_excel_writer_csv.clas.xml b/src/zcl_excel_writer_csv.clas.xml index 2a13c78..7b1d8ad 100644 --- a/src/zcl_excel_writer_csv.clas.xml +++ b/src/zcl_excel_writer_csv.clas.xml @@ -32,6 +32,11 @@ I Create CSV ; Delimited format + + C_DEFAULT + E + Constant for string 'DEFAULT' + DELIMITER E @@ -72,6 +77,11 @@ I Excel creator + + INITIAL_EXT_DATE + E + Initial External Date + SET_ACTIVE_SHEET_INDEX E @@ -122,6 +132,11 @@ I Set End Of Line character + + SET_INITIAL_EXT_DATE + E + Set Initial External Date (replacing default '00.00.0000') + WORKSHEET_INDEX E @@ -143,6 +158,14 @@ Worksheets name + + + SET_INITIAL_EXT_DATE + IP_VALUE + E + Input Value + +