From 84aa650b8e04725e7a49e3804498935581ff08df Mon Sep 17 00:00:00 2001
From: Dennis Schaaf <53614408+d-schaaf@users.noreply.github.com>
Date: Tue, 24 Sep 2019 22:35:12 +0200
Subject: [PATCH] Bugfix range conversion (#628)

When reading xlsx and autofilters are being applied a dump occured when autofilter range was defined like "Sheet1!#REF1"
Such ranges are now ignored so that the xlsx can be read.
---
 src/zcl_excel_common.clas.abap      |  7 ++++++-
 src/zcl_excel_reader_2007.clas.abap | 24 +++++++++++++++---------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/zcl_excel_common.clas.abap b/src/zcl_excel_common.clas.abap
index ff2be66..bfe3eba 100644
--- a/src/zcl_excel_common.clas.abap
+++ b/src/zcl_excel_common.clas.abap
@@ -553,7 +553,12 @@ method CONVERT_RANGE2COLUMN_A_ROW.
 
   ELSEIF i_range CS '!'.                                " c) sheetname existing - does not start with '
     SPLIT i_range AT '!' INTO lv_sheet lv_range.
-
+      " begin Dennis Schaaf
+      IF lv_range CP '*#REF*'.
+        lv_errormessage = 'Invalid range'(001).
+        zcx_excel=>raise_text( lv_errormessage ).
+      ENDIF.
+      " end Dennis Schaaf
   ELSE.                                                 " d) no sheetname - just area
     lv_range = i_range.
   ENDIF.
diff --git a/src/zcl_excel_reader_2007.clas.abap b/src/zcl_excel_reader_2007.clas.abap
index 69e3df7..006d796 100644
--- a/src/zcl_excel_reader_2007.clas.abap
+++ b/src/zcl_excel_reader_2007.clas.abap
@@ -2005,15 +2005,21 @@ method LOAD_WORKBOOK.
 * insert autofilters
 *--------------------------------------------------------------------*
           WHEN zcl_excel_autofilters=>c_autofilter.
-            lo_autofilter = io_excel->add_new_autofilter( io_sheet = <worksheet>-worksheet ) .
-            zcl_excel_common=>convert_range2column_a_row( EXPORTING i_range        = lv_range_value
-                                                          IMPORTING e_column_start = lv_col_start_alpha
-                                                                    e_column_end   = lv_col_end_alpha
-                                                                    e_row_start    = ls_area-row_start
-                                                                    e_row_end      = ls_area-row_end ).
-            ls_area-col_start = zcl_excel_common=>convert_column2int( lv_col_start_alpha ).
-            ls_area-col_end   = zcl_excel_common=>convert_column2int( lv_col_end_alpha ).
-            lo_autofilter->set_filter_area( is_area = ls_area ).
+              " begin Dennis Schaaf
+              TRY.
+                  zcl_excel_common=>convert_range2column_a_row( EXPORTING i_range        = lv_range_value
+                                                                IMPORTING e_column_start = lv_col_start_alpha
+                                                                          e_column_end   = lv_col_end_alpha
+                                                                          e_row_start    = ls_area-row_start
+                                                                          e_row_end      = ls_area-row_end ).
+                  ls_area-col_start = zcl_excel_common=>convert_column2int( lv_col_start_alpha ).
+                  ls_area-col_end   = zcl_excel_common=>convert_column2int( lv_col_end_alpha ).
+                  lo_autofilter = io_excel->add_new_autofilter( io_sheet = <worksheet>-worksheet ) .
+                  lo_autofilter->set_filter_area( is_area = ls_area ).
+                CATCH zcx_excel.
+                  " we expected a range but it was not usable, so just ignore it
+              ENDTRY.
+              " end Dennis Schaaf
 
 *--------------------------------------------------------------------*
 * repeat print rows/columns