diff --git a/src/zcl_excel.clas.xml b/src/zcl_excel.clas.xml
index a4c5fdf..3a46c05 100644
--- a/src/zcl_excel.clas.xml
+++ b/src/zcl_excel.clas.xml
@@ -7,6 +7,7 @@
1
E
Excel creator
+ 2
1
X
X
diff --git a/src/zcl_excel_autofilter.clas.xml b/src/zcl_excel_autofilter.clas.xml
index f447843..f280882 100644
--- a/src/zcl_excel_autofilter.clas.xml
+++ b/src/zcl_excel_autofilter.clas.xml
@@ -7,7 +7,9 @@
1
E
Autofilter
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_autofilters.clas.xml b/src/zcl_excel_autofilters.clas.xml
index bc1d403..de46362 100644
--- a/src/zcl_excel_autofilters.clas.xml
+++ b/src/zcl_excel_autofilters.clas.xml
@@ -7,7 +7,9 @@
1
E
Autofilters collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_column.clas.xml b/src/zcl_excel_column.clas.xml
index 206e7ce..225e86d 100644
--- a/src/zcl_excel_column.clas.xml
+++ b/src/zcl_excel_column.clas.xml
@@ -7,7 +7,9 @@
1
E
Worksheet Column
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_columns.clas.xml b/src/zcl_excel_columns.clas.xml
index 52b2ead..82c3200 100644
--- a/src/zcl_excel_columns.clas.xml
+++ b/src/zcl_excel_columns.clas.xml
@@ -7,7 +7,9 @@
1
E
Ranges collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_comment.clas.xml b/src/zcl_excel_comment.clas.xml
index e0a1672..98909db 100644
--- a/src/zcl_excel_comment.clas.xml
+++ b/src/zcl_excel_comment.clas.xml
@@ -7,7 +7,9 @@
1
E
Comment
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_comments.clas.xml b/src/zcl_excel_comments.clas.xml
index dd47e6b..9017686 100644
--- a/src/zcl_excel_comments.clas.xml
+++ b/src/zcl_excel_comments.clas.xml
@@ -7,7 +7,9 @@
1
E
Comments collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_common.clas.xml b/src/zcl_excel_common.clas.xml
index d8d6820..444714b 100644
--- a/src/zcl_excel_common.clas.xml
+++ b/src/zcl_excel_common.clas.xml
@@ -7,7 +7,9 @@
1
E
Static common methods
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_converter.clas.xml b/src/zcl_excel_converter.clas.xml
index b1cf5b5..c435a86 100644
--- a/src/zcl_excel_converter.clas.xml
+++ b/src/zcl_excel_converter.clas.xml
@@ -7,6 +7,7 @@
1
E
Salv converter
+ 2
1
X
X
diff --git a/src/zcl_excel_converter_alv.clas.xml b/src/zcl_excel_converter_alv.clas.xml
index add42ae..f32b209 100644
--- a/src/zcl_excel_converter_alv.clas.xml
+++ b/src/zcl_excel_converter_alv.clas.xml
@@ -7,7 +7,9 @@
1
E
ALV grid interface implementation
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_converter_alv_grid.clas.xml b/src/zcl_excel_converter_alv_grid.clas.xml
index 2504655..3af9d25 100644
--- a/src/zcl_excel_converter_alv_grid.clas.xml
+++ b/src/zcl_excel_converter_alv_grid.clas.xml
@@ -7,7 +7,9 @@
1
E
SALV converter
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_converter_result.clas.xml b/src/zcl_excel_converter_result.clas.xml
index 8fdb423..becd83a 100644
--- a/src/zcl_excel_converter_result.clas.xml
+++ b/src/zcl_excel_converter_result.clas.xml
@@ -7,7 +7,9 @@
1
E
Result object for table reference
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_converter_result_ex.clas.xml b/src/zcl_excel_converter_result_ex.clas.xml
index aa3da0c..645d076 100644
--- a/src/zcl_excel_converter_result_ex.clas.xml
+++ b/src/zcl_excel_converter_result_ex.clas.xml
@@ -7,7 +7,9 @@
1
E
SALV - ALV converter for export
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_converter_result_wd.clas.xml b/src/zcl_excel_converter_result_wd.clas.xml
index 9716bfe..fba02ca 100644
--- a/src/zcl_excel_converter_result_wd.clas.xml
+++ b/src/zcl_excel_converter_result_wd.clas.xml
@@ -7,7 +7,9 @@
1
E
SALV converter for web dynpro
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_converter_salv_table.clas.xml b/src/zcl_excel_converter_salv_table.clas.xml
index f1c5323..2b1548f 100644
--- a/src/zcl_excel_converter_salv_table.clas.xml
+++ b/src/zcl_excel_converter_salv_table.clas.xml
@@ -7,7 +7,9 @@
1
E
SALV converter
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_customui.clas.xml b/src/zcl_excel_customui.clas.xml
index 71ce999..16c7c77 100644
--- a/src/zcl_excel_customui.clas.xml
+++ b/src/zcl_excel_customui.clas.xml
@@ -7,7 +7,9 @@
1
E
Excel customUI
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_customui_button.clas.xml b/src/zcl_excel_customui_button.clas.xml
index fcf7fc3..74d7582 100644
--- a/src/zcl_excel_customui_button.clas.xml
+++ b/src/zcl_excel_customui_button.clas.xml
@@ -7,7 +7,9 @@
1
E
Excel customUI Button
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_data_validation.clas.xml b/src/zcl_excel_data_validation.clas.xml
index 02ec2dd..0d0f811 100644
--- a/src/zcl_excel_data_validation.clas.xml
+++ b/src/zcl_excel_data_validation.clas.xml
@@ -7,7 +7,9 @@
1
E
Data validation
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_data_validations.clas.xml b/src/zcl_excel_data_validations.clas.xml
index d86fe62..06762cc 100644
--- a/src/zcl_excel_data_validations.clas.xml
+++ b/src/zcl_excel_data_validations.clas.xml
@@ -7,7 +7,9 @@
1
E
Data validations collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_drawing.clas.xml b/src/zcl_excel_drawing.clas.xml
index 5914cdd..7b8438e 100644
--- a/src/zcl_excel_drawing.clas.xml
+++ b/src/zcl_excel_drawing.clas.xml
@@ -7,7 +7,9 @@
1
E
Drawing
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_drawings.clas.xml b/src/zcl_excel_drawings.clas.xml
index f38cd99..da1019a 100644
--- a/src/zcl_excel_drawings.clas.xml
+++ b/src/zcl_excel_drawings.clas.xml
@@ -7,7 +7,9 @@
1
E
Drawings collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_graph.clas.xml b/src/zcl_excel_graph.clas.xml
index 6b326e1..c319223 100644
--- a/src/zcl_excel_graph.clas.xml
+++ b/src/zcl_excel_graph.clas.xml
@@ -7,6 +7,7 @@
1
E
Graphic
+ 2
1
X
X
diff --git a/src/zcl_excel_graph_bars.clas.xml b/src/zcl_excel_graph_bars.clas.xml
index e8a80b9..86b0ab4 100644
--- a/src/zcl_excel_graph_bars.clas.xml
+++ b/src/zcl_excel_graph_bars.clas.xml
@@ -7,7 +7,9 @@
1
E
Bars Graphic
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_graph_line.clas.xml b/src/zcl_excel_graph_line.clas.xml
index 0b15e84..dfcd7d9 100644
--- a/src/zcl_excel_graph_line.clas.xml
+++ b/src/zcl_excel_graph_line.clas.xml
@@ -7,7 +7,9 @@
1
E
Bars Graphic
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_graph_pie.clas.xml b/src/zcl_excel_graph_pie.clas.xml
index cd64117..d15d5af 100644
--- a/src/zcl_excel_graph_pie.clas.xml
+++ b/src/zcl_excel_graph_pie.clas.xml
@@ -7,7 +7,9 @@
1
E
Pie Graphic
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_hyperlink.clas.xml b/src/zcl_excel_hyperlink.clas.xml
index 5081d2c..01bf6b7 100644
--- a/src/zcl_excel_hyperlink.clas.xml
+++ b/src/zcl_excel_hyperlink.clas.xml
@@ -8,6 +8,7 @@
E
Hyperlink
1
+ X
X
X
X
diff --git a/src/zcl_excel_legacy_palette.clas.xml b/src/zcl_excel_legacy_palette.clas.xml
index 4d819c7..0974342 100644
--- a/src/zcl_excel_legacy_palette.clas.xml
+++ b/src/zcl_excel_legacy_palette.clas.xml
@@ -7,6 +7,7 @@
1
E
Excel legacy color palette
+ 2
1
X
X
diff --git a/src/zcl_excel_obsolete_func_wrap.clas.xml b/src/zcl_excel_obsolete_func_wrap.clas.xml
index f12cc16..affd049 100644
--- a/src/zcl_excel_obsolete_func_wrap.clas.xml
+++ b/src/zcl_excel_obsolete_func_wrap.clas.xml
@@ -7,6 +7,7 @@
1
E
Wrap obsolete functioncalls
+ 2
1
X
X
diff --git a/src/zcl_excel_properties.clas.xml b/src/zcl_excel_properties.clas.xml
index 60f5e16..afcb716 100644
--- a/src/zcl_excel_properties.clas.xml
+++ b/src/zcl_excel_properties.clas.xml
@@ -7,7 +7,9 @@
1
E
Document properties
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_range.clas.xml b/src/zcl_excel_range.clas.xml
index 8243f47..48fb336 100644
--- a/src/zcl_excel_range.clas.xml
+++ b/src/zcl_excel_range.clas.xml
@@ -7,7 +7,9 @@
1
E
Excel range
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_ranges.clas.xml b/src/zcl_excel_ranges.clas.xml
index 1fd72bb..1ed0e1e 100644
--- a/src/zcl_excel_ranges.clas.xml
+++ b/src/zcl_excel_ranges.clas.xml
@@ -7,7 +7,9 @@
1
E
Ranges collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_reader_2007.clas.xml b/src/zcl_excel_reader_2007.clas.xml
index 25dfef6..320bc9b 100644
--- a/src/zcl_excel_reader_2007.clas.xml
+++ b/src/zcl_excel_reader_2007.clas.xml
@@ -7,6 +7,7 @@
1
E
Read Excel 2007 into ZCL_EXCEL
+ 2
1
X
X
diff --git a/src/zcl_excel_reader_huge_file.clas.xml b/src/zcl_excel_reader_huge_file.clas.xml
index 84e3e6c..e57f804 100644
--- a/src/zcl_excel_reader_huge_file.clas.xml
+++ b/src/zcl_excel_reader_huge_file.clas.xml
@@ -7,6 +7,7 @@
1
E
Can read large .xlsx files
+ 2
1
X
X
diff --git a/src/zcl_excel_reader_xlsm.clas.xml b/src/zcl_excel_reader_xlsm.clas.xml
index 97b21af..02f3853 100644
--- a/src/zcl_excel_reader_xlsm.clas.xml
+++ b/src/zcl_excel_reader_xlsm.clas.xml
@@ -7,7 +7,9 @@
1
E
Excel with macro reader
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_row.clas.xml b/src/zcl_excel_row.clas.xml
index 357ebd0..24474c8 100644
--- a/src/zcl_excel_row.clas.xml
+++ b/src/zcl_excel_row.clas.xml
@@ -7,7 +7,9 @@
1
E
Worksheet RowDimension
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_rows.clas.xml b/src/zcl_excel_rows.clas.xml
index fc0dae5..cfee3ba 100644
--- a/src/zcl_excel_rows.clas.xml
+++ b/src/zcl_excel_rows.clas.xml
@@ -7,7 +7,9 @@
1
E
Ranges collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_security.clas.xml b/src/zcl_excel_security.clas.xml
index 664d6ea..6c1cc5a 100644
--- a/src/zcl_excel_security.clas.xml
+++ b/src/zcl_excel_security.clas.xml
@@ -7,7 +7,9 @@
1
E
Security
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_sheet_setup.clas.xml b/src/zcl_excel_sheet_setup.clas.xml
index cfffde6..35d2bec 100644
--- a/src/zcl_excel_sheet_setup.clas.xml
+++ b/src/zcl_excel_sheet_setup.clas.xml
@@ -7,7 +7,9 @@
1
E
Sheet setup
+ 2
1
+ X
X
X
X
@@ -1247,7 +1249,7 @@
ZCL_EXCEL_SHEET_SETUP
MARGIN_TOP
I
- Margin top in inches
+ Margin top in inches
ZCL_EXCEL_SHEET_SETUP
diff --git a/src/zcl_excel_style.clas.xml b/src/zcl_excel_style.clas.xml
index dc83f7b..e5e81b2 100644
--- a/src/zcl_excel_style.clas.xml
+++ b/src/zcl_excel_style.clas.xml
@@ -7,7 +7,9 @@
1
E
Style
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_alignment.clas.xml b/src/zcl_excel_style_alignment.clas.xml
index b392623..618076f 100644
--- a/src/zcl_excel_style_alignment.clas.xml
+++ b/src/zcl_excel_style_alignment.clas.xml
@@ -7,7 +7,9 @@
1
E
Alignment Style
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_border.clas.xml b/src/zcl_excel_style_border.clas.xml
index fbcc667..e92bd5d 100644
--- a/src/zcl_excel_style_border.clas.xml
+++ b/src/zcl_excel_style_border.clas.xml
@@ -7,7 +7,9 @@
1
E
Border
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_borders.clas.xml b/src/zcl_excel_style_borders.clas.xml
index 96d2301..b1210e0 100644
--- a/src/zcl_excel_style_borders.clas.xml
+++ b/src/zcl_excel_style_borders.clas.xml
@@ -7,7 +7,9 @@
1
E
Border Style
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_color.clas.xml b/src/zcl_excel_style_color.clas.xml
index 74caf29..4955cf3 100644
--- a/src/zcl_excel_style_color.clas.xml
+++ b/src/zcl_excel_style_color.clas.xml
@@ -7,7 +7,9 @@
1
E
Excel Style Color
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_cond.clas.xml b/src/zcl_excel_style_cond.clas.xml
index 6e6d501..3d779b1 100644
--- a/src/zcl_excel_style_cond.clas.xml
+++ b/src/zcl_excel_style_cond.clas.xml
@@ -7,7 +7,9 @@
1
E
Font Style
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_fill.clas.xml b/src/zcl_excel_style_fill.clas.xml
index ba42642..13cb4ea 100644
--- a/src/zcl_excel_style_fill.clas.xml
+++ b/src/zcl_excel_style_fill.clas.xml
@@ -7,7 +7,9 @@
1
E
Fill Style
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_font.clas.xml b/src/zcl_excel_style_font.clas.xml
index a7447de..9f1fe26 100644
--- a/src/zcl_excel_style_font.clas.xml
+++ b/src/zcl_excel_style_font.clas.xml
@@ -7,7 +7,9 @@
1
E
Font Style
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_number_format.clas.xml b/src/zcl_excel_style_number_format.clas.xml
index d655a70..050c6d5 100644
--- a/src/zcl_excel_style_number_format.clas.xml
+++ b/src/zcl_excel_style_number_format.clas.xml
@@ -7,7 +7,9 @@
1
E
Number Format Style
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_style_protection.clas.xml b/src/zcl_excel_style_protection.clas.xml
index 166045d..132c900 100644
--- a/src/zcl_excel_style_protection.clas.xml
+++ b/src/zcl_excel_style_protection.clas.xml
@@ -7,7 +7,9 @@
1
E
Protection Style
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_styles.clas.xml b/src/zcl_excel_styles.clas.xml
index 7f39d0f..eced407 100644
--- a/src/zcl_excel_styles.clas.xml
+++ b/src/zcl_excel_styles.clas.xml
@@ -7,7 +7,9 @@
1
E
Styles collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_styles_cond.clas.xml b/src/zcl_excel_styles_cond.clas.xml
index eaf110b..509d3e9 100644
--- a/src/zcl_excel_styles_cond.clas.xml
+++ b/src/zcl_excel_styles_cond.clas.xml
@@ -7,7 +7,9 @@
1
E
Styles conditional collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_table.clas.xml b/src/zcl_excel_table.clas.xml
index 867c0da..c5ec8d1 100644
--- a/src/zcl_excel_table.clas.xml
+++ b/src/zcl_excel_table.clas.xml
@@ -7,7 +7,9 @@
1
E
Represents Excel Table
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_theme.clas.xml b/src/zcl_excel_theme.clas.xml
index d22c8f0..1ccff7c 100644
--- a/src/zcl_excel_theme.clas.xml
+++ b/src/zcl_excel_theme.clas.xml
@@ -7,6 +7,7 @@
1
E
Theme
+ 2
1
X
X
diff --git a/src/zcl_excel_theme_color_scheme.clas.xml b/src/zcl_excel_theme_color_scheme.clas.xml
index a4101c2..4594bf3 100644
--- a/src/zcl_excel_theme_color_scheme.clas.xml
+++ b/src/zcl_excel_theme_color_scheme.clas.xml
@@ -7,7 +7,9 @@
1
E
Theme Color Scheme
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_theme_eclrschemelst.clas.xml b/src/zcl_excel_theme_eclrschemelst.clas.xml
index 33a8ed7..8a21faa 100644
--- a/src/zcl_excel_theme_eclrschemelst.clas.xml
+++ b/src/zcl_excel_theme_eclrschemelst.clas.xml
@@ -7,7 +7,9 @@
1
E
Theme Extra Color Scheme List
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_theme_elements.clas.xml b/src/zcl_excel_theme_elements.clas.xml
index 831ecbe..0c44d83 100644
--- a/src/zcl_excel_theme_elements.clas.xml
+++ b/src/zcl_excel_theme_elements.clas.xml
@@ -7,7 +7,9 @@
1
E
Theme Elements
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_theme_extlst.clas.xml b/src/zcl_excel_theme_extlst.clas.xml
index 332a09c..21bd28b 100644
--- a/src/zcl_excel_theme_extlst.clas.xml
+++ b/src/zcl_excel_theme_extlst.clas.xml
@@ -7,7 +7,9 @@
1
E
Theme Ext List
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_theme_fmt_scheme.clas.xml b/src/zcl_excel_theme_fmt_scheme.clas.xml
index b49e4e6..e36b6df 100644
--- a/src/zcl_excel_theme_fmt_scheme.clas.xml
+++ b/src/zcl_excel_theme_fmt_scheme.clas.xml
@@ -7,7 +7,9 @@
1
E
Theme FMT Scheme
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_theme_font_scheme.clas.xml b/src/zcl_excel_theme_font_scheme.clas.xml
index 4226a21..d957dc0 100644
--- a/src/zcl_excel_theme_font_scheme.clas.xml
+++ b/src/zcl_excel_theme_font_scheme.clas.xml
@@ -7,7 +7,9 @@
1
E
Theme Font Scheme
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_theme_objectdefaults.clas.xml b/src/zcl_excel_theme_objectdefaults.clas.xml
index 6b0efc1..8f8a302 100644
--- a/src/zcl_excel_theme_objectdefaults.clas.xml
+++ b/src/zcl_excel_theme_objectdefaults.clas.xml
@@ -7,7 +7,9 @@
1
E
Theme Object Defaults
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_worksheet.clas.xml b/src/zcl_excel_worksheet.clas.xml
index 49b5c4d..be54bec 100644
--- a/src/zcl_excel_worksheet.clas.xml
+++ b/src/zcl_excel_worksheet.clas.xml
@@ -7,6 +7,7 @@
1
E
Worksheet
+ 2
1
X
X
diff --git a/src/zcl_excel_worksheet_pagebreaks.clas.xml b/src/zcl_excel_worksheet_pagebreaks.clas.xml
index 68c14ed..909b2f0 100644
--- a/src/zcl_excel_worksheet_pagebreaks.clas.xml
+++ b/src/zcl_excel_worksheet_pagebreaks.clas.xml
@@ -7,6 +7,7 @@
1
E
Pagebreaks
+ 2
1
X
X
diff --git a/src/zcl_excel_worksheets.clas.xml b/src/zcl_excel_worksheets.clas.xml
index 9332d16..b3a9094 100644
--- a/src/zcl_excel_worksheets.clas.xml
+++ b/src/zcl_excel_worksheets.clas.xml
@@ -7,7 +7,9 @@
1
E
Worksheets collection
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_writer_2007.clas.abap b/src/zcl_excel_writer_2007.clas.abap
index b95af7f..9276bed 100644
--- a/src/zcl_excel_writer_2007.clas.abap
+++ b/src/zcl_excel_writer_2007.clas.abap
@@ -207,8 +207,9 @@ method CREATE.
lv_xl_comment_rels TYPE string, " (+) Issue #180
lv_xl_drawing TYPE string,
lv_xl_drawing_rels TYPE string,
- lv_syindex TYPE string,
+ lv_index_str TYPE string,
lv_value TYPE string,
+ lv_sheet_index TYPE i,
lv_drawing_index TYPE i,
lv_comment_index TYPE i. " (+) Issue #180
@@ -280,10 +281,10 @@ method CREATE.
* STEP 10: Add sheet#.xml and drawing#.xml to zip
lo_iterator = me->excel->get_worksheets_iterator( ).
lo_active_worksheet = me->excel->get_active_worksheet( ).
- lv_drawing_index = 1.
- lv_comment_index = 1. " (+) Issue #180
WHILE lo_iterator->if_object_collection_iterator~has_next( ) EQ abap_true.
+ lv_sheet_index = sy-index.
+
lo_worksheet ?= lo_iterator->if_object_collection_iterator~get_next( ).
IF lo_active_worksheet->get_guid( ) EQ lo_worksheet->get_guid( ).
lv_active = abap_true.
@@ -293,19 +294,66 @@ method CREATE.
lv_content = me->create_xl_sheet( io_worksheet = lo_worksheet
iv_active = lv_active ).
lv_xl_sheet = me->c_xl_sheet.
- MOVE sy-index TO: lv_syindex,
- lv_comment_index. " (+) Issue #180
- SHIFT lv_syindex RIGHT DELETING TRAILING space.
- SHIFT lv_syindex LEFT DELETING LEADING space.
- REPLACE ALL OCCURRENCES OF '#' IN lv_xl_sheet WITH lv_syindex.
+
+ lv_index_str = lv_sheet_index.
+ CONDENSE lv_index_str NO-GAPS.
+ REPLACE ALL OCCURRENCES OF '#' IN lv_xl_sheet WITH lv_index_str.
lo_zip->add( name = lv_xl_sheet
content = lv_content ).
+* 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.
+
+ " Create comment itself
+ lv_content = me->create_xl_comments( lo_worksheet ).
+ lv_xl_comment = me->c_xl_comments.
+ lv_index_str = lv_comment_index.
+ CONDENSE lv_index_str NO-GAPS.
+ 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
+ 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 ).
+ 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.
+
+ 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 ).
+
+ lv_content = me->create_xl_drawings_rels( lo_worksheet ).
+ lv_xl_drawing_rels = me->c_xl_drawings_rels.
+ REPLACE ALL OCCURRENCES OF '#' IN lv_xl_drawing_rels WITH lv_index_str.
+ lo_zip->add( name = lv_xl_drawing_rels
+ content = lv_content ).
+ 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
- REPLACE ALL OCCURRENCES OF '#' IN lv_xl_sheet_rels WITH lv_syindex.
+
+ lv_index_str = lv_sheet_index.
+ CONDENSE lv_index_str NO-GAPS.
+ REPLACE ALL OCCURRENCES OF '#' IN lv_xl_sheet_rels WITH lv_index_str.
lo_zip->add( name = lv_xl_sheet_rels
content = lv_content ).
@@ -321,50 +369,7 @@ method CREATE.
content = lv_content ).
ENDWHILE.
-* Begin - Add - Issue #180
-* Add comments **********************************
- lo_comments = lo_worksheet->get_comments( ).
- IF lo_comments->is_empty( ) = abap_false.
- MOVE lv_comment_index TO lv_syindex.
- SHIFT lv_syindex RIGHT DELETING TRAILING space.
- SHIFT lv_syindex LEFT DELETING LEADING space.
- " Create comment itself
- 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_syindex.
- lo_zip->add( name = lv_xl_comment
- content = lv_content ).
-
- " Create vmlDrawing that will host the comment
- 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_syindex.
- lo_zip->add( name = lv_xl_drawing_for_comment
- content = lv_content ).
- ENDIF.
-* End - Add - Issue #180
-
-* Add drawings **********************************
- lo_drawings = lo_worksheet->get_drawings( ).
- IF lo_drawings->is_empty( ) = abap_false.
- MOVE lv_drawing_index TO lv_syindex.
- SHIFT lv_syindex RIGHT DELETING TRAILING space.
- SHIFT lv_syindex LEFT DELETING LEADING space.
-
- lv_content = me->create_xl_drawings( lo_worksheet ).
- lv_xl_drawing = me->c_xl_drawings.
- REPLACE ALL OCCURRENCES OF '#' IN lv_xl_drawing WITH lv_syindex.
- lo_zip->add( name = lv_xl_drawing
- content = lv_content ).
-
- lv_content = me->create_xl_drawings_rels( lo_worksheet ).
- lv_xl_drawing_rels = me->c_xl_drawings_rels.
- REPLACE ALL OCCURRENCES OF '#' IN lv_xl_drawing_rels WITH lv_syindex.
- lo_zip->add( name = lv_xl_drawing_rels
- content = lv_content ).
- ADD 1 TO lv_drawing_index.
- ENDIF.
ENDWHILE.
diff --git a/src/zcl_excel_writer_2007.clas.xml b/src/zcl_excel_writer_2007.clas.xml
index 8fa5a1c..e1cac0f 100644
--- a/src/zcl_excel_writer_2007.clas.xml
+++ b/src/zcl_excel_writer_2007.clas.xml
@@ -7,6 +7,7 @@
1
E
Excel writer 2007
+ 2
1
X
X
diff --git a/src/zcl_excel_writer_csv.clas.xml b/src/zcl_excel_writer_csv.clas.xml
index 36fa273..d71de80 100644
--- a/src/zcl_excel_writer_csv.clas.xml
+++ b/src/zcl_excel_writer_csv.clas.xml
@@ -7,7 +7,9 @@
1
E
Excel writer 2007
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_writer_huge_file.clas.xml b/src/zcl_excel_writer_huge_file.clas.xml
index e3bb0dc..74ad8f3 100644
--- a/src/zcl_excel_writer_huge_file.clas.xml
+++ b/src/zcl_excel_writer_huge_file.clas.xml
@@ -7,7 +7,9 @@
1
E
Create huge XLSX file
+ 2
1
+ X
X
X
X
diff --git a/src/zcl_excel_writer_xlsm.clas.xml b/src/zcl_excel_writer_xlsm.clas.xml
index a570ff1..381f32f 100644
--- a/src/zcl_excel_writer_xlsm.clas.xml
+++ b/src/zcl_excel_writer_xlsm.clas.xml
@@ -7,6 +7,7 @@
1
E
Excel with macro writer
+ 2
1
X
X
diff --git a/src/zcx_excel.clas.xml b/src/zcx_excel.clas.xml
index adcc131..78ab696 100644
--- a/src/zcx_excel.clas.xml
+++ b/src/zcx_excel.clas.xml
@@ -8,6 +8,7 @@
E
Exceptions for ABAP2XLSX
40
+ 2
1
X
X