mirror of
https://github.com/abap2xlsx/abap2xlsx.git
synced 2025-05-05 13:46:17 +08:00
Merge branch 'main' into hvam/font2907
This commit is contained in:
Lars Hvam
GitHub
commit
851b67b4bb
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -4505,27 +4505,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,
|
||||
|
|
@ -4555,14 +4536,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.
|
||||
|
|
@ -4570,21 +4551,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( ).
|
||||
|
|
@ -4595,6 +4572,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
|
||||
|
||||
|
|
|
|||
|
|
@ -4233,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,
|
||||
|
|
@ -4282,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
|
||||
|
|
@ -4347,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
|
||||
|
|
@ -4385,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
|
||||
|
|
@ -4444,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.
|
||||
|
|
@ -4561,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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user