From 805472ee6187ab99dc9a185e68625c405f7f3706 Mon Sep 17 00:00:00 2001 From: Ivan Femia Date: Wed, 11 Sep 2013 21:07:09 +0000 Subject: [PATCH] Ready to test #289 new parameter in the table setting git-svn-id: https://subversion.assembla.com/svn/abap2xlsx/trunk@431 b7d68dce-7c3c-4a99-8ce0-9ea847f5d049 --- ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk | 14 ++++++++++---- ZA2X/TABL/ZEXCEL_S_TABLE_SETTINGS.slnk | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk b/ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk index 5d767de..63b8623 100644 --- a/ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk +++ b/ZA2X/CLAS/ZCL_EXCEL_WRITER_2007.slnk @@ -1,6 +1,6 @@ - + *"* local class implementation for public class *"* use this source file for the implementation part of *"* local helper classes @@ -5378,7 +5378,7 @@ endmethod. - method CREATE_XL_TABLE. + METHOD create_xl_table. DATA: lc_xml_node_table TYPE string VALUE 'table', lc_xml_node_relationship TYPE string VALUE 'Relationship', @@ -5405,6 +5405,7 @@ endmethod. lv_table_name TYPE string, lv_id TYPE i, + lv_match TYPE i, lv_syindex TYPE char3, lv_ref TYPE string, lv_value TYPE string, @@ -5438,7 +5439,12 @@ endmethod. lo_element_root->set_attribute_ns( name = lc_xml_attr_id value = lv_value ). - lv_table_name = io_table->get_name( ). + FIND ALL OCCURRENCES OF REGEX '[^_a-zA-Z0-9]' IN io_table->settings-table_name IGNORING CASE MATCH COUNT lv_match. + IF io_table->settings-table_name IS NOT INITIAL AND lv_match EQ 0. + lv_table_name = io_table->settings-table_name. + ELSE. + lv_table_name = io_table->get_name( ). + ENDIF. lo_element_root->set_attribute_ns( name = lc_xml_attr_name value = lv_table_name ). @@ -5544,7 +5550,7 @@ endmethod. lo_renderer = lo_ixml->create_renderer( ostream = lo_ostream document = lo_document ). lo_renderer->render( ). -endmethod. +ENDMETHOD. diff --git a/ZA2X/TABL/ZEXCEL_S_TABLE_SETTINGS.slnk b/ZA2X/TABL/ZEXCEL_S_TABLE_SETTINGS.slnk index 5e469af..9e1ed3f 100644 --- a/ZA2X/TABL/ZEXCEL_S_TABLE_SETTINGS.slnk +++ b/ZA2X/TABL/ZEXCEL_S_TABLE_SETTINGS.slnk @@ -1,11 +1,12 @@ - - - + + + - - - - - - + + + + + + +