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

Merge branch 'main' into hvam/normalize1212

Browse Source
This commit is contained in:
Lars Hvam 2024-07-03 14:01:39 +02:00 committed by GitHub
commit 030928b53f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 347 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/zcl_excel_autofilter.clas.abap
View File

@ -19,7 +19,7 @@ CLASS zcl_excel_autofilter DEFINITION
tr_textfilter2 TYPE RANGE OF string,
END OF ts_filter .
TYPES:
tt_filters TYPE HASHED TABLE OF ts_filter WITH UNIQUE KEY column .
tt_filters TYPE SORTED TABLE OF ts_filter WITH UNIQUE KEY column .
DATA filter_area TYPE zexcel_s_autofilter_area .
CONSTANTS mc_filter_rule_single_values TYPE tv_filter_rule VALUE 'single_values'. "#EC NOTEXT
@ -208,9 +208,6 @@ CLASS zcl_excel_autofilter IMPLEMENTATION.
METHOD is_row_hidden.
DATA: lr_filter TYPE REF TO ts_filter,
lv_col TYPE i.
FIELD-SYMBOLS: <ls_filter> TYPE ts_filter.
rv_is_hidden = abap_false.
@ -219,29 +216,25 @@ CLASS zcl_excel_autofilter IMPLEMENTATION.
* 1st row of filter area is never hidden, because here the filter
* symbol is being shown
*--------------------------------------------------------------------*
IF iv_row = me->filter_area-row_start.
IF iv_row <= me->filter_area-row_start OR
iv_row > me->filter_area-row_end.
RETURN.
ENDIF.
lv_col = me->filter_area-col_start.
WHILE lv_col <= me->filter_area-col_end.
lr_filter = me->get_column_filter( lv_col ).
ASSIGN lr_filter->* TO <ls_filter>.
LOOP AT mt_filters ASSIGNING <ls_filter> WHERE column >= me->filter_area-col_start
AND column <= me->filter_area-col_end.
CASE <ls_filter>-rule.
WHEN mc_filter_rule_single_values.
rv_is_hidden = me->is_row_hidden_single_values( iv_row = iv_row
iv_col = lv_col
iv_col = <ls_filter>-column
is_filter = <ls_filter> ).
WHEN mc_filter_rule_text_pattern.
rv_is_hidden = me->is_row_hidden_text_pattern( iv_row = iv_row
iv_col = lv_col
iv_col = <ls_filter>-column
is_filter = <ls_filter> ).
ENDCASE.
@ -250,10 +243,7 @@ CLASS zcl_excel_autofilter IMPLEMENTATION.
RETURN.
ENDIF.
ADD 1 TO lv_col.
ENDWHILE.
ENDLOOP.
ENDMETHOD.

113
src/zcl_excel_comment.clas.abap
View File

@ -5,29 +5,73 @@ CLASS zcl_excel_comment DEFINITION
PUBLIC SECTION.
CONSTANTS default_right_column TYPE i VALUE 4. "#EC NOTEXT
CONSTANTS default_bottom_row TYPE i VALUE 15. "#EC NOTEXT
METHODS constructor .
METHODS get_name
METHODS get_bottom_offset
RETURNING
VALUE(r_name) TYPE string .
VALUE(rp_result) TYPE i .
METHODS get_bottom_row
RETURNING
VALUE(rp_result) TYPE i .
METHODS get_index
RETURNING
VALUE(rp_index) TYPE string .
METHODS get_left_column
RETURNING
VALUE(rp_result) TYPE i .
METHODS get_left_offset
RETURNING
VALUE(rp_result) TYPE i .
METHODS get_name
RETURNING
VALUE(r_name) TYPE string .
METHODS get_ref
RETURNING
VALUE(rp_ref) TYPE string .
METHODS get_right_column
RETURNING
VALUE(rp_result) TYPE i .
METHODS get_right_offset
RETURNING
VALUE(rp_result) TYPE i .
METHODS get_text
RETURNING
VALUE(rp_text) TYPE string .
METHODS get_top_offset
RETURNING
VALUE(rp_result) TYPE i .
METHODS get_top_row
RETURNING
VALUE(rp_result) TYPE i .
METHODS set_text
IMPORTING
!ip_text TYPE string
!ip_ref TYPE string OPTIONAL .
!ip_text TYPE string
!ip_ref TYPE string OPTIONAL
!ip_left_column TYPE i DEFAULT 2
!ip_left_offset TYPE i DEFAULT 15
!ip_top_row TYPE i DEFAULT 11
!ip_top_offset TYPE i DEFAULT 10
!ip_right_column TYPE i DEFAULT default_right_column
!ip_right_offset TYPE i DEFAULT 31
!ip_bottom_row TYPE i DEFAULT default_bottom_row
!ip_bottom_offset TYPE i DEFAULT 9.
PROTECTED SECTION.
PRIVATE SECTION.
DATA bottom_offset TYPE i .
DATA bottom_row TYPE i .
DATA index TYPE string .
DATA ref TYPE string .
DATA left_column TYPE i .
DATA left_offset TYPE i .
DATA right_column TYPE i .
DATA right_offset TYPE i .
DATA text TYPE string .
DATA top_offset TYPE i .
DATA top_row TYPE i .
ENDCLASS.
@ -40,11 +84,31 @@ CLASS zcl_excel_comment IMPLEMENTATION.
ENDMETHOD.
METHOD get_bottom_offset.
rp_result = bottom_offset.
ENDMETHOD.
METHOD get_bottom_row.
rp_result = bottom_row.
ENDMETHOD.
METHOD get_index.
rp_index = me->index.
ENDMETHOD.
METHOD get_left_column.
rp_result = left_column.
ENDMETHOD.
METHOD get_left_offset.
rp_result = left_offset.
ENDMETHOD.
METHOD get_name.
ENDMETHOD.
@ -55,16 +119,57 @@ CLASS zcl_excel_comment IMPLEMENTATION.
ENDMETHOD.
METHOD get_right_column.
rp_result = right_column.
ENDMETHOD.
METHOD get_right_offset.
rp_result = right_offset.
ENDMETHOD.
METHOD get_text.
rp_text = me->text.
ENDMETHOD.
METHOD get_top_offset.
rp_result = top_offset.
ENDMETHOD.
METHOD get_top_row.
rp_result = top_row.
ENDMETHOD.
METHOD set_text.
me->text = ip_text.
IF ip_ref IS SUPPLIED.
me->ref = ip_ref.
ENDIF.
me->left_column = ip_left_column.
me->left_offset = ip_left_offset.
me->top_row = ip_top_row.
me->top_offset = ip_top_offset.
IF ip_right_column IS NOT INITIAL.
me->right_column = ip_right_column.
ELSE.
me->right_column = default_right_column.
ENDIF.
me->right_offset = ip_right_offset.
IF ip_bottom_row IS NOT INITIAL.
me->bottom_row = ip_bottom_row.
ELSE.
me->bottom_row = default_bottom_row.
ENDIF.
me->bottom_offset = ip_bottom_offset.
ENDMETHOD.
ENDCLASS.

