From 1c276c6027e91fa3ba388c33ca617498342b091c Mon Sep 17 00:00:00 2001 From: Stefan Rutzmoser <48249452+StefanRutzmoser@users.noreply.github.com> Date: Tue, 10 Nov 2020 18:21:38 +0100 Subject: [PATCH] Fix package errors (#708) * Fix package check errors * Bump version number to 7.2.0 --- src/zcl_excel.clas.abap | 10 +- src/zcl_excel_autofilters.clas.abap | 2 +- src/zcl_excel_columns.clas.abap | 6 +- src/zcl_excel_comments.clas.abap | 10 +- src/zcl_excel_data_validations.clas.abap | 6 +- src/zcl_excel_drawings.clas.abap | 10 +- src/zcl_excel_ranges.clas.abap | 8 +- src/zcl_excel_rows.clas.abap | 6 +- src/zcl_excel_styles.clas.abap | 8 +- src/zcl_excel_styles_cond.clas.abap | 8 +- src/zcl_excel_worksheet.clas.abap | 14 +-- src/zcl_excel_worksheets.clas.abap | 8 +- src/zcl_excel_writer_2007.clas.abap | 122 +++++++++++------------ src/zcl_excel_writer_csv.clas.abap | 8 +- src/zcl_excel_writer_huge_file.clas.abap | 16 +-- src/zcl_excel_writer_xlsm.clas.abap | 16 +-- 16 files changed, 129 insertions(+), 129 deletions(-) diff --git a/src/zcl_excel.clas.abap b/src/zcl_excel.clas.abap index 6444050..529885e 100644 --- a/src/zcl_excel.clas.abap +++ b/src/zcl_excel.clas.abap @@ -151,7 +151,7 @@ protected section. data WORKSHEETS type ref to ZCL_EXCEL_WORKSHEETS . private section. - constants VERSION type CHAR10 value '7.0.6'. "#EC NOTEXT + constants VERSION type CHAR10 value '7.2.0'. "#EC NOTEXT data AUTOFILTERS type ref to ZCL_EXCEL_AUTOFILTERS . data CHARTS type ref to ZCL_EXCEL_DRAWINGS . data DEFAULT_STYLE type ZEXCEL_CELL_STYLE . @@ -402,8 +402,8 @@ method GET_NEXT_TABLE_ID. lv_tables_count TYPE i. lo_iterator = me->get_worksheets_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_worksheet ?= lo_iterator->get_next( ). lv_tables_count = lo_worksheet->get_tables_size( ). ADD lv_tables_count TO ep_id. @@ -597,8 +597,8 @@ METHOD set_active_sheet_index_by_name. ws_it = me->worksheets->get_iterator( ). - WHILE ws_it->if_object_collection_iterator~has_next( ) = abap_true. - ws ?= ws_it->if_object_collection_iterator~get_next( ). + WHILE ws_it->has_next( ) = abap_true. + ws ?= ws_it->get_next( ). lv_title = ws->get_title( ). IF lv_title = i_worksheet_name. me->worksheets->active_worksheet = count. diff --git a/src/zcl_excel_autofilters.clas.abap b/src/zcl_excel_autofilters.clas.abap index ebcc2a3..c91aba5 100644 --- a/src/zcl_excel_autofilters.clas.abap +++ b/src/zcl_excel_autofilters.clas.abap @@ -21,7 +21,7 @@ public section. methods GET importing !IO_WORKSHEET type ref to ZCL_EXCEL_WORKSHEET optional - !I_SHEET_GUID type UUID optional + !I_SHEET_GUID type sysuuid_x16 optional returning value(RO_AUTOFILTER) type ref to ZCL_EXCEL_AUTOFILTER . methods IS_EMPTY diff --git a/src/zcl_excel_columns.clas.abap b/src/zcl_excel_columns.clas.abap index 1a2f81b..6b68c81 100644 --- a/src/zcl_excel_columns.clas.abap +++ b/src/zcl_excel_columns.clas.abap @@ -87,12 +87,12 @@ CLASS ZCL_EXCEL_COLUMNS IMPLEMENTATION. method GET_ITERATOR. - EO_ITERATOR ?= COLUMNS->IF_OBJECT_COLLECTION~GET_ITERATOR( ). + EO_ITERATOR ?= COLUMNS->GET_ITERATOR( ). endmethod. method IS_EMPTY. - IS_EMPTY = COLUMNS->IF_OBJECT_COLLECTION~IS_EMPTY( ). + IS_EMPTY = COLUMNS->IS_EMPTY( ). endmethod. @@ -103,6 +103,6 @@ CLASS ZCL_EXCEL_COLUMNS IMPLEMENTATION. method SIZE. - EP_SIZE = COLUMNS->IF_OBJECT_COLLECTION~SIZE( ). + EP_SIZE = COLUMNS->SIZE( ). endmethod. ENDCLASS. diff --git a/src/zcl_excel_comments.clas.abap b/src/zcl_excel_comments.clas.abap index a0c8372..614872b 100644 --- a/src/zcl_excel_comments.clas.abap +++ b/src/zcl_excel_comments.clas.abap @@ -45,7 +45,7 @@ METHOD add. DATA: lv_index TYPE i. comments->add( ip_comment ). - lv_index = comments->if_object_collection~size( ). + lv_index = comments->size( ). ENDMETHOD. @@ -65,14 +65,14 @@ ENDMETHOD. method GET. DATA lv_index TYPE i. lv_index = ip_index. - eo_comment ?= comments->if_object_collection~get( lv_index ). + eo_comment ?= comments->get( lv_index ). endmethod. method GET_ITERATOR. - eo_iterator ?= comments->if_object_collection~get_iterator( ). + eo_iterator ?= comments->get_iterator( ). endmethod. @@ -83,7 +83,7 @@ ENDMETHOD. method IS_EMPTY. - is_empty = comments->if_object_collection~is_empty( ). + is_empty = comments->is_empty( ). endmethod. @@ -95,6 +95,6 @@ method REMOVE. method SIZE. - ep_size = comments->if_object_collection~size( ). + ep_size = comments->size( ). endmethod. ENDCLASS. diff --git a/src/zcl_excel_data_validations.clas.abap b/src/zcl_excel_data_validations.clas.abap index 01775ce..3ddf368 100644 --- a/src/zcl_excel_data_validations.clas.abap +++ b/src/zcl_excel_data_validations.clas.abap @@ -58,12 +58,12 @@ method CONSTRUCTOR. method GET_ITERATOR. - eo_iterator ?= data_validations->if_object_collection~get_iterator( ). + eo_iterator ?= data_validations->get_iterator( ). endmethod. method IS_EMPTY. - is_empty = data_validations->if_object_collection~is_empty( ). + is_empty = data_validations->is_empty( ). endmethod. @@ -73,6 +73,6 @@ method REMOVE. method SIZE. - ep_size = data_validations->if_object_collection~size( ). + ep_size = data_validations->size( ). endmethod. ENDCLASS. diff --git a/src/zcl_excel_drawings.clas.abap b/src/zcl_excel_drawings.clas.abap index dd0a208..de6b094 100644 --- a/src/zcl_excel_drawings.clas.abap +++ b/src/zcl_excel_drawings.clas.abap @@ -60,7 +60,7 @@ method ADD. DATA: lv_index TYPE i. drawings->add( ip_drawing ). - lv_index = drawings->if_object_collection~size( ). + lv_index = drawings->size( ). ip_drawing->create_media_name( ip_index = lv_index ). endmethod. @@ -84,13 +84,13 @@ method GET. DATA lv_index TYPE i. lv_index = ip_index. - eo_drawing ?= drawings->if_object_collection~get( lv_index ). + eo_drawing ?= drawings->get( lv_index ). endmethod. method GET_ITERATOR. - eo_iterator ?= drawings->if_object_collection~get_iterator( ). + eo_iterator ?= drawings->get_iterator( ). endmethod. @@ -106,7 +106,7 @@ method INCLUDE. method IS_EMPTY. - is_empty = drawings->if_object_collection~is_empty( ). + is_empty = drawings->is_empty( ). endmethod. @@ -118,6 +118,6 @@ method REMOVE. method SIZE. - ep_size = drawings->if_object_collection~size( ). + ep_size = drawings->size( ). endmethod. ENDCLASS. diff --git a/src/zcl_excel_ranges.clas.abap b/src/zcl_excel_ranges.clas.abap index cec3e1b..ef3471b 100644 --- a/src/zcl_excel_ranges.clas.abap +++ b/src/zcl_excel_ranges.clas.abap @@ -63,17 +63,17 @@ method CONSTRUCTOR. method GET. - eo_range ?= ranges->if_object_collection~get( ip_index ). + eo_range ?= ranges->get( ip_index ). endmethod. method GET_ITERATOR. - eo_iterator ?= ranges->if_object_collection~get_iterator( ). + eo_iterator ?= ranges->get_iterator( ). endmethod. method IS_EMPTY. - is_empty = ranges->if_object_collection~is_empty( ). + is_empty = ranges->is_empty( ). endmethod. @@ -83,6 +83,6 @@ method REMOVE. method SIZE. - ep_size = ranges->if_object_collection~size( ). + ep_size = ranges->size( ). endmethod. ENDCLASS. diff --git a/src/zcl_excel_rows.clas.abap b/src/zcl_excel_rows.clas.abap index 7ce0244..8202c77 100644 --- a/src/zcl_excel_rows.clas.abap +++ b/src/zcl_excel_rows.clas.abap @@ -93,12 +93,12 @@ CLASS ZCL_EXCEL_ROWS IMPLEMENTATION. method GET_ITERATOR. - EO_ITERATOR ?= ROWS->IF_OBJECT_COLLECTION~GET_ITERATOR( ). + EO_ITERATOR ?= ROWS->GET_ITERATOR( ). endmethod. "GET_ITERATOR method IS_EMPTY. - IS_EMPTY = ROWS->IF_OBJECT_COLLECTION~IS_EMPTY( ). + IS_EMPTY = ROWS->IS_EMPTY( ). endmethod. "IS_EMPTY @@ -109,6 +109,6 @@ CLASS ZCL_EXCEL_ROWS IMPLEMENTATION. method SIZE. - EP_SIZE = ROWS->IF_OBJECT_COLLECTION~SIZE( ). + EP_SIZE = ROWS->SIZE( ). endmethod. "SIZE ENDCLASS. diff --git a/src/zcl_excel_styles.clas.abap b/src/zcl_excel_styles.clas.abap index a95c251..441e7df 100644 --- a/src/zcl_excel_styles.clas.abap +++ b/src/zcl_excel_styles.clas.abap @@ -75,21 +75,21 @@ method CONSTRUCTOR. method GET. - eo_style ?= styles->if_object_collection~get( ip_index ). + eo_style ?= styles->get( ip_index ). endmethod. method GET_ITERATOR. - eo_iterator ?= styles->if_object_collection~get_iterator( ). + eo_iterator ?= styles->get_iterator( ). endmethod. method IS_EMPTY. - is_empty = styles->if_object_collection~is_empty( ). + is_empty = styles->is_empty( ). endmethod. @@ -111,6 +111,6 @@ method REMOVE. method SIZE. - ep_size = styles->if_object_collection~size( ). + ep_size = styles->size( ). endmethod. ENDCLASS. diff --git a/src/zcl_excel_styles_cond.clas.abap b/src/zcl_excel_styles_cond.clas.abap index 65d1c5d..b5e0883 100644 --- a/src/zcl_excel_styles_cond.clas.abap +++ b/src/zcl_excel_styles_cond.clas.abap @@ -64,17 +64,17 @@ ENDMETHOD. METHOD get. DATA lv_index TYPE i. lv_index = ip_index. - eo_style_cond ?= styles_cond->if_object_collection~get( lv_index ). + eo_style_cond ?= styles_cond->get( lv_index ). ENDMETHOD. METHOD get_iterator. - eo_iterator ?= styles_cond->if_object_collection~get_iterator( ). + eo_iterator ?= styles_cond->get_iterator( ). ENDMETHOD. METHOD is_empty. - is_empty = styles_cond->if_object_collection~is_empty( ). + is_empty = styles_cond->is_empty( ). ENDMETHOD. @@ -84,6 +84,6 @@ ENDMETHOD. METHOD size. - ep_size = styles_cond->if_object_collection~size( ). + ep_size = styles_cond->size( ). ENDMETHOD. ENDCLASS. diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap index c4e6b1c..02893b0 100644 --- a/src/zcl_excel_worksheet.clas.abap +++ b/src/zcl_excel_worksheet.clas.abap @@ -330,7 +330,7 @@ CLASS zcl_excel_worksheet DEFINITION !ep_column TYPE zexcel_cell_column . METHODS get_guid RETURNING - VALUE(ep_guid) TYPE uuid . + VALUE(ep_guid) TYPE sysuuid_x16 . METHODS get_highest_column RETURNING VALUE(r_highest_column) TYPE zexcel_cell_column @@ -596,7 +596,7 @@ CLASS zcl_excel_worksheet DEFINITION DATA drawings TYPE REF TO zcl_excel_drawings . DATA freeze_pane_cell_column TYPE zexcel_cell_column . DATA freeze_pane_cell_row TYPE zexcel_cell_row . - DATA guid TYPE uuid . + DATA guid TYPE sysuuid_x16 . DATA hyperlinks TYPE REF TO cl_object_collection . DATA lower_cell TYPE zexcel_s_cell_data . DATA mo_pagebreaks TYPE REF TO zcl_excel_worksheet_pagebreaks . @@ -2872,10 +2872,10 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. lv_column_int = zcl_excel_common=>convert_column2int( ls_settings-top_left_column ). - lo_iterator = me->tables->if_object_collection~get_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. + lo_iterator = me->tables->get_iterator( ). + WHILE lo_iterator->has_next( ) EQ abap_true. - lo_curtable ?= lo_iterator->if_object_collection_iterator~get_next( ). + lo_curtable ?= lo_iterator->get_next( ). IF ( ( ls_settings-top_left_row GE lo_curtable->settings-top_left_row AND ls_settings-top_left_row LE lo_curtable->settings-bottom_right_row ) OR ( ls_settings-bottom_right_row GE lo_curtable->settings-top_left_row AND ls_settings-bottom_right_row LE lo_curtable->settings-bottom_right_row ) @@ -4463,12 +4463,12 @@ CLASS zcl_excel_worksheet IMPLEMENTATION. METHOD get_tables_iterator. - eo_iterator = tables->if_object_collection~get_iterator( ). + eo_iterator = tables->get_iterator( ). ENDMETHOD. "GET_TABLES_ITERATOR METHOD get_tables_size. - ep_size = tables->if_object_collection~size( ). + ep_size = tables->size( ). ENDMETHOD. "GET_TABLES_SIZE diff --git a/src/zcl_excel_worksheets.clas.abap b/src/zcl_excel_worksheets.clas.abap index b7237b5..103ea54 100644 --- a/src/zcl_excel_worksheets.clas.abap +++ b/src/zcl_excel_worksheets.clas.abap @@ -72,21 +72,21 @@ method GET. DATA lv_index TYPE i. lv_index = ip_index. - eo_worksheet ?= worksheets->if_object_collection~get( lv_index ). + eo_worksheet ?= worksheets->get( lv_index ). endmethod. method GET_ITERATOR. - eo_iterator ?= worksheets->if_object_collection~get_iterator( ). + eo_iterator ?= worksheets->get_iterator( ). endmethod. method IS_EMPTY. - is_empty = worksheets->if_object_collection~is_empty( ). + is_empty = worksheets->is_empty( ). endmethod. @@ -100,7 +100,7 @@ method REMOVE. method SIZE. - ep_size = worksheets->if_object_collection~size( ). + ep_size = worksheets->size( ). endmethod. ENDCLASS. diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap index 66bf06f..a614a96 100644 --- a/src/zcl_excel_writer_2007.clas.abap +++ b/src/zcl_excel_writer_2007.clas.abap @@ -321,10 +321,10 @@ METHOD create. lo_iterator = me->excel->get_worksheets_iterator( ). lo_active_worksheet = me->excel->get_active_worksheet( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. + WHILE lo_iterator->has_next( ) EQ abap_true. lv_sheet_index = sy-index. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + lo_worksheet ?= lo_iterator->get_next( ). IF lo_active_worksheet->get_guid( ) EQ lo_worksheet->get_guid( ). lv_active = abap_true. ELSE. @@ -422,8 +422,8 @@ METHOD create. lo_nested_iterator = lo_worksheet->get_tables_iterator( ). - WHILE lo_nested_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_table ?= lo_nested_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_nested_iterator->has_next( ) EQ abap_true. + lo_table ?= lo_nested_iterator->get_next( ). lv_content = me->create_xl_table( lo_table ). lv_value = lo_table->get_name( ). @@ -439,8 +439,8 @@ METHOD create. ********************************************************************** * STEP 11: Add media lo_iterator = me->excel->get_drawings_iterator( zcl_excel_drawing=>type_image ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_drawing ?= lo_iterator->get_next( ). * IF lo_drawing->get_type( ) NE zcl_excel_drawing=>type_image_header_footer. lv_content = lo_drawing->get_media( ). @@ -454,8 +454,8 @@ METHOD create. ********************************************************************** * STEP 12: Add charts lo_iterator = me->excel->get_drawings_iterator( zcl_excel_drawing=>type_chart ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_drawing ?= lo_iterator->get_next( ). lv_content = lo_drawing->get_media( ). @@ -640,13 +640,13 @@ method CREATE_CONTENT_TYPES. ENDDO. lo_iterator = me->excel->get_worksheets_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_worksheet ?= lo_iterator->get_next( ). lo_nested_iterator = lo_worksheet->get_tables_iterator( ). - WHILE lo_nested_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_table ?= lo_nested_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_nested_iterator->has_next( ) EQ abap_true. + lo_table ?= lo_nested_iterator->get_next( ). lv_value = lo_table->get_name( ). CONCATENATE '/xl/tables/' lv_value '.xml' INTO lv_value. @@ -712,8 +712,8 @@ method CREATE_CONTENT_TYPES. lv_mime_type TYPE mimetypes-type. lo_iterator = me->excel->get_drawings_iterator( zcl_excel_drawing=>type_image ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) = abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) = abap_true. + lo_drawing ?= lo_iterator->get_next( ). lv_media_type = lo_drawing->get_media_type( ). COLLECT lv_media_type INTO lt_media_type. @@ -739,8 +739,8 @@ method CREATE_CONTENT_TYPES. " Charts lo_iterator = me->excel->get_drawings_iterator( zcl_excel_drawing=>type_chart ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) = abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) = abap_true. + lo_drawing ?= lo_iterator->get_next( ). lo_element = lo_document->create_simple_element( name = lc_xml_node_override parent = lo_document ). @@ -924,12 +924,12 @@ method CREATE_DOCPROPS_APP. lo_iterator = excel->get_worksheets_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. + WHILE lo_iterator->has_next( ) EQ abap_true. " ** lpstr node lo_sub_element_lpstr = lo_document->create_simple_element_ns( name = lc_xml_node_lpstr prefix = lc_vt_ns parent = lo_document ). - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + lo_worksheet ?= lo_iterator->get_next( ). lv_value = lo_worksheet->get_title( ). lo_sub_element_lpstr->set_value( value = lv_value ). lo_sub_element_vector->append_child( new_child = lo_sub_element_lpstr ). " lpstr node @@ -2333,8 +2333,8 @@ METHOD create_xl_comments. lo_comments = io_worksheet->get_comments( ). lo_iterator = lo_comments->get_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_comment ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_comment ?= lo_iterator->get_next( ). lo_element_comment = lo_document->create_simple_element( name = lc_xml_node_comment parent = lo_document ). @@ -2423,8 +2423,8 @@ method CREATE_XL_DRAWINGS. lo_drawings = io_worksheet->get_drawings( ). lo_iterator = lo_drawings->get_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_drawing ?= lo_iterator->get_next( ). ADD 1 TO lv_rel_id. lo_element_cellanchor = me->create_xl_drawing_anchor( @@ -2567,8 +2567,8 @@ method CREATE_XL_DRAWINGS_RELS. lv_counter = 0. lo_drawings = io_worksheet->get_drawings( ). lo_iterator = lo_drawings->get_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_drawing ?= lo_iterator->get_next( ). ADD 1 TO lv_counter. lv_value = lv_counter. @@ -2686,8 +2686,8 @@ METHOD create_xl_drawings_vml_rels. * STEP 4: Create subnodes lv_relation_id = 0. lo_iterator = me->excel->get_drawings_iterator( zcl_excel_drawing=>type_image ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_drawing ?= lo_iterator->get_next( ). IF lo_drawing->get_type( ) = zcl_excel_drawing=>type_image_header_footer. ADD 1 TO lv_relation_id. lv_value = lv_relation_id. @@ -3194,9 +3194,9 @@ METHOD create_xl_drawing_for_comments. lo_comments = io_worksheet->get_comments( ). lo_iterator = lo_comments->get_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. + WHILE lo_iterator->has_next( ) EQ abap_true. lv_index = sy-index. - lo_comment ?= lo_iterator->if_object_collection_iterator~get_next( ). + lo_comment ?= lo_iterator->get_next( ). zcl_excel_common=>convert_columnrow2column_a_row( EXPORTING i_columnrow = lo_comment->get_ref( ) IMPORTING e_column = lv_str_column @@ -3537,8 +3537,8 @@ METHOD create_xl_sharedstrings. * STEP 1: Collect strings from each worksheet lo_iterator = excel->get_worksheets_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_worksheet ?= lo_iterator->get_next( ). APPEND LINES OF lo_worksheet->sheet_content TO lt_cell_data. ENDWHILE. @@ -4517,8 +4517,8 @@ METHOD create_xl_sheet. " Conditional formatting node lo_iterator = io_worksheet->get_style_cond_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_style_cond ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_style_cond ?= lo_iterator->get_next( ). IF lo_style_cond->rule IS INITIAL. CONTINUE. ENDIF. @@ -4842,8 +4842,8 @@ METHOD create_xl_sheet. parent = lo_document ). " Conditional formatting node lo_iterator = io_worksheet->get_data_validations_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_data_validation ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_data_validation ?= lo_iterator->get_next( ). " dataValidation node lo_element_2 = lo_document->create_simple_element( name = lc_xml_node_datavalidation parent = lo_document ). @@ -4950,8 +4950,8 @@ METHOD create_xl_sheet. parent = lo_document ). lo_iterator = io_worksheet->get_hyperlinks_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_link ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_link ?= lo_iterator->get_next( ). lo_element_2 = lo_document->create_simple_element( name = 'hyperlink' parent = lo_element ). @@ -5290,8 +5290,8 @@ METHOD create_xl_sheet. value = lv_value ). lo_iterator = io_worksheet->get_tables_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_table ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_table ?= lo_iterator->get_next( ). ADD 1 TO lv_relation_id. lv_value = lv_relation_id. @@ -5444,8 +5444,8 @@ METHOD create_xl_sheet_rels. " Add sheet Relationship nodes here lv_relation_id = 0. lo_iterator = io_worksheet->get_hyperlinks_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_link ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_link ?= lo_iterator->get_next( ). CHECK lo_link->is_internal( ) = abap_false. " issue #340 - don't put internal links here ADD 1 TO lv_relation_id. @@ -5581,8 +5581,8 @@ METHOD create_xl_sheet_rels. lo_iterator = io_worksheet->get_tables_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_table ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_table ?= lo_iterator->get_next( ). ADD 1 TO lv_relation_id. lv_value = lv_relation_id. @@ -5715,8 +5715,8 @@ METHOD create_xl_sheet_sheet_data. *--------------------------------------------------------------------* *Build table to hold all table-areas attached to this sheet lo_iterator = io_worksheet->get_tables_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_table ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_table ?= lo_iterator->get_next( ). ls_table_area-left = zcl_excel_common=>convert_column2int( lo_table->settings-top_left_column ). ls_table_area-right = lo_table->get_right_column_integer( ). ls_table_area-top = lo_table->settings-top_left_row. @@ -6208,8 +6208,8 @@ METHOD create_xl_styles. ENDLOOP. * Compress styles lo_iterator = excel->get_styles_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_style ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_style ?= lo_iterator->get_next( ). ls_font = lo_style->font->get_structure( ). ls_fill = lo_style->fill->get_structure( ). ls_border = lo_style->borders->get_structure( ). @@ -6879,12 +6879,12 @@ METHOD create_xl_styles. lo_iterator = me->excel->get_worksheets_iterator( ). " get sheets - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_worksheet ?= lo_iterator->get_next( ). " Conditional formatting styles into exch sheet lo_iterator2 = lo_worksheet->get_style_cond_iterator( ). - WHILE lo_iterator2->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_style_cond ?= lo_iterator2->if_object_collection_iterator~get_next( ). + WHILE lo_iterator2->has_next( ) EQ abap_true. + lo_style_cond ?= lo_iterator2->get_next( ). CASE lo_style_cond->rule. * begin of change issue #366 - missing conditional rules: top10, move dfx-styles to own method WHEN zcl_excel_style_cond=>c_rule_cellis. @@ -7274,7 +7274,7 @@ METHOD create_xl_workbook. DATA: lv_xml_node_ridx_id TYPE string, lv_value TYPE string, lv_syindex TYPE string, - l_guid TYPE uuid, + l_guid TYPE sysuuid_x16, lv_active_sheet TYPE zexcel_active_worksheet. ********************************************************************** @@ -7382,11 +7382,11 @@ METHOD create_xl_workbook. lo_element_range = lo_document->create_simple_element( name = lc_xml_node_definednames " issue 163 + parent = lo_document ). " issue 163 + - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. + WHILE lo_iterator->has_next( ) EQ abap_true. " sheet node lo_sub_element = lo_document->create_simple_element_ns( name = lc_xml_node_sheet parent = lo_document ). - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + lo_worksheet ?= lo_iterator->get_next( ). lv_syindex = sy-index. " question by Stefan Schmöcker 2012-12-02: sy-index seems to do the job - but is it proven to work or purely coincedence lv_value = lo_worksheet->get_title( ). SHIFT lv_syindex RIGHT DELETING TRAILING space. @@ -7415,11 +7415,11 @@ METHOD create_xl_workbook. *--------------------------------------------------------------------* * Defined names sheetlocal: Ranges, Repeat rows and columns *--------------------------------------------------------------------* - WHILE lo_iterator_range->if_object_collection_iterator~has_next( ) EQ abap_true. + WHILE lo_iterator_range->has_next( ) EQ abap_true. " range node lo_sub_element = lo_document->create_simple_element_ns( name = lc_xml_node_definedname parent = lo_document ). - lo_range ?= lo_iterator_range->if_object_collection_iterator~get_next( ). + lo_range ?= lo_iterator_range->get_next( ). lv_value = lo_range->name. lo_sub_element->set_attribute_ns( name = lc_xml_attr_name @@ -7451,11 +7451,11 @@ METHOD create_xl_workbook. * parent = lo_document ). " issue 163 - lo_iterator = excel->get_ranges_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. + WHILE lo_iterator->has_next( ) EQ abap_true. " range node lo_sub_element = lo_document->create_simple_element_ns( name = lc_xml_node_definedname parent = lo_document ). - lo_range ?= lo_iterator->if_object_collection_iterator~get_next( ). + lo_range ?= lo_iterator->get_next( ). lv_value = lo_range->name. lo_sub_element->set_attribute_ns( name = lc_xml_attr_name value = lv_value ). @@ -7471,9 +7471,9 @@ METHOD create_xl_workbook. lo_autofilters = excel->get_autofilters_reference( ). IF lo_autofilters->is_empty( ) = abap_false. lo_iterator = excel->get_worksheets_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. + WHILE lo_iterator->has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + lo_worksheet ?= lo_iterator->get_next( ). lv_syindex = sy-index - 1 . l_guid = lo_worksheet->get_guid( ). lo_autofilter = lo_autofilters->get( i_sheet_guid = l_guid ) . @@ -7785,8 +7785,8 @@ METHOD set_vml_string. lv_relation_id = 0. lo_iterator = me->excel->get_worksheets_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_worksheet ?= lo_iterator->get_next( ). lo_worksheet->sheet_setup->get_header_footer( IMPORTING ep_odd_header = ls_odd_header ep_odd_footer = ls_odd_footer diff --git a/src/zcl_excel_writer_csv.clas.abap b/src/zcl_excel_writer_csv.clas.abap index 8043c22..7dc2090 100644 --- a/src/zcl_excel_writer_csv.clas.abap +++ b/src/zcl_excel_writer_csv.clas.abap @@ -116,8 +116,8 @@ method CREATE_CSV. lo_iterator = excel->get_worksheets_iterator( ). data: current_worksheet_title type ZEXCEL_SHEET_TITLE. - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_worksheet ?= lo_iterator->get_next( ). IF worksheet_name IS NOT INITIAL. current_worksheet_title = lo_worksheet->get_title( ). @@ -145,8 +145,8 @@ method CREATE_CSV. CLEAR ls_numfmt. IF -data_type IS INITIAL AND -cell_style IS NOT INITIAL. lo_iterator = excel->get_styles_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_style ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_style ?= lo_iterator->get_next( ). CHECK lo_style->get_guid( ) = -cell_style. ls_numfmt = lo_style->number_format->get_structure( ). EXIT. diff --git a/src/zcl_excel_writer_huge_file.clas.abap b/src/zcl_excel_writer_huge_file.clas.abap index 5f76658..854fbeb 100644 --- a/src/zcl_excel_writer_huge_file.clas.abap +++ b/src/zcl_excel_writer_huge_file.clas.abap @@ -80,8 +80,8 @@ METHOD create_xl_sharedstrings. lo_iterator = excel->get_worksheets_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_worksheet ?= lo_iterator->get_next( ). APPEND LINES OF lo_worksheet->sheet_content TO lt_cell_data. ENDWHILE. @@ -538,8 +538,8 @@ METHOD create_xl_sheet. * Build table to hold all table-areas attached to this sheet * lo_iterator = io_worksheet->get_tables_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_table ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_table ?= lo_iterator->get_next( ). ls_table_area-left = zcl_excel_common=>convert_column2int( lo_table->settings-top_left_column ). ls_table_area-right = lo_table->get_right_column_integer( ). ls_table_area-top = lo_table->settings-top_left_row. @@ -627,8 +627,8 @@ METHOD create_xl_sheet. l_worksheet-hyperlinks_count = io_worksheet->get_hyperlinks_size( ). IF l_worksheet-hyperlinks_count > 0. lo_iterator = io_worksheet->get_hyperlinks_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_link ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_link ?= lo_iterator->get_next( ). APPEND INITIAL LINE TO l_worksheet-hyperlinks ASSIGNING . -ref = lo_link->get_ref( ). @@ -735,8 +735,8 @@ METHOD create_xl_sheet. l_worksheet-tables_count = io_worksheet->get_tables_size( ). IF l_worksheet-tables_count > 0. lo_iterator = io_worksheet->get_tables_iterator( ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_table ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_table ?= lo_iterator->get_next( ). APPEND INITIAL LINE TO l_worksheet-tables ASSIGNING . ADD 1 TO lv_relation_id. lv_value = lv_relation_id. diff --git a/src/zcl_excel_writer_xlsm.clas.abap b/src/zcl_excel_writer_xlsm.clas.abap index f962761..06a2edd 100644 --- a/src/zcl_excel_writer_xlsm.clas.abap +++ b/src/zcl_excel_writer_xlsm.clas.abap @@ -140,8 +140,8 @@ method CREATE. lo_active_worksheet = me->excel->get_active_worksheet( ). lv_drawing_index = 1. - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_worksheet ?= lo_iterator->get_next( ). IF lo_active_worksheet->get_guid( ) EQ lo_worksheet->get_guid( ). lv_active = abap_true. ELSE. @@ -169,8 +169,8 @@ method CREATE. lo_nested_iterator = lo_worksheet->get_tables_iterator( ). - WHILE lo_nested_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_table ?= lo_nested_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_nested_iterator->has_next( ) EQ abap_true. + lo_table ?= lo_nested_iterator->get_next( ). lv_content = me->create_xl_table( lo_table ). lv_value = lo_table->get_name( ). @@ -204,8 +204,8 @@ method CREATE. ********************************************************************** * STEP 11: Add media lo_iterator = me->excel->get_drawings_iterator( zcl_excel_drawing=>type_image ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_drawing ?= lo_iterator->get_next( ). lv_content = lo_drawing->get_media( ). lv_value = lo_drawing->get_media_name( ). @@ -217,8 +217,8 @@ method CREATE. ********************************************************************** * STEP 12: Add charts lo_iterator = me->excel->get_drawings_iterator( zcl_excel_drawing=>type_chart ). - WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true. - lo_drawing ?= lo_iterator->if_object_collection_iterator~get_next( ). + WHILE lo_iterator->has_next( ) EQ abap_true. + lo_drawing ?= lo_iterator->get_next( ). lv_content = lo_drawing->get_media( ). lv_value = lo_drawing->get_media_name( ).