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

Merge branch 'main' into fix-issue-1014-part1

Browse Source
This commit is contained in:
Domi Bigl 2024-09-12 11:39:54 +02:00 committed by GitHub
commit 97d46f6686
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/not_cloud/zcl_excel_converter.clas.abap
View File

@ -1697,7 +1697,8 @@ CLASS zcl_excel_converter IMPLEMENTATION.
* Let's check for filter.
IF wo_autofilter IS BOUND.
ls_area-row_start = 1.
ls_area-row_start = w_row_int.
ls_area-col_start = w_col_int. "if lt_values is empty
lt_values = wo_autofilter->get_values( ) .
SORT lt_values BY column ASCENDING.
DESCRIBE TABLE lt_values LINES l_lines.

10
src/zcl_excel_autofilter.clas.abap
View File

@ -404,11 +404,6 @@ CLASS zcl_excel_autofilter IMPLEMENTATION.
filter_area-col_end = l_col .
ENDIF.
IF filter_area-row_start > filter_area-row_end.
ls_original_filter_area = filter_area.
filter_area-row_start = ls_original_filter_area-row_end.
filter_area-row_end = ls_original_filter_area-row_start.
ENDIF.
IF filter_area-row_start < 1.
filter_area-row_start = 1.
ENDIF.
@ -423,6 +418,11 @@ CLASS zcl_excel_autofilter IMPLEMENTATION.
filter_area-col_end < 1.
filter_area-col_end = l_col.
ENDIF.
IF filter_area-row_start > filter_area-row_end.
ls_original_filter_area = filter_area.
filter_area-row_start = ls_original_filter_area-row_end.
filter_area-row_end = ls_original_filter_area-row_start.
ENDIF.
IF filter_area-col_start > filter_area-col_end.
filter_area-col_start = filter_area-col_end.
ENDIF.

43
src/zcl_excel_writer_2007.clas.abap
View File