25
src/zcl_excel_common.clas.abap
View File

@ -102,9 +102,22 @@ CLASS zcl_excel_common DEFINITION
VALUE(ev_unescaped_string) TYPE string
RAISING
zcx_excel .
"! <p class="shorttext synchronized" lang="en">Convert date from Excel format to SAP</p>
"! @parameter ip_value | String being an Excel number representing a date (e.g. 45141 means 2023/08/03,
"! 45141.58832 means 2023/08/03 14:07:11). Important: if the input is date +
"! time, use the additional parameter IP_EXACT = 'X'.
"! @parameter ip_exact | If the input value also contains the time i.e. a fractional part exists
"! (e.g. 45141.58832 means 2023/08/03 14:07:11), ip_exact = 'X' will
"! return the exact date (e.g. 2023/08/03), while ip_exact = ' ' (default) will
"! return the rounded-up date (e.g. 2023/08/04). NB: this rounding-up doesn't
"! happen if the time is before 12:00:00.
"! @parameter ep_value | Date corresponding to the input Excel number. It returns a null date if
"! the input value contains non-numeric characters.
"! @raising zcx_excel | The numeric input corresponds to a date before 1900/1/1 or after 9999/12/31.
CLASS-METHODS excel_string_to_date
IMPORTING
!ip_value TYPE zexcel_cell_value
!ip_exact TYPE abap_bool DEFAULT abap_false
RETURNING
VALUE(ep_value) TYPE d
RAISING
@ -860,11 +873,16 @@ CLASS zcl_excel_common IMPLEMENTATION.
METHOD excel_string_to_date.
DATA: lv_date_int TYPE i.
DATA lv_error_text TYPE string.
CHECK ip_value IS NOT INITIAL AND ip_value CN ' 0'.
TRY.
lv_date_int = ip_value.
IF ip_exact = abap_false.
lv_date_int = ip_value.
ELSE.
lv_date_int = trunc( ip_value ).
ENDIF.
IF lv_date_int NOT BETWEEN 1 AND 2958465.
zcx_excel=>raise_text( 'Unable to interpret date' ).
ENDIF.
@ -876,7 +894,8 @@ CLASS zcl_excel_common IMPLEMENTATION.
ep_value = ep_value + 1.
ENDIF.
CATCH cx_sy_conversion_error.
zcx_excel=>raise_text( 'Index out of bounds' ).
lv_error_text = |String "{ ip_value }" is not a valid Excel date|.
zcx_excel=>raise_text( lv_error_text ).
ENDTRY.
ENDMETHOD.
@ -898,7 +917,7 @@ CLASS zcl_excel_common IMPLEMENTATION.
TRY.
lv_day_fraction = ip_value.
lv_day_fraction = frac( ip_value ).
lv_seconds_in_day = lv_day_fraction * lc_seconds_in_day.
ep_value = lv_seconds_in_day.

55
src/zcl_excel_common.clas.testclasses.abap
View File

@ -55,6 +55,7 @@ CLASS lcl_excel_common_test DEFINITION FOR TESTING
METHODS excel_string_to_time3 FOR TESTING RAISING cx_static_check.
METHODS excel_string_to_time4 FOR TESTING RAISING cx_static_check.
METHODS excel_string_to_time5 FOR TESTING RAISING cx_static_check.
METHODS excel_string_to_time6 FOR TESTING RAISING cx_static_check.
METHODS time_to_excel_string1 FOR TESTING RAISING cx_static_check.
METHODS time_to_excel_string2 FOR TESTING RAISING cx_static_check.
METHODS time_to_excel_string3 FOR TESTING RAISING cx_static_check.
@ -688,6 +689,45 @@ CLASS lcl_excel_common_test IMPLEMENTATION.
level = if_aunit_constants=>fatal
).
ENDTRY.
* 45141.58832 (2023/08/03 14:07:11) ip_exact = abap_false -> 2023/08/04
TRY.
ep_value = zcl_excel_common=>excel_string_to_date( ip_value = '45141.58832'
ip_exact = abap_false ).
cl_abap_unit_assert=>assert_equals(
act = ep_value
exp = '20230804' ).
CATCH zcx_excel INTO lx_excel.
cl_abap_unit_assert=>fail(
msg = 'unexpected exception'
level = if_aunit_constants=>critical ).
ENDTRY.
* 45141.58832 (2023/08/03 14:07:11) ip_exact = abap_true -> 2023/08/03
TRY.
ep_value = zcl_excel_common=>excel_string_to_date( ip_value = '45141.58832'
ip_exact = abap_true ).
cl_abap_unit_assert=>assert_equals(
act = ep_value
exp = '20230803' ).
CATCH zcx_excel INTO lx_excel.
cl_abap_unit_assert=>fail(
msg = 'unexpected exception'
level = if_aunit_constants=>critical ).
ENDTRY.
* 45141.48832 (2023/08/03 11:43:11) ip_exact = abap_false -> 2023/08/03
TRY.
ep_value = zcl_excel_common=>excel_string_to_date( ip_value = '45141.48832'
ip_exact = abap_false ).
cl_abap_unit_assert=>assert_equals(
act = ep_value
exp = '20230803' ).
CATCH zcx_excel INTO lx_excel.
cl_abap_unit_assert=>fail(
msg = 'unexpected exception'
level = if_aunit_constants=>critical ).
ENDTRY.
ENDMETHOD. "excel_String_To_Date
@ -767,6 +807,21 @@ CLASS lcl_excel_common_test IMPLEMENTATION.
ENDTRY.
ENDMETHOD.
METHOD excel_string_to_time6.
DATA ep_value TYPE t.
* 45141.58832 (2023/08/03 14:07:11) -> 14:07:11
TRY.
ep_value = zcl_excel_common=>excel_string_to_time( ip_value = '45141.58832' ).
cl_abap_unit_assert=>assert_equals(
act = ep_value
exp = '140711' ).
CATCH zcx_excel INTO lx_excel.
cl_abap_unit_assert=>fail( lx_excel->get_text( ) ).
ENDTRY.
ENDMETHOD.
METHOD time_to_excel_string1.
DATA ep_value TYPE zexcel_cell_value.

35
src/zcl_excel_reader_2007.clas.abap
View File

@ -2190,6 +2190,7 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
ENDIF.
WHEN OTHERS.
lo_range = <worksheet>-worksheet->add_new_range( ).
ENDCASE.
ENDIF.
@ -2558,6 +2559,7 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
lv_max_col = lv_index.
ENDIF.
lv_cell_row = ls_row-r.
lv_cell_column = ''.
lo_row = io_worksheet->get_row( lv_cell_row ).
IF ls_row-customheight = '1'.
lo_row->set_row_height( ip_row_height = ls_row-ht ip_custom_height = abap_true ).
@ -2594,6 +2596,26 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
fill_struct_from_attributes( EXPORTING ip_element = lo_ixml_cell_elem CHANGING cp_structure = ls_cell ).
" Determine the column number
IF ls_cell-r IS NOT INITIAL.
" Note that the row should remain unchanged = the one defined by <row>
" i.e. in <row r="1"...><c r="A1" s="2"><v>..., ls_cell-r would be "A1",
" the "1" of A1 should always be equal to the "1" of <row r="1"...
zcl_excel_common=>convert_columnrow2column_a_row( EXPORTING
i_columnrow = ls_cell-r
IMPORTING
e_column = lv_cell_column
e_row = lv_cell_row ).
ELSE.
" The column is the column after the last cell previously initialized in the same row.
" NB: the row is unchanged = the one defined by <row> e.g. "1" in <row r="1"...><c r="" s="2"><v>...
IF lv_cell_column IS INITIAL.
lv_cell_column = 'A'.
ELSE.
lv_cell_column = zcl_excel_common=>convert_column2alpha( zcl_excel_common=>convert_column2int( lv_cell_column ) + 1 ).
ENDIF.
ENDIF.
lo_ixml_value_elem = lo_ixml_cell_elem->find_from_name_ns( name = 'v' uri = namespace-main ).
CASE ls_cell-t.
@ -2642,11 +2664,6 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
fill_struct_from_attributes( EXPORTING ip_element = lo_ixml_formula_elem CHANGING cp_structure = ls_formula_attributes ).
IF ls_formula_attributes-t = 'shared'.
zcl_excel_common=>convert_columnrow2column_a_row( EXPORTING
i_columnrow = ls_cell-r
IMPORTING
e_column = lv_cell_column
e_row = lv_cell_row ).
TRY.
CLEAR ls_ref_formula.
@ -2671,11 +2688,6 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
IF lv_cell_value IS NOT INITIAL
OR lv_cell_formula IS NOT INITIAL
OR lv_style_guid IS NOT INITIAL.
zcl_excel_common=>convert_columnrow2column_a_row( EXPORTING
i_columnrow = ls_cell-r
IMPORTING
e_column = lv_cell_column
e_row = lv_cell_row ).
io_worksheet->set_cell( ip_column = lv_cell_column " cell_elem Column
ip_row = lv_cell_row " cell_elem row_elem
ip_value = lv_cell_value " cell_elem Value
@ -2778,7 +2790,8 @@ CLASS zcl_excel_reader_2007 IMPLEMENTATION.
* issue #367 - hide columns from
IF ls_column-max = zcl_excel_common=>c_excel_sheet_max_col. " Max = very right column
IF ls_column-hidden = 1 " all hidden
IF ( ls_column-hidden = lc_xml_attr_true
OR ls_column-hidden = lc_xml_attr_true_int ) " all hidden
AND ls_column-min > 0.
io_worksheet->zif_excel_sheet_properties~hide_columns_from = zcl_excel_common=>convert_column2alpha( ls_column-min ).
ELSEIF ls_column-style > ''.

3
src/zcl_excel_style_number_format.clas.abap
View File

@ -25,7 +25,10 @@ CLASS zcl_excel_style_number_format DEFINITION
CONSTANTS c_format_currency_simple2 TYPE zexcel_number_format VALUE '$#,##0.00_);($#,##0.00)'. "#EC NOTEXT
CONSTANTS c_format_currency_simple_red2 TYPE zexcel_number_format VALUE '$#,##0.00_);[Red]($#,##0.00)'. "#EC NOTEXT
CONSTANTS c_format_date_datetime TYPE zexcel_number_format VALUE 'd/m/y h:mm'. "#EC NOTEXT
"! Deprecated. Do not use this one, its value is dd/mm/yy, instead use the constant *_ddmmyyyy_new
CONSTANTS c_format_date_ddmmyyyy TYPE zexcel_number_format VALUE 'dd/mm/yy'. "#EC NOTEXT
CONSTANTS c_format_date_ddmmyyyy_new TYPE zexcel_number_format VALUE 'dd/mm/yyyy'. "#EC NOTEXT
CONSTANTS c_format_date_ddmmyy TYPE zexcel_number_format VALUE 'dd/mm/yy'. "#EC NOTEXT
CONSTANTS c_format_date_ddmmyyyydot TYPE zexcel_number_format VALUE 'dd\.mm\.yyyy'. "#EC NOTEXT
CONSTANTS c_format_date_dmminus TYPE zexcel_number_format VALUE 'd-m'. "#EC NOTEXT
CONSTANTS c_format_date_dmyminus TYPE zexcel_number_format VALUE 'd-m-y'. "#EC NOTEXT

60
src/zcl_excel_worksheet.clas.abap
View File

@ -1083,6 +1083,10 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
lv_column_alpha = zcl_excel_common=>convert_column2alpha( lv_column_int ).
IF <ls_field_catalog>-width IS NOT INITIAL.
set_column_width( ip_column = lv_column_alpha ip_width_fix = <ls_field_catalog>-width ).
ENDIF.
" First of all write column header
IF <ls_field_catalog>-style_header IS NOT INITIAL.
me->set_cell( ip_column = lv_column_alpha
@ -2328,7 +2332,8 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
IF sy-subrc EQ 0.
CASE ls_style_conv-abap_type.
WHEN cl_abap_typedescr=>typekind_date.
<lv_data> = zcl_excel_common=>excel_string_to_date( <ls_sheet_content>-cell_value ).
<lv_data> = zcl_excel_common=>excel_string_to_date( ip_value = <ls_sheet_content>-cell_value
ip_exact = abap_true ).
WHEN cl_abap_typedescr=>typekind_time.
<lv_data> = zcl_excel_common=>excel_string_to_time( <ls_sheet_content>-cell_value ).
ENDCASE.
@ -4491,27 +4496,8 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
METHOD set_title.
*--------------------------------------------------------------------*
* ToDos:
* 2do §1 The current coding for replacing a named ranges name
* after renaming a sheet should be checked if it is
* really working if sheetname should be escaped
*--------------------------------------------------------------------*
*--------------------------------------------------------------------*
* issue #230 - Pimp my Code
* - Stefan Schmoecker, (wip ) 2012-12-08
* - ...
* changes: aligning code
* message made to support multilinguality
*--------------------------------------------------------------------*
* issue#243 - ' is not allowed as first character in sheet title
* - Stefan Schmoecker, 2012-12-02
* changes: added additional check for ' as first character
*--------------------------------------------------------------------*
DATA: lo_worksheets_iterator TYPE REF TO zcl_excel_collection_iterator,
lo_worksheet TYPE REF TO zcl_excel_worksheet,
errormessage TYPE string,
lv_rangesheetname_old TYPE string,
lv_rangesheetname_new TYPE string,
lo_ranges_iterator TYPE REF TO zcl_excel_collection_iterator,
@ -4541,14 +4527,14 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
* Check whether title is unique in workbook
*--------------------------------------------------------------------*
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( ).
CHECK me->guid <> lo_worksheet->get_guid( ). " Don't check against itself
IF ip_title = lo_worksheet->get_title( ). " Not unique --> raise exception
errormessage = 'Duplicate sheetname &'.
REPLACE '&' IN errormessage WITH ip_title.
zcx_excel=>raise_text( errormessage ).
lv_errormessage = 'Duplicate sheetname &'.
REPLACE '&' IN lv_errormessage WITH ip_title.
zcx_excel=>raise_text( lv_errormessage ).
ENDIF.
ENDWHILE.
@ -4556,21 +4542,17 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
*--------------------------------------------------------------------*
* 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.
*--------------------------------------------------------------------*
* After changing this worksheet's title we have to adjust
* all ranges that are referring to this worksheet.
*--------------------------------------------------------------------*
* 2do §1 - Check if the following quickfix is solid
* I fear it isn't - but this implementation is better then
* 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( ).
WHILE lo_ranges_iterator->has_next( ) = 'X'.
lo_ranges_iterator = me->excel->get_ranges_iterator( ). "workbookglobal ranges
WHILE lo_ranges_iterator->has_next( ) = abap_true.
lo_range ?= lo_ranges_iterator->get_next( ).
lv_range_value = lo_range->get_value( ).
@ -4581,6 +4563,20 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
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

179
src/zcl_excel_writer_2007.clas.abap
View File

@ -145,8 +145,10 @@ CLASS zcl_excel_writer_2007 DEFINITION
METHODS create_xl_sheet_rels
IMPORTING
!io_worksheet TYPE REF TO zcl_excel_worksheet
!iv_drawing_index TYPE i
!iv_comment_index TYPE i
!iv_drawing_index TYPE i OPTIONAL
!iv_comment_index TYPE i OPTIONAL
!iv_cmnt_vmlindex TYPE i OPTIONAL
!iv_hdft_vmlindex TYPE i OPTIONAL
RETURNING
VALUE(ep_content) TYPE xstring .
METHODS create_xl_styles
@ -267,6 +269,11 @@ CLASS zcl_excel_writer_2007 DEFINITION
!ip_flag TYPE flag
RETURNING
VALUE(ep_boolean) TYPE tv_charbool .
METHODS number2string
IMPORTING
!ip_number TYPE numeric
RETURNING
VALUE(ep_string) TYPE string.
ENDCLASS.
@ -323,10 +330,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_iterator TYPE REF TO zcl_excel_collection_iterator,
lo_nested_iterator TYPE REF TO zcl_excel_collection_iterator,
lo_table TYPE REF TO zcl_excel_table,
lo_drawing TYPE REF TO zcl_excel_drawing,
lo_drawings TYPE REF TO zcl_excel_drawings,
lo_comment TYPE REF TO zcl_excel_comment, " (+) Issue #180
lo_comments TYPE REF TO zcl_excel_comments. " (+) Issue #180
lo_drawing TYPE REF TO zcl_excel_drawing.
DATA: lv_content TYPE xstring,
lv_active TYPE flag,
@ -339,8 +343,13 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lv_index_str TYPE string,
lv_value TYPE string,
lv_sheet_index TYPE i,
lv_drawing_counter TYPE i,
lv_comment_counter TYPE i,
lv_vml_counter TYPE i,
lv_drawing_index TYPE i,
lv_comment_index TYPE i. " (+) Issue #180
lv_comment_index TYPE i, " (+) Issue #180
lv_cmnt_vmlindex TYPE i,
lv_hdft_vmlindex TYPE i.
**********************************************************************
@ -433,37 +442,44 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
* Begin - Add - Issue #180
* Add comments **********************************
lo_comments = lo_worksheet->get_comments( ).
IF lo_comments->is_empty( ) = abap_false.
lv_comment_index = lv_comment_index + 1.
IF lo_worksheet->get_comments( )->is_empty( ) = abap_false.
" Create comment itself
lv_content = me->create_xl_comments( lo_worksheet ).
lv_xl_comment = me->c_xl_comments.
ADD 1 TO lv_comment_counter.
lv_comment_index = lv_comment_counter.
lv_index_str = lv_comment_index.
CONDENSE lv_index_str NO-GAPS.
lv_content = me->create_xl_comments( lo_worksheet ).
lv_xl_comment = me->c_xl_comments.
REPLACE ALL OCCURRENCES OF '#' IN lv_xl_comment WITH lv_index_str.
lo_zip->add( name = lv_xl_comment
content = lv_content ).
" Create vmlDrawing that will host the comment
ADD 1 TO lv_vml_counter.
lv_cmnt_vmlindex = lv_vml_counter.
lv_index_str = lv_cmnt_vmlindex.
CONDENSE lv_index_str NO-GAPS.
lv_content = me->create_xl_drawing_for_comments( lo_worksheet ).
lv_xl_drawing_for_comment = me->cl_xl_drawing_for_comments.
REPLACE ALL OCCURRENCES OF '#' IN lv_xl_drawing_for_comment WITH lv_index_str.
lo_zip->add( name = lv_xl_drawing_for_comment
content = lv_content ).
ELSE.
CLEAR: lv_comment_index, lv_cmnt_vmlindex.
ENDIF.
* End - Add - Issue #180
* Add drawings **********************************
lo_drawings = lo_worksheet->get_drawings( ).
IF lo_drawings->is_empty( ) = abap_false.
lv_drawing_index = lv_drawing_index + 1.
IF lo_worksheet->get_drawings( )->is_empty( ) = abap_false.
ADD 1 TO lv_drawing_counter.
lv_drawing_index = lv_drawing_counter.
lv_index_str = lv_drawing_index.
CONDENSE lv_index_str NO-GAPS.
lv_content = me->create_xl_drawings( lo_worksheet ).
lv_xl_drawing = me->c_xl_drawings.
lv_index_str = lv_drawing_index.
CONDENSE lv_index_str NO-GAPS.
REPLACE ALL OCCURRENCES OF '#' IN lv_xl_drawing WITH lv_index_str.
lo_zip->add( name = lv_xl_drawing
content = lv_content ).
@ -473,15 +489,15 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
REPLACE ALL OCCURRENCES OF '#' IN lv_xl_drawing_rels WITH lv_index_str.
lo_zip->add( name = lv_xl_drawing_rels
content = lv_content ).
ELSE.
CLEAR lv_drawing_index.
ENDIF.
* Add Header/Footer image
DATA: lt_drawings TYPE zexcel_t_drawings.
lt_drawings = lo_worksheet->get_header_footer_drawings( ).
IF lines( lt_drawings ) > 0. "Header or footer image exist
lv_comment_index = lv_comment_index + 1.
lv_index_str = lv_comment_index.
IF lines( lo_worksheet->get_header_footer_drawings( ) ) > 0. "Header or footer image exist
ADD 1 TO lv_vml_counter.
lv_hdft_vmlindex = lv_vml_counter.
lv_index_str = lv_hdft_vmlindex.
CONDENSE lv_index_str NO-GAPS.
" Create vmlDrawing that will host the image
@ -497,13 +513,17 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
REPLACE ALL OCCURRENCES OF '#' IN lv_xl_drawing_rels WITH lv_index_str.
lo_zip->add( name = lv_xl_drawing_rels
content = lv_content ).
ELSE.
CLEAR lv_hdft_vmlindex.
ENDIF.
lv_xl_sheet_rels = me->c_xl_sheet_rels.
lv_content = me->create_xl_sheet_rels( io_worksheet = lo_worksheet
iv_drawing_index = lv_drawing_index
iv_comment_index = lv_comment_index ). " (+) Issue #180
iv_comment_index = lv_comment_index " (+) Issue #180
iv_cmnt_vmlindex = lv_cmnt_vmlindex
iv_hdft_vmlindex = lv_hdft_vmlindex ).
lv_index_str = lv_sheet_index.
CONDENSE lv_index_str NO-GAPS.
@ -3160,6 +3180,15 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lv_int_value TYPE i,
lv_int_value_string TYPE string.
DATA: lv_rel_id TYPE i.
DATA lv_anchor TYPE string.
DATA lv_bottom_row TYPE i.
DATA lv_right_column TYPE i.
DATA lv_bottom_row_str TYPE string.
DATA lv_right_column_str TYPE string.
DATA lv_top_row TYPE i.
DATA lv_left_column TYPE i.
DATA lv_top_row_str TYPE string.
DATA lv_left_column_str TYPE string.
**********************************************************************
@ -3282,7 +3311,23 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_element_clientdata->append_child( new_child = lo_element_sizewithcells ).
lo_element_anchor = lo_document->create_simple_element( name = lc_xml_node_anchor
parent = lo_document ).
lo_element_anchor->set_value( '2, 15, 11, 10, 4, 31, 15, 9' ).
" Anchor represents 4 pairs of numbers:
" ( left column, left offset ), ( top row, top offset ),
" ( right column, right offset ), ( bottom row, botton offset )
" Offsets are a number of pixels.
" Reference: Anchor Class at
" https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.vml.spreadsheet.anchor?view=openxml-3.0.1
lv_anchor = number2string( lo_comment->get_left_column( ) )
&& `, ` && number2string( lo_comment->get_left_offset( ) )
&& `, ` && number2string( lo_comment->get_top_row( ) )
&& `, ` && number2string( lo_comment->get_top_offset( ) )
&& `, ` && number2string( lo_comment->get_right_column( ) )
&& `, ` && number2string( lo_comment->get_right_offset( ) )
&& `, ` && number2string( lo_comment->get_bottom_row( ) )
&& `, ` && number2string( lo_comment->get_bottom_offset( ) ).
lo_element_anchor->set_value( lv_anchor ).
lo_element_clientdata->append_child( new_child = lo_element_anchor ).
lo_element_autofill = lo_document->create_simple_element( name = lc_xml_node_autofill
parent = lo_document ).
@ -3990,8 +4035,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
DATA: lv_value TYPE string,
lv_relation_id TYPE i,
lv_index_str TYPE string,
lv_comment_index TYPE i.
lv_index_str TYPE string.
**********************************************************************
* STEP 1: Create [Content_Types].xml into the root of the ZIP
@ -4035,10 +4079,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
ENDWHILE.
* drawing
DATA: lo_drawings TYPE REF TO zcl_excel_drawings.
lo_drawings = io_worksheet->get_drawings( ).
IF lo_drawings->is_empty( ) = abap_false.
IF iv_drawing_index > 0.
lo_element = lo_document->create_simple_element( name = lc_xml_node_relationship
parent = lo_document ).
ADD 1 TO lv_relation_id.
@ -4062,18 +4103,11 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
ENDIF.
* Begin - Add - Issue #180
DATA: lo_comments TYPE REF TO zcl_excel_comments.
lv_comment_index = iv_comment_index.
lo_comments = io_worksheet->get_comments( ).
IF lo_comments->is_empty( ) = abap_false.
IF iv_cmnt_vmlindex > 0 AND iv_comment_index > 0.
" Drawing for comment
lo_element = lo_document->create_simple_element( name = lc_xml_node_relationship
parent = lo_document ).
ADD 1 TO lv_relation_id.
ADD 1 TO lv_comment_index.
lv_value = lv_relation_id.
CONDENSE lv_value.
@ -4083,7 +4117,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_element->set_attribute_ns( name = lc_xml_attr_type
value = lc_xml_node_rid_drawing_cmt_tp ).
lv_index_str = iv_comment_index.
lv_index_str = iv_cmnt_vmlindex.
CONDENSE lv_index_str NO-GAPS.
lv_value = me->cl_xl_drawing_for_comments.
REPLACE 'xl' WITH '..' INTO lv_value.
@ -4118,13 +4152,12 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
**********************************************************************
* header footer image
DATA: lt_drawings TYPE zexcel_t_drawings.
lt_drawings = io_worksheet->get_header_footer_drawings( ).
IF lines( lt_drawings ) > 0. "Header or footer image exist
ADD 1 TO lv_relation_id.
IF iv_hdft_vmlindex > 0. "Header or footer image exist
" Drawing for comment/header/footer
lo_element = lo_document->create_simple_element( name = lc_xml_node_relationship
parent = lo_document ).
ADD 1 TO lv_relation_id.
lv_value = lv_relation_id.
CONDENSE lv_value.
CONCATENATE 'rId' lv_value INTO lv_value.
@ -4133,7 +4166,7 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_element->set_attribute_ns( name = lc_xml_attr_type
value = lc_xml_node_rid_drawing_cmt_tp ).
lv_index_str = lv_comment_index.
lv_index_str = iv_hdft_vmlindex.
CONDENSE lv_index_str NO-GAPS.
lv_value = me->cl_xl_drawing_for_comments.
REPLACE 'xl' WITH '..' INTO lv_value.
@ -4200,10 +4233,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
DATA: col_count TYPE int4,
lo_autofilters TYPE REF TO zcl_excel_autofilters,
lo_autofilter TYPE REF TO zcl_excel_autofilter,
l_autofilter_hidden TYPE flag,
lt_values TYPE zexcel_t_autofilter_values,
ls_values TYPE zexcel_s_autofilter_values,
ls_area TYPE zexcel_s_autofilter_area,
lo_iterator TYPE REF TO zcl_excel_collection_iterator,
lo_table TYPE REF TO zcl_excel_table,
@ -4249,9 +4278,8 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_autofilters = excel->get_autofilters_reference( ).
lo_autofilter = lo_autofilters->get( io_worksheet = io_worksheet ) .
IF lo_autofilter IS BOUND.
lt_values = lo_autofilter->get_values( ) .
ls_area = lo_autofilter->get_filter_area( ) .
l_autofilter_hidden = abap_true. " First defautl is not showing
* Area not used here, but makes the validation for lo_autofilter->is_row_hidden
lo_autofilter->get_filter_area( ) .
ENDIF.
*--------------------------------------------------------------------*
*issue #220 - If cell in tables-area don't use default from row or column or sheet - Coding 1 - start
@ -4314,14 +4342,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
CLEAR ls_sheet_content.
LOOP AT io_worksheet->sheet_content INTO ls_sheet_content.
IF lt_values IS INITIAL. " no values attached to autofilter " issue #368 autofilter filtering too much
CLEAR l_autofilter_hidden.
ELSE.
READ TABLE lt_values INTO ls_values WITH KEY column = ls_last_row-cell_column.
IF sy-subrc = 0 AND ls_values-value = ls_last_row-cell_value.
CLEAR l_autofilter_hidden.
ENDIF.
ENDIF.
CLEAR ls_style_mapping.
*Create row element
*issues #346,#154, #195 - problems when we have information in row_dimension but no cell content in that row
@ -4352,18 +4372,11 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
ENDIF.
IF ls_last_row-cell_row NE <ls_sheet_content>-cell_row.
IF lo_autofilter IS BOUND.
IF ls_area-row_start >= ls_last_row-cell_row OR " One less for header
ls_area-row_end < ls_last_row-cell_row .
CLEAR l_autofilter_hidden.
ENDIF.
ELSE.
CLEAR l_autofilter_hidden.
ENDIF.
IF ls_last_row-cell_row IS NOT INITIAL.
" Row visibility of previos row.
IF lo_row->get_visible( io_worksheet ) = abap_false OR
l_autofilter_hidden = abap_true.
( lo_autofilter IS BOUND AND
lo_autofilter->is_row_hidden( ls_last_row-cell_row ) = abap_true ).
lo_element_2->set_attribute_ns( name = 'hidden' value = 'true' ).
ENDIF.
rv_ixml_sheet_data_root->append_child( new_child = lo_element_2 ). " row node
@ -4411,11 +4424,6 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_element_2->set_attribute_ns( name = 's' value = lv_value ).
lo_element_2->set_attribute_ns( name = 'customFormat' value = '1' ).
ENDIF.
IF lt_values IS INITIAL. " no values attached to autofilter " issue #368 autofilter filtering too much
CLEAR l_autofilter_hidden.
ELSE.
l_autofilter_hidden = abap_true. " First default is not showing
ENDIF.
ELSE.
ENDIF.
@ -4528,21 +4536,10 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
ls_last_row = <ls_sheet_content>.
ENDLOOP.
IF sy-subrc = 0.
READ TABLE lt_values INTO ls_values WITH KEY column = ls_last_row-cell_column.
IF sy-subrc = 0 AND ls_values-value = ls_last_row-cell_value.
CLEAR l_autofilter_hidden.
ENDIF.
IF lo_autofilter IS BOUND.
IF ls_area-row_start >= ls_last_row-cell_row OR " One less for header
ls_area-row_end < ls_last_row-cell_row .
CLEAR l_autofilter_hidden.
ENDIF.
ELSE.
CLEAR l_autofilter_hidden.
ENDIF.
" Row visibility of previos row.
IF lo_row->get_visible( ) = abap_false OR
l_autofilter_hidden = abap_true.
( lo_autofilter IS BOUND AND
lo_autofilter->is_row_hidden( ls_last_row-cell_row ) = abap_true ).
lo_element_2->set_attribute_ns( name = 'hidden' value = 'true' ).
ENDIF.
rv_ixml_sheet_data_root->append_child( new_child = lo_element_2 ). " row node
@ -6196,6 +6193,12 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
ENDMETHOD.
METHOD number2string.
ep_string = ip_number.
CONDENSE ep_string.
ENDMETHOD.
METHOD render_xml_document.
DATA lo_streamfactory TYPE REF TO if_ixml_stream_factory.
DATA lo_ostream TYPE REF TO if_ixml_ostream.

3
src/zcl_excel_writer_2007.clas.locals_imp.abap
View File

@ -1730,7 +1730,7 @@ CLASS lcl_create_xl_sheet IMPLEMENTATION.
value = lv_value ).
o_element_root->append_child( new_child = lo_element ).
ADD 1 TO v_relation_id. " +1 for comments (not referenced in XL sheet but let's reserve the rId)
ADD 1 TO v_relation_id. "for xl/comments.xml (not referenced in XL sheet but counted in sheet rels)
ENDIF.
* End - Add - Issue #180
ENDMETHOD.
@ -1753,7 +1753,6 @@ CLASS lcl_create_xl_sheet IMPLEMENTATION.
lo_element->set_attribute( name = 'r:id'
value = lv_value ).
o_element_root->append_child( new_child = lo_element ).
ADD 1 TO v_relation_id. " +1 for comments (not referenced in XL sheet but let's reserve the rId)
ENDIF.
*
ENDMETHOD.

6
src/zexcel_s_fieldcatalog.tabl.xml
View File

@ -123,6 +123,12 @@
<ADMINFIELD>0</ADMINFIELD>
<COMPTYPE>E</COMPTYPE>
</DD03P>
<DD03P>
<FIELDNAME>WIDTH</FIELDNAME>
<ROLLNAME>INT4</ROLLNAME>
<ADMINFIELD>0</ADMINFIELD>
<COMPTYPE>E</COMPTYPE>
</DD03P>
</DD03P_TABLE>
<I18N_LANGS>
<LANGU>1</LANGU>