SAP/abap2xlsx
1
0
Fork 0
mirror of https://github.com/abap2xlsx/abap2xlsx.git synced 2025-05-05 11:06:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Worksheet's method set_title doesn't handle escaped titles and sheetlocal ranges (#1236)

Browse Source 
Fix #1235
This commit is contained in:
Bernd 2024-06-09 20:34:29 +02:00 committed by GitHub
parent 564d60e0f5
commit e389d2dff5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/zcl_excel_worksheet.clas.abap
View File

@ -4525,7 +4525,6 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
*--------------------------------------------------------------------* *--------------------------------------------------------------------*
DATA: lo_worksheets_iterator TYPE REF TO zcl_excel_collection_iterator, DATA: lo_worksheets_iterator TYPE REF TO zcl_excel_collection_iterator,
lo_worksheet TYPE REF TO zcl_excel_worksheet, lo_worksheet TYPE REF TO zcl_excel_worksheet,
errormessage TYPE string,
lv_rangesheetname_old TYPE string, lv_rangesheetname_old TYPE string,
lv_rangesheetname_new TYPE string, lv_rangesheetname_new TYPE string,
lo_ranges_iterator TYPE REF TO zcl_excel_collection_iterator, lo_ranges_iterator TYPE REF TO zcl_excel_collection_iterator,
@ -4555,14 +4554,14 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
* Check whether title is unique in workbook * Check whether title is unique in workbook
*--------------------------------------------------------------------* *--------------------------------------------------------------------*
lo_worksheets_iterator = me->excel->get_worksheets_iterator( ). lo_worksheets_iterator = me->excel->get_worksheets_iterator( ).
WHILE lo_worksheets_iterator->has_next( ) = 'X'. WHILE lo_worksheets_iterator->has_next( ) = abap_true.
lo_worksheet ?= lo_worksheets_iterator->get_next( ). lo_worksheet ?= lo_worksheets_iterator->get_next( ).
CHECK me->guid <> lo_worksheet->get_guid( ). " Don't check against itself CHECK me->guid <> lo_worksheet->get_guid( ). " Don't check against itself
IF ip_title = lo_worksheet->get_title( ). " Not unique --> raise exception IF ip_title = lo_worksheet->get_title( ). " Not unique --> raise exception
errormessage = 'Duplicate sheetname &'. lv_errormessage = 'Duplicate sheetname &'.
REPLACE '&' IN errormessage WITH ip_title. REPLACE '&' IN lv_errormessage WITH ip_title.
zcx_excel=>raise_text( errormessage ). zcx_excel=>raise_text( lv_errormessage ).
ENDIF. ENDIF.
ENDWHILE. ENDWHILE.
@ -4570,7 +4569,7 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
*--------------------------------------------------------------------* *--------------------------------------------------------------------*
* Remember old sheetname and rename sheet to desired name * Remember old sheetname and rename sheet to desired name
*--------------------------------------------------------------------* *--------------------------------------------------------------------*
CONCATENATE me->title '!' INTO lv_rangesheetname_old. lv_rangesheetname_old = zcl_excel_common=>escape_string( me->title ) && '!'.
me->title = ip_title. me->title = ip_title.
*--------------------------------------------------------------------* *--------------------------------------------------------------------*
@ -4581,10 +4580,10 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
* I fear it isn't - but this implementation is better then * I fear it isn't - but this implementation is better then
* nothing at all since it handles a supposed majority of cases * nothing at all since it handles a supposed majority of cases
*--------------------------------------------------------------------* *--------------------------------------------------------------------*
CONCATENATE me->title '!' INTO lv_rangesheetname_new. lv_rangesheetname_new = zcl_excel_common=>escape_string( me->title ) && '!'.
lo_ranges_iterator = me->excel->get_ranges_iterator( ). lo_ranges_iterator = me->excel->get_ranges_iterator( ). "workbookglobal ranges
WHILE lo_ranges_iterator->has_next( ) = 'X'. WHILE lo_ranges_iterator->has_next( ) = abap_true.
lo_range ?= lo_ranges_iterator->get_next( ). lo_range ?= lo_ranges_iterator->get_next( ).
lv_range_value = lo_range->get_value( ). lv_range_value = lo_range->get_value( ).
@ -4595,6 +4594,20 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
ENDWHILE. ENDWHILE.
IF me->ranges IS BOUND. "not yet bound if called from worksheet's constructor
lo_ranges_iterator = me->get_ranges_iterator( ). "sheetlocal ranges, repeat rows and columns
WHILE lo_ranges_iterator->has_next( ) = abap_true.
lo_range ?= lo_ranges_iterator->get_next( ).
lv_range_value = lo_range->get_value( ).
REPLACE ALL OCCURRENCES OF lv_rangesheetname_old IN lv_range_value WITH lv_rangesheetname_new.
IF sy-subrc = 0.
lo_range->set_range_value( lv_range_value ).
ENDIF.
ENDWHILE.
ENDIF.
ENDMETHOD. "SET_TITLE ENDMETHOD. "SET_TITLE