@ -3205,9 +3205,9 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
* STEP 2: Create main node relationships
lo_element_root = lo_document->create_simple_element( name = lc_xml_node_xml
parent = lo_document ).
lo_element_root->set_attribute_ns( : name = 'xmlns:v' value = lc_xml_node_ns_v ),
name = 'xmlns:o' value = lc_xml_node_ns_o ),
name = 'xmlns:x' value = lc_xml_node_ns_x ).
lo_element_root->set_attribute_ns( name = 'xmlns:v' value = lc_xml_node_ns_v ).
lo_element_root->set_attribute_ns( name = 'xmlns:o' value = lc_xml_node_ns_o ).
lo_element_root->set_attribute_ns( name = 'xmlns:x' value = lc_xml_node_ns_x ).
**********************************************************************
* STEP 3: Create o:shapeLayout
@ -3220,8 +3220,8 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_element_idmap = lo_document->create_simple_element( name = lc_xml_node_idmap
parent = lo_document ).
lo_element_idmap->set_attribute_ns( : name = lc_xml_attr_vext value = lc_xml_attr_val_edit ),
name = lc_xml_attr_data value = '1' ).
lo_element_idmap->set_attribute_ns( name = lc_xml_attr_vext value = lc_xml_attr_val_edit ).
lo_element_idmap->set_attribute_ns( name = lc_xml_attr_data value = '1' ).
lo_element_shapelayout->append_child( new_child = lo_element_idmap ).
@ -3233,10 +3233,10 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_element_shapetype = lo_document->create_simple_element( name = lc_xml_node_shapetype
parent = lo_document ).
lo_element_shapetype->set_attribute_ns( : name = lc_xml_attr_id value = '_x0000_t202' ),
name = lc_xml_attr_coordsize value = '21600,21600' ),
name = lc_xml_attr_ospt value = '202' ),
name = lc_xml_attr_path value = 'm,l,21600r21600,l21600,xe' ).
lo_element_shapetype->set_attribute_ns( name = lc_xml_attr_id value = '_x0000_t202' ).
lo_element_shapetype->set_attribute_ns( name = lc_xml_attr_coordsize value = '21600,21600' ).
lo_element_shapetype->set_attribute_ns( name = lc_xml_attr_ospt value = '202' ).
lo_element_shapetype->set_attribute_ns( name = lc_xml_attr_path value = 'm,l,21600r21600,l21600,xe' ).
lo_element_stroke = lo_document->create_simple_element( name = lc_xml_node_stroke
parent = lo_document ).
@ -3244,11 +3244,11 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lo_element_path = lo_document->create_simple_element( name = lc_xml_node_path
parent = lo_document ).
lo_element_path->set_attribute_ns( : name = lc_xml_attr_gradientshapeok value = lc_xml_attr_val_t ),
name = lc_xml_attr_oconnecttype value = lc_xml_attr_val_rect ).
lo_element_path->set_attribute_ns( name = lc_xml_attr_gradientshapeok value = lc_xml_attr_val_t ).
lo_element_path->set_attribute_ns( name = lc_xml_attr_oconnecttype value = lc_xml_attr_val_rect ).
lo_element_shapetype->append_child( : new_child = lo_element_stroke ),
new_child = lo_element_path ).
lo_element_shapetype->append_child( new_child = lo_element_stroke ).
lo_element_shapetype->append_child( new_child = lo_element_path ).
lo_element_root->append_child( new_child = lo_element_shapetype ).
@ -3273,11 +3273,11 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
lv_attr_id_index = 1024 + lv_index.
lv_attr_id = lv_attr_id_index.
CONCATENATE '_x0000_s' lv_attr_id INTO lv_attr_id.
lo_element_shape->set_attribute_ns( : name = lc_xml_attr_id value = lv_attr_id ),
name = lc_xml_attr_type value = '#_x0000_t202' ),
name = lc_xml_attr_style value = 'size:auto;width:auto;height:auto;position:absolute;margin-left:117pt;margin-top:172.5pt;z-index:1;visibility:hidden' ),
name = lc_xml_attr_fillcolor value = '#ffffe1' ),
name = lc_xml_attr_oinsetmode value = lc_xml_attr_val_auto ).
lo_element_shape->set_attribute_ns( name = lc_xml_attr_id value = lv_attr_id ).
lo_element_shape->set_attribute_ns( name = lc_xml_attr_type value = '#_x0000_t202' ).
lo_element_shape->set_attribute_ns( name = lc_xml_attr_style value = 'size:auto;width:auto;height:auto;position:absolute;margin-left:117pt;margin-top:172.5pt;z-index:1;visibility:hidden' ).
lo_element_shape->set_attribute_ns( name = lc_xml_attr_fillcolor value = '#ffffe1' ).
lo_element_shape->set_attribute_ns( name = lc_xml_attr_oinsetmode value = lc_xml_attr_val_auto ).
" Fill
lo_element_fill = lo_document->create_simple_element( name = lc_xml_node_fill
@ -3287,9 +3287,9 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
" Shadow
lo_element_shadow = lo_document->create_simple_element( name = lc_xml_node_shadow
parent = lo_document ).
lo_element_shadow->set_attribute_ns( : name = lc_xml_attr_on value = lc_xml_attr_val_t ),
name = lc_xml_attr_color value = lc_xml_attr_val_black ),
name = lc_xml_attr_obscured value = lc_xml_attr_val_t ).
lo_element_shadow->set_attribute_ns( name = lc_xml_attr_on value = lc_xml_attr_val_t ).
lo_element_shadow->set_attribute_ns( name = lc_xml_attr_color value = lc_xml_attr_val_black ).
lo_element_shadow->set_attribute_ns( name = lc_xml_attr_obscured value = lc_xml_attr_val_t ).
lo_element_shape->append_child( new_child = lo_element_shadow ).
" Path
lo_element_path = lo_document->create_simple_element( name = lc_xml_node_path
@ -6572,4 +6572,3 @@ CLASS zcl_excel_writer_2007 IMPLEMENTATION.
ep_file = me->create( ).
ENDMETHOD.
ENDCLASS